From: Lukas Sismis <lsismis@oisf.net>
Date: Tue, 26 Mar 2024 21:17:17 +0000 (+0100)
Subject: dpdk: support 52 byte long key on ice (E810) cards
X-Git-Tag: suricata-8.0.0-beta1~1493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10590e6d946ff8711acef09cfe3f79be88910c17;p=thirdparty%2Fsuricata.git

dpdk: support 52 byte long key on ice (E810) cards
---

diff --git a/src/runmode-dpdk.c b/src/runmode-dpdk.c
index 80638c798e..9a1cc4e0b3 100644
--- a/src/runmode-dpdk.c
+++ b/src/runmode-dpdk.c
@@ -871,7 +871,7 @@ static void DeviceSetPMDSpecificRSS(struct rte_eth_rss_conf *rss_conf, const cha
     if (strcmp(driver_name, "net_i40e") == 0)
         i40eDeviceSetRSSConf(rss_conf);
     if (strcmp(driver_name, "net_ice") == 0)
-        iceDeviceSetRSSHashFunction(&rss_conf->rss_hf);
+        iceDeviceSetRSSConf(rss_conf);
     if (strcmp(driver_name, "net_ixgbe") == 0)
         ixgbeDeviceSetRSSHashFunction(&rss_conf->rss_hf);
     if (strcmp(driver_name, "net_e1000_igb") == 0)
diff --git a/src/util-dpdk-ice.c b/src/util-dpdk-ice.c
index 36f4481dea..4b714d88c3 100644
--- a/src/util-dpdk-ice.c
+++ b/src/util-dpdk-ice.c
@@ -35,7 +35,7 @@
 
 #ifdef HAVE_DPDK
 
-void iceDeviceSetRSSHashFunction(uint64_t *rss_hf)
+static void iceDeviceSetRSSHashFunction(uint64_t *rss_hf)
 {
 #if RTE_VERSION < RTE_VERSION_NUM(20, 0, 0, 0)
     *rss_hf = RTE_ETH_RSS_FRAG_IPV4 | RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_FRAG_IPV6 |
@@ -46,6 +46,16 @@ void iceDeviceSetRSSHashFunction(uint64_t *rss_hf)
 #endif
 }
 
+void iceDeviceSetRSSConf(struct rte_eth_rss_conf *rss_conf)
+{
+    iceDeviceSetRSSHashFunction(&rss_conf->rss_hf);
+#if RTE_VERSION < RTE_VERSION_NUM(23, 11, 0, 0)
+    rss_conf->rss_key_len = 40;
+#else
+    rss_conf->rss_key_len = 52;
+#endif
+}
+
 #endif /* HAVE_DPDK */
 /**
  * @}
diff --git a/src/util-dpdk-ice.h b/src/util-dpdk-ice.h
index cdc2185cca..d535fa092f 100644
--- a/src/util-dpdk-ice.h
+++ b/src/util-dpdk-ice.h
@@ -28,7 +28,9 @@
 
 #ifdef HAVE_DPDK
 
-void iceDeviceSetRSSHashFunction(uint64_t *rss_conf);
+#include "util-dpdk.h"
+
+void iceDeviceSetRSSConf(struct rte_eth_rss_conf *rss_conf);
 
 #endif /* HAVE_DPDK */