From: Ralph Eastwood <rea@napatech.com>
Date: Wed, 16 Aug 2023 11:30:01 +0000 (+0200)
Subject: napatech: print NUMA recommendation early
X-Git-Tag: suricata-7.0.1~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4756138cf402b1994f808f02ae5ba889455115d;p=thirdparty%2Fsuricata.git

napatech: print NUMA recommendation early

When thread affinity is set, the NUMA configuration specified in
the napatech.ini configuration could be incorrect and then fail.
This fails before the recommended configuration is printed, which
is pretty unhelpful.
---

diff --git a/src/source-napatech.c b/src/source-napatech.c
index d1d57f856a..44201a2bb3 100644
--- a/src/source-napatech.c
+++ b/src/source-napatech.c
@@ -845,6 +845,9 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot)
 
         SC_ATOMIC_ADD(stream_count, 1);
         if (SC_ATOMIC_GET(stream_count) == NapatechGetNumConfiguredStreams()) {
+            /* Print the recommended NUMA configuration early because it
+             * can fail with "No available hostbuffers" in NapatechSetupTraffic */
+            RecommendNUMAConfig();
 
 #ifdef NAPATECH_ENABLE_BYPASS
             if (ConfGetBool("napatech.inline", &is_inline) == 0) {
@@ -869,7 +872,6 @@ TmEcode NapatechPacketLoop(ThreadVars *tv, void *data, void *slot)
             } else if (status == 0x20000008) {
                 FatalError("Check napatech.ports in the suricata config file.");
             }
-            RecommendNUMAConfig();
             SCLogNotice("Napatech packet input engine started.");
         }
     } // is_autoconfig