From: Victor Julien <vjulien@oisf.net>
Date: Mon, 29 May 2023 12:05:38 +0000 (+0200)
Subject: flow: spare pool return optimization
X-Git-Tag: suricata-7.0.0-rc2~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F8945%2Fhead;p=thirdparty%2Fsuricata.git

flow: spare pool return optimization

In case small blocks of flows are returned, try to merge
them with existing small list head. Add full block as second
in the list as with the rest of the code.
---

diff --git a/src/flow-spare-pool.c b/src/flow-spare-pool.c
index 905c0853ff..e47b983b8e 100644
--- a/src/flow-spare-pool.c
+++ b/src/flow-spare-pool.c
@@ -126,13 +126,50 @@ void FlowSparePoolReturnFlows(FlowQueuePrivate *fqp)
     p->queue = *fqp;
 
     SCMutexLock(&flow_spare_pool_m);
-    p->next = flow_spare_pool;
-    flow_spare_pool = p;
     flow_spare_pool_flow_cnt += fqp->len;
+    if (flow_spare_pool != NULL) {
+        if (p->queue.len == flow_spare_pool_block_size) {
+            /* full block insert */
+
+            if (flow_spare_pool->queue.len < flow_spare_pool_block_size) {
+                p->next = flow_spare_pool->next;
+                flow_spare_pool->next = p;
+                p = NULL;
+            } else {
+                p->next = flow_spare_pool;
+                flow_spare_pool = p;
+                p = NULL;
+            }
+        } else {
+            /* incomplete block insert */
+
+            if (p->queue.len + flow_spare_pool->queue.len <= flow_spare_pool_block_size) {
+                FlowQueuePrivateAppendPrivate(&flow_spare_pool->queue, &p->queue);
+                /* free 'p' outside of lock below */
+            } else {
+                // put smallest first
+                if (p->queue.len < flow_spare_pool->queue.len) {
+                    p->next = flow_spare_pool;
+                    flow_spare_pool = p;
+                } else {
+                    p->next = flow_spare_pool->next;
+                    flow_spare_pool->next = p;
+                }
+                p = NULL;
+            }
+        }
+    } else {
+        p->next = flow_spare_pool;
+        flow_spare_pool = p;
+        p = NULL;
+    }
     SCMutexUnlock(&flow_spare_pool_m);
 
     FlowQueuePrivate empty = { NULL, NULL, 0 };
     *fqp = empty;
+
+    if (p != NULL)
+        SCFree(p);
 }
 
 FlowQueuePrivate FlowSpareGetFromPool(void)