7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
From 85b5d5a0807856f276bb382af7a443e030975cce Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:20 +0800
|
|
Subject: [PATCH 144/189] net/hns3: fix RSS rule restore
|
|
|
|
The 'hns3_restore_rss_filter' function is used to restore RSS rule.
|
|
But this function calls the 'hns3_config_rss_filter' which sets the
|
|
last to invalid in flow RSS list. This causes the flow RSS list has
|
|
no valid rule.
|
|
|
|
Fixes: ec674cb742e5 ("net/hns3: fix flushing RSS rule")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_flow.c | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index 5e0a9bc93f..8b9bfe4880 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1539,7 +1539,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
|
|
const struct hns3_rss_conf *conf, bool add)
|
|
{
|
|
struct hns3_adapter *hns = dev->data->dev_private;
|
|
- struct hns3_rss_conf_ele *rss_filter_ptr;
|
|
struct hns3_hw *hw = &hns->hw;
|
|
struct hns3_rss_conf *rss_info;
|
|
uint64_t flow_types;
|
|
@@ -1618,13 +1617,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
|
|
goto rss_config_err;
|
|
}
|
|
|
|
- /*
|
|
- * When create a new RSS rule, the old rule will be overlaid and set
|
|
- * invalid.
|
|
- */
|
|
- TAILQ_FOREACH(rss_filter_ptr, &hw->flow_rss_list, entries)
|
|
- rss_filter_ptr->filter_info.valid = false;
|
|
-
|
|
rss_config_err:
|
|
rte_spinlock_unlock(&hw->lock);
|
|
|
|
@@ -1749,6 +1741,7 @@ hns3_flow_create_rss_rule(struct rte_eth_dev *dev,
|
|
{
|
|
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
|
struct hns3_rss_conf_ele *rss_filter_ptr;
|
|
+ struct hns3_rss_conf_ele *filter_ptr;
|
|
const struct hns3_rss_conf *rss_conf;
|
|
int ret;
|
|
|
|
@@ -1773,6 +1766,14 @@ hns3_flow_create_rss_rule(struct rte_eth_dev *dev,
|
|
|
|
hns3_rss_conf_copy(&rss_filter_ptr->filter_info, &rss_conf->conf);
|
|
rss_filter_ptr->filter_info.valid = true;
|
|
+
|
|
+ /*
|
|
+ * When create a new RSS rule, the old rule will be overlaid and set
|
|
+ * invalid.
|
|
+ */
|
|
+ TAILQ_FOREACH(filter_ptr, &hw->flow_rss_list, entries)
|
|
+ filter_ptr->filter_info.valid = false;
|
|
+
|
|
TAILQ_INSERT_TAIL(&hw->flow_rss_list, rss_filter_ptr, entries);
|
|
flow->rule = rss_filter_ptr;
|
|
flow->filter_type = RTE_ETH_FILTER_HASH;
|
|
--
|
|
2.23.0
|
|
|