From: Victor Julien <victor@inliniac.net>
Date: Fri, 3 Jun 2016 08:24:03 +0000 (+0200)
Subject: affinity: improve suricata.yaml doc
X-Git-Tag: suricata-3.1RC1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45b72d61c98277196c4233e64dcaa1451bbcebf5;p=thirdparty%2Fsuricata.git

affinity: improve suricata.yaml doc
---

diff --git a/suricata.yaml.in b/suricata.yaml.in
index 2ca70e218b..55da24cbe0 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1264,15 +1264,18 @@ spm-algo: auto
 
 # Suricata is multi-threaded. Here the threading can be influenced.
 threading:
-  # On some cpu's/architectures it is beneficial to tie individual threads
-  # to specific CPU's/CPU cores. In this case all threads are tied to CPU0,
-  # and each extra CPU/core has one "detect" thread.
-  #
-  # On Intel Core2 and Nehalem CPU's enabling this will degrade performance.
-  #
   set-cpu-affinity: no
-  # Tune cpu affinity of suricata threads. Each family of threads can be bound
+  # Tune cpu affinity of threads. Each family of threads can be bound
   # on specific CPUs.
+  #
+  # These 2 apply to the all runmodes:
+  # management-cpu-set is used for flow timeout handling, counters
+  # detect-cpu-set is used for 'worker' threads
+  #
+  # Additionally, for autofp these apply:
+  # receive-cpu-set is used for capture threads
+  # verdict-cpu-set is used for IPS verdict threads
+  #
   cpu-affinity:
     - management-cpu-set:
         cpu: [ 0 ]  # include only these cpus in affinity settings