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)
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
From 2e78798fe932e9064677c6f2d1ea14542c503202 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:21 +0800
|
|
Subject: [PATCH 145/189] net/hns3: fix RSS filter restore
|
|
|
|
Currently, driver sets RSS function to 'RTE_ETH_HASH_FUNCTION_MAX'
|
|
when user flush all rules in order to judge whether driver needs
|
|
to restore RSS rules. In fact, all rules are saved in flow RSS list.
|
|
So there is no need to modify RSS function to this macro. And this
|
|
list can be used to restore. The modification of RSS function may
|
|
introduce new problem.
|
|
|
|
Fixes: eb158fc756a5 ("net/hns3: fix config when creating RSS rule after flush")
|
|
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 | 20 ++++++++++++++------
|
|
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index 8b9bfe4880..82ead96854 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1587,8 +1587,6 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
|
|
rss_info->conf.queue_num = 0;
|
|
}
|
|
|
|
- /* set RSS func invalid after flushed */
|
|
- rss_info->conf.func = RTE_ETH_HASH_FUNCTION_MAX;
|
|
return 0;
|
|
}
|
|
|
|
@@ -1659,13 +1657,23 @@ int
|
|
hns3_restore_rss_filter(struct rte_eth_dev *dev)
|
|
{
|
|
struct hns3_adapter *hns = dev->data->dev_private;
|
|
+ struct hns3_rss_conf_ele *filter;
|
|
struct hns3_hw *hw = &hns->hw;
|
|
+ int ret = 0;
|
|
|
|
- /* When user flush all rules, it doesn't need to restore RSS rule */
|
|
- if (hw->rss_info.conf.func == RTE_ETH_HASH_FUNCTION_MAX)
|
|
- return 0;
|
|
+ TAILQ_FOREACH(filter, &hw->flow_rss_list, entries) {
|
|
+ if (!filter->filter_info.valid)
|
|
+ continue;
|
|
|
|
- return hns3_config_rss_filter(dev, &hw->rss_info, true);
|
|
+ ret = hns3_config_rss_filter(dev, &filter->filter_info, true);
|
|
+ if (ret != 0) {
|
|
+ hns3_err(hw, "restore RSS filter failed, ret=%d", ret);
|
|
+ goto out;
|
|
+ }
|
|
+ }
|
|
+
|
|
+out:
|
|
+ return ret;
|
|
}
|
|
|
|
static int
|
|
--
|
|
2.23.0
|
|
|