e782454207
Sync some patchs from upstreaming, includind some bugfixes, hns3 pmd flow rule priority feature, hns3 pmd outer VLAN flow match feature, and support dump reigser names and filter. This patch set is modified as follows: - net/hns3: fix cannot fully use hardware flow director table - net/hns3: fix error code for repeatedly create counter - net/hns3: support flow rule priority - common/nfp: use new kvargs process API - net/tap: use new kvargs process API - net/sfc: use new kvargs process API - kvargs: rework process API - net/hns3: fix variable type - net/hns3: fix pointer offset - net/hns3: fix error log - net/hns3: support filtering registers by module names - net/hns3: support reporting names of registers - net/hns3: refactor register dump - net/hns3: remove separators between register module - net/hns3: fix dump counter of registers - net/hns3: remove some basic address dump - telemetry: register command with private argument - ethdev: fix race on ports in telemetry endpoints - ethdev: add telemetry command for registers - ethdev: add report of register names and filter - net/hns3: support outer VLAN flow match - net/hns3: register VLAN flow match mode parameter - net/hns3: support general tunnel flow match - net/hns3: restrict tunnel flow rule to one header - net/hns3: remove ROH devices - net/hns3: dump queue head and tail pointer info - dmadev: fix potential null pointer access - net/hns3: verify reset type from firmware - ethdev: verify queue ID in Tx done cleanup Signed-off-by: Dengdui Huang <huangdengdui@huawei.com> (cherry picked from commit a1c828e1eb9cf716187d2a7656023e95bdce9b55)
64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
From 4b176ac13dbd408624d083f55a4892282791133b Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Fri, 18 Oct 2024 14:19:40 +0800
|
|
Subject: [PATCH] net/hns3: register VLAN flow match mode parameter
|
|
|
|
[ upstream commit bf16032eb1e62338e02b1278e10033366448c5bc ]
|
|
|
|
This commit adds fdir_vlan_match_mode in RTE_PMD_REGISTER_PARAM_STRING.
|
|
|
|
Fixes: 06b9ee343940 ("net/hns3: add VLAN match mode runtime config")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Signed-off-by: Jie Hai <haijie1@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_common.c | 2 +-
|
|
drivers/net/hns3/hns3_common.h | 2 +-
|
|
drivers/net/hns3/hns3_ethdev.c | 3 ++-
|
|
3 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c
|
|
index 5e6cdfd..7a36673 100644
|
|
--- a/drivers/net/hns3/hns3_common.c
|
|
+++ b/drivers/net/hns3/hns3_common.c
|
|
@@ -308,7 +308,7 @@ hns3_parse_devargs(struct rte_eth_dev *dev)
|
|
&hns3_parse_mbx_time_limit, &mbx_time_limit_ms);
|
|
if (!hns->is_vf)
|
|
(void)rte_kvargs_process(kvlist,
|
|
- HNS3_DEVARG_FDIR_VALN_MATCH_MODE,
|
|
+ HNS3_DEVARG_FDIR_VLAN_MATCH_MODE,
|
|
&hns3_parse_vlan_match_mode,
|
|
&hns->pf.fdir.vlan_match_mode);
|
|
|
|
diff --git a/drivers/net/hns3/hns3_common.h b/drivers/net/hns3/hns3_common.h
|
|
index cf9593b..1668520 100644
|
|
--- a/drivers/net/hns3/hns3_common.h
|
|
+++ b/drivers/net/hns3/hns3_common.h
|
|
@@ -27,7 +27,7 @@ enum {
|
|
|
|
#define HNS3_DEVARG_MBX_TIME_LIMIT_MS "mbx_time_limit_ms"
|
|
|
|
-#define HNS3_DEVARG_FDIR_VALN_MATCH_MODE "fdir_vlan_match_mode"
|
|
+#define HNS3_DEVARG_FDIR_VLAN_MATCH_MODE "fdir_vlan_match_mode"
|
|
|
|
#define MSEC_PER_SEC 1000L
|
|
#define USEC_PER_MSEC 1000L
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index cc2edb3..23a1fca 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -6668,7 +6668,8 @@ RTE_PMD_REGISTER_PARAM_STRING(net_hns3,
|
|
HNS3_DEVARG_RX_FUNC_HINT "=vec|sve|simple|common "
|
|
HNS3_DEVARG_TX_FUNC_HINT "=vec|sve|simple|common "
|
|
HNS3_DEVARG_DEV_CAPS_MASK "=<1-65535> "
|
|
- HNS3_DEVARG_MBX_TIME_LIMIT_MS "=<uint16> ");
|
|
+ HNS3_DEVARG_MBX_TIME_LIMIT_MS "=<uint16> "
|
|
+ HNS3_DEVARG_FDIR_VLAN_MATCH_MODE "=strict|nostrict "
|
|
RTE_LOG_REGISTER_SUFFIX(hns3_logtype_init, init, NOTICE);
|
|
RTE_LOG_REGISTER_SUFFIX(hns3_logtype_driver, driver, NOTICE);
|
|
#ifdef RTE_ETHDEV_DEBUG_RX
|
|
--
|
|
2.33.0
|
|
|