flow/hash: add stats counters for flow.memcap

Task OISF#5816
jufajardini · Mar 30, 2023 · a8dba4c · a8dba4c
1 parent 7a017b9
commit a8dba4c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/etc/schema.json b/etc/schema.json
@@ -4877,6 +4877,9 @@
                         "memcap": {
                             "type": "integer"
                         },
+                        "memcap_exception_policy": {
+                            "type": "integer"
+                        },
                         "memuse": {
                             "type": "integer"
                         },

diff --git a/src/decode.c b/src/decode.c
@@ -564,6 +564,7 @@ void DecodeRegisterPerfCounters(DecodeThreadVars *dtv, ThreadVars *tv)
     dtv->counter_erspan = StatsRegisterMaxCounter("decoder.erspan", tv);
     dtv->counter_nsh = StatsRegisterMaxCounter("decoder.nsh", tv);
     dtv->counter_flow_memcap = StatsRegisterCounter("flow.memcap", tv);
+    dtv->counter_flow_memcap_exc_policy = StatsRegisterCounter("flow.memcap_exception_policy", tv);
 
     dtv->counter_tcp_active_sessions = StatsRegisterCounter("tcp.active_sessions", tv);
     dtv->counter_flow_total = StatsRegisterCounter("flow.total", tv);

diff --git a/src/decode.h b/src/decode.h
@@ -717,6 +717,7 @@ typedef struct DecodeThreadVars_
     uint16_t counter_defrag_max_hit;
 
     uint16_t counter_flow_memcap;
+    uint16_t counter_flow_memcap_exc_policy;
 
     uint16_t counter_tcp_active_sessions;
     uint16_t counter_flow_total;

diff --git a/src/flow-hash.c b/src/flow-hash.c
@@ -623,6 +623,9 @@ static Flow *FlowGetNew(ThreadVars *tv, FlowLookupStruct *fls, Packet *p)
 #ifdef DEBUG
     if (g_eps_flow_memcap != UINT64_MAX && g_eps_flow_memcap == p->pcap_cnt) {
         NoFlowHandleIPS(p);
+        StatsIncr(tv, fls->dtv->counter_flow_memcap);
+        // TODO increase exception policy stats ONLY if not set to ignore!!
+        StatsIncr(tv, fls->dtv->counter_flow_memcap_exc_policy);
         return NULL;
     }
 #endif
@@ -648,6 +651,15 @@ static Flow *FlowGetNew(ThreadVars *tv, FlowLookupStruct *fls, Packet *p)
             f = FlowGetUsedFlow(tv, fls->dtv, p->ts);
             if (f == NULL) {
                 NoFlowHandleIPS(p);
+#ifdef UNITTESTS
+                if (tv != NULL && fls->dtv != NULL) {
+#endif
+                    StatsIncr(tv, fls->dtv->counter_flow_memcap);
+                    // TODO increase exception policy stats ONLY if not set to ignore!!
+                    StatsIncr(tv, fls->dtv->counter_flow_memcap_exc_policy);
+#ifdef UNITTESTS
+                }
+#endif
                 return NULL;
             }
 #ifdef UNITTESTS
@@ -673,6 +685,8 @@ static Flow *FlowGetNew(ThreadVars *tv, FlowLookupStruct *fls, Packet *p)
             }
 #endif
             NoFlowHandleIPS(p);
+            // TODO increase exception policy stats ONLY if not set to ignore!!
+            StatsIncr(tv, fls->dtv->counter_flow_memcap_exc_policy);
             return NULL;
         }