From: Victor Julien <victor@inliniac.net>
Date: Mon, 29 Oct 2018 08:56:40 +0000 (+0100)
Subject: pfring: implement 'threads: auto'
X-Git-Tag: suricata-4.1.0~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1467c30883f46ea8e50d208192e1bac3cef36131;p=thirdparty%2Fsuricata.git

pfring: implement 'threads: auto'

If threads is set to auto, first try the CPU count. If that would
fail, fall back to RSS queue count.
---

diff --git a/src/runmode-pfring.c b/src/runmode-pfring.c
index 16712a689c..4131ae5356 100644
--- a/src/runmode-pfring.c
+++ b/src/runmode-pfring.c
@@ -247,12 +247,22 @@ static void *ParsePfringConfig(const char *iface)
 
     if (ConfGetChildValueWithDefault(if_root, if_default, "threads", &threadsstr) != 1) {
         pfconf->threads = 1;
-    } else {
-        if (threadsstr != NULL) {
+    } else if (threadsstr != NULL) {
+        if (strcmp(threadsstr, "auto") == 0) {
+            pfconf->threads = (int)UtilCpuGetNumProcessorsOnline();
+            if (pfconf->threads > 0) {
+                SCLogPerf("%u cores, so using %u threads", pfconf->threads, pfconf->threads);
+            } else {
+                pfconf->threads = GetIfaceRSSQueuesNum(iface);
+                if (pfconf->threads > 0) {
+                    SCLogPerf("%d RSS queues, so using %u threads", pfconf->threads, pfconf->threads);
+                }
+            }
+        } else {
             pfconf->threads = atoi(threadsstr);
         }
     }
-    if (pfconf->threads == 0) {
+    if (pfconf->threads <= 0) {
         pfconf->threads = 1;
     }
 
diff --git a/suricata.yaml.in b/suricata.yaml.in
index 30e4016566..b20b0d40be 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1725,8 +1725,9 @@ netmap:
 # for more info see http://www.ntop.org/products/pf_ring/
 pfring:
   - interface: eth0
-    # Number of receive threads.
-    threads: 1
+    # Number of receive threads. If set to 'auto' Suricata will first try
+    # to use CPU (core) count and otherwise RSS queue count.
+    threads: auto
 
     # Default clusterid.  PF_RING will load balance packets based on flow.
     # All threads/processes that will participate need to have the same
@@ -1736,6 +1737,7 @@ pfring:
     # Default PF_RING cluster type. PF_RING can load balance per flow.
     # Possible values are cluster_flow or cluster_round_robin.
     cluster-type: cluster_flow
+
     # bpf filter for this interface
     #bpf-filter: tcp