Skip to content

Commit 743f3fc

Browse files
Adam KiripolskyAdam Kiripolsky
Adam Kiripolsky
authored and
Adam Kiripolsky
committed
dpdk/rss: add rte_flow rss support for mlx5
The configuration of this rule is the same as for ixgbe driver except the hash function is not RTE_ETH_HASH_FUNCTION_DEFAULT but RTE_ETH_HASH_FUNCTION_TOEPLITZ. The syntax in dpdk-testpmd for this rule with attributes: port index == 0 used rx queue indices == 0 1 2 3 <hash_key> == 6d5a symmetric hash key is as follows: "flow create 0 ingress pattern eth / end actions rss types ipv4 ipv6 end queues 0 1 2 3 end key <hash_key> key_len 40 func toeplitz / end" Ticket: 7337
1 parent 90706b6 commit 743f3fc

File tree

5 files changed

+121
-3
lines changed

5 files changed

+121
-3
lines changed

src/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ noinst_HEADERS = \
482482
util-dpdk-i40e.h \
483483
util-dpdk-ice.h \
484484
util-dpdk-ixgbe.h \
485+
util-dpdk-mlx5.h \
485486
util-dpdk-bonding.h \
486487
util-dpdk-rss.h \
487488
util-ebpf.h \
@@ -1037,6 +1038,7 @@ libsuricata_c_a_SOURCES = \
10371038
util-dpdk-i40e.c \
10381039
util-dpdk-ice.c \
10391040
util-dpdk-ixgbe.c \
1041+
util-dpdk-mlx5.c \
10401042
util-dpdk-bonding.c \
10411043
util-dpdk-rss.c \
10421044
util-ebpf.c \

src/source-dpdk.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ TmEcode NoDPDKSupportExit(ThreadVars *tv, const void *initdata, void **data)
9090
#include "util-dpdk-i40e.h"
9191
#include "util-dpdk-ice.h"
9292
#include "util-dpdk-ixgbe.h"
93+
#include "util-dpdk-mlx5.h"
9394
#include "util-dpdk-bonding.h"
9495
#include <numa.h>
9596

@@ -200,6 +201,8 @@ static void DevicePostStartPMDSpecificActions(DPDKThreadVars *ptv, const char *d
200201
ixgbeDeviceSetRSS(ptv->port_id, ptv->threads, ptv->livedev->dev);
201202
else if (strcmp(driver_name, "net_ice") == 0)
202203
iceDeviceSetRSS(ptv->port_id, ptv->threads, ptv->livedev->dev);
204+
else if (strcmp(driver_name, "mlx5_pci") == 0)
205+
mlx5DeviceSetRSS(ptv->port_id, ptv->threads, ptv->livedev->dev);
203206
}
204207

205208
static void DevicePreClosePMDSpecificActions(DPDKThreadVars *ptv, const char *driver_name)
@@ -219,8 +222,9 @@ static void DevicePreClosePMDSpecificActions(DPDKThreadVars *ptv, const char *dr
219222
}
220223
#endif /* RTE_VERSION >= RTE_VERSION_NUM(20, 0, 0, 0) */
221224
}
222-
223-
if (strcmp(driver_name, "net_ixgbe") == 0 || strcmp(driver_name, "net_ice") == 0) {
225+
226+
if (strcmp(driver_name, "net_ixgbe") == 0 || strcmp(driver_name, "net_ice") == 0 ||
227+
strcmp(driver_name, "mlx5_pci") == 0) {
224228
// Flush the RSS rules that have been inserted in the post start section
225229
struct rte_flow_error flush_error = { 0 };
226230
int32_t retval = rte_flow_flush(ptv->port_id, &flush_error);

src/util-dpdk-mlx5.c

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/* Copyright (C) 2024 Open Information Security Foundation
2+
*
3+
* You can copy, redistribute or modify this Program under the terms of
4+
* the GNU General Public License version 2 as published by the Free
5+
* Software Foundation.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*
12+
* You should have received a copy of the GNU General Public License
13+
* version 2 along with this program; if not, write to the Free Software
14+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
15+
* 02110-1301, USA.
16+
*/
17+
18+
/**
19+
* \defgroup dpdk DPDK NVIDIA mlx5 driver helpers functions
20+
*
21+
* @{
22+
*/
23+
24+
/**
25+
* \file
26+
*
27+
* \author Adam Kiripolsky <adam.kiripolsky@cesnet.cz>
28+
*
29+
* DPDK driver's helper functions
30+
*
31+
*/
32+
33+
#include "util-debug.h"
34+
#include "util-dpdk.h"
35+
#include "util-dpdk-bonding.h"
36+
#include "util-dpdk-mlx5.h"
37+
#include "util-dpdk-rss.h"
38+
39+
#ifdef HAVE_DPDK
40+
41+
#define MLX5_RSS_HKEY_LEN 40
42+
43+
int mlx5DeviceSetRSS(int port_id, int nb_rx_queues, char *port_name)
44+
{
45+
uint16_t queues[RTE_MAX_QUEUES_PER_PORT];
46+
struct rte_flow_error flush_error = { 0 };
47+
struct rte_eth_rss_conf rss_conf = {
48+
.rss_key = RSS_HKEY,
49+
.rss_key_len = MLX5_RSS_HKEY_LEN,
50+
};
51+
52+
if (nb_rx_queues < 1) {
53+
FatalError("The number of queues for RSS configuration must be "
54+
"configured with a positive number");
55+
}
56+
57+
struct rte_flow_action_rss rss_action_conf =
58+
DPDKInitRSSAction(rss_conf, nb_rx_queues, queues, RTE_ETH_HASH_FUNCTION_TOEPLITZ, true);
59+
60+
int retval = DPDKCreateRSSFlowGeneric(port_id, port_name, rss_action_conf);
61+
if (retval != 0) {
62+
retval = rte_flow_flush(port_id, &flush_error);
63+
if (retval != 0) {
64+
SCLogError("%s: unable to flush rte_flow rules: %s Flush error msg: %s", port_name,
65+
rte_strerror(-retval), flush_error.message);
66+
}
67+
return retval;
68+
}
69+
70+
return 0;
71+
}
72+
73+
#endif /* HAVE_DPDK */
74+
/**
75+
* @}
76+
*/

src/util-dpdk-mlx5.h

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/* Copyright (C) 2024 Open Information Security Foundation
2+
*
3+
* You can copy, redistribute or modify this Program under the terms of
4+
* the GNU General Public License version 2 as published by the Free
5+
* Software Foundation.
6+
*
7+
* This program is distributed in the hope that it will be useful,
8+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
9+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
* GNU General Public License for more details.
11+
*
12+
* You should have received a copy of the GNU General Public License
13+
* version 2 along with this program; if not, write to the Free Software
14+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
15+
* 02110-1301, USA.
16+
*/
17+
18+
/**
19+
* \file
20+
*
21+
* \author Adam Kiripolsky <adam.kiripolsky@cesnet.cz>
22+
*/
23+
24+
#ifndef UTIL_DPDK_MLX5_H
25+
#define UTIL_DPDK_MLX5_H
26+
27+
#include "suricata-common.h"
28+
29+
#ifdef HAVE_DPDK
30+
31+
int mlx5DeviceSetRSS(int port_id, int nb_rx_queues, char *port_name);
32+
33+
#endif /* HAVE_DPDK */
34+
35+
#endif /* UTIL_DPDK_MLX5_H */

src/util-dpdk-rss.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@ int DPDKCreateRSSFlowGeneric(
108108
action[0].conf = &rss_conf;
109109
action[1].type = RTE_FLOW_ACTION_TYPE_END;
110110

111-
pattern[0].type = RTE_FLOW_ITEM_TYPE_END;
111+
pattern[0].type = RTE_FLOW_ITEM_TYPE_ETH;
112+
pattern[1].type = RTE_FLOW_ITEM_TYPE_END;
112113

113114
struct rte_flow *flow = rte_flow_create(port_id, &attr, pattern, action, &flow_error);
114115
if (flow == NULL) {

0 commit comments

Comments
 (0)