dpdk/ixgbe: setup RSS for Intel IXGBE PMD

Set RSS hash function according to Intel IXGBE PMD available hash functions.

During configuration, a warning appeared stating that RSS hash function
has been changed from one value to the other. This has meant that
the supported hash functions did not cover all required hash functions
by the configuration. This commit solves the warning.

diff --git a/src/Makefile.am b/src/Makefile.am
index b206382846600913ae09262e151765083e2b919a..e4bdb2c6492bc2d4ff162bec82f0b2eebfa21c3a 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,6 +509,7 @@ noinst_HEADERS = \
        util-device.h \
        util-dpdk.h \
        util-dpdk-i40e.h \
+       util-dpdk-ixgbe.h \
        util-ebpf.h \
        util-enum.h \
        util-error.h \
@@ -1075,6 +1076,7 @@ libsuricata_c_a_SOURCES = \
        util-device.c \
        util-dpdk.c \
        util-dpdk-i40e.c \
+       util-dpdk-ixgbe.c \
        util-ebpf.c \
        util-enum.c \
        util-error.c \

diff --git a/src/runmode-dpdk.c b/src/runmode-dpdk.c
index def0a3320701a510e0eb036a15b46fe855de785a..6dff8b6d833c18f0e3c86dbbe43abbccbcfa13ea 100644 (file)
--- a/src/runmode-dpdk.c
+++ b/src/runmode-dpdk.c
@@ -39,6 +39,7 @@
 #include "util-cpu.h"
 #include "util-dpdk.h"
 #include "util-dpdk-i40e.h"
+#include "util-dpdk-ixgbe.h"
 
 #ifdef HAVE_DPDK
 
@@ -746,6 +747,8 @@ static void DeviceSetPMDSpecificRSS(struct rte_eth_rss_conf *rss_conf, const cha
     // RSS is configured in a specific way for a driver i40e and DPDK version <= 19.xx
     if (strcmp(driver_name, "net_i40e") == 0)
         i40eDeviceSetRSSHashFunction(&rss_conf->rss_hf);
+    if (strcmp(driver_name, "net_ixgbe") == 0)
+        ixgbeDeviceSetRSSHashFunction(&rss_conf->rss_hf);
 }
 
 static void DumpRSSFlags(const uint64_t requested, const uint64_t actual)

diff --git a/src/util-dpdk-ixgbe.c b/src/util-dpdk-ixgbe.c
new file mode 100644 (file)
index 0000000..539f657
--- /dev/null
+++ b/src/util-dpdk-ixgbe.c
@@ -0,0 +1,45 @@
+/* Copyright (C) 2021 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ *  \defgroup dpdk DPDK Intel IXGBE driver helpers functions
+ *
+ *  @{
+ */
+
+/**
+ * \file
+ *
+ * \author Lukas Sismis <lukas.sismis@gmail.com>
+ *
+ * DPDK driver's helper functions
+ *
+ */
+
+#include "util-dpdk-ixgbe.h"
+
+#ifdef HAVE_DPDK
+
+void ixgbeDeviceSetRSSHashFunction(uint64_t *rss_hf)
+{
+    *rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6 | ETH_RSS_IPV6_EX;
+}
+
+#endif /* HAVE_DPDK */
+/**
+ * @}
+ */

diff --git a/src/util-dpdk-ixgbe.h b/src/util-dpdk-ixgbe.h
new file mode 100644 (file)
index 0000000..bbd984a
--- /dev/null
+++ b/src/util-dpdk-ixgbe.h
@@ -0,0 +1,36 @@
+/* Copyright (C) 2021 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+/**
+ * \file
+ *
+ * \author Lukas Sismis <lukas.sismis@gmail.com>
+ */
+
+#ifndef UTIL_DPDK_IXGBE_H
+#define UTIL_DPDK_IXGBE_H
+
+#include "suricata-common.h"
+#include "util-dpdk.h"
+
+#ifdef HAVE_DPDK
+
+void ixgbeDeviceSetRSSHashFunction(uint64_t *rss_conf);
+
+#endif /* HAVE_DPDK */
+
+#endif /* UTIL_DPDK_IXGBE_H */