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)
75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From baa250c283ba4180f3ac55b42c74f98d85860598 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:22 +0800
|
|
Subject: [PATCH 146/189] net/hns3: fix lock protection of RSS flow rule
|
|
|
|
RSS flow rules are saved in RSS filter linked list. The linked
|
|
list is modified by rte_flow API and is used to restore RSS rules
|
|
during reset process. So this patch uses 'hw->flows_lock' to protect
|
|
the configuration and recovery of RSS rule.
|
|
|
|
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
|
|
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 | 16 ++++++----------
|
|
1 file changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index 82ead96854..301a4a56b3 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1596,27 +1596,20 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
|
|
hns3_warn(hw, "Config queue numbers %u are beyond the scope of truncated",
|
|
rss_flow_conf.queue_num);
|
|
hns3_info(hw, "Max of contiguous %u PF queues are configured", num);
|
|
-
|
|
- rte_spinlock_lock(&hw->lock);
|
|
if (num) {
|
|
ret = hns3_update_indir_table(dev, &rss_flow_conf, num);
|
|
if (ret)
|
|
- goto rss_config_err;
|
|
+ return ret;
|
|
}
|
|
|
|
/* Set hash algorithm and flow types by the user's config */
|
|
ret = hns3_hw_rss_hash_set(hw, &rss_flow_conf);
|
|
if (ret)
|
|
- goto rss_config_err;
|
|
+ return ret;
|
|
|
|
ret = hns3_rss_conf_copy(rss_info, &rss_flow_conf);
|
|
- if (ret) {
|
|
+ if (ret)
|
|
hns3_err(hw, "RSS config init fail(%d)", ret);
|
|
- goto rss_config_err;
|
|
- }
|
|
-
|
|
-rss_config_err:
|
|
- rte_spinlock_unlock(&hw->lock);
|
|
|
|
return ret;
|
|
}
|
|
@@ -1661,6 +1654,7 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
|
|
struct hns3_hw *hw = &hns->hw;
|
|
int ret = 0;
|
|
|
|
+ pthread_mutex_lock(&hw->flows_lock);
|
|
TAILQ_FOREACH(filter, &hw->flow_rss_list, entries) {
|
|
if (!filter->filter_info.valid)
|
|
continue;
|
|
@@ -1673,6 +1667,8 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
|
|
}
|
|
|
|
out:
|
|
+ pthread_mutex_unlock(&hw->flows_lock);
|
|
+
|
|
return ret;
|
|
}
|
|
|
|
--
|
|
2.23.0
|
|
|