62a20ce454
Signed-off-by: speech_white <humin29@huawei.com> (cherry picked from commit 39c2c5154122fef74060ffd6dbbe8cd4fdd9d21b)
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
From 07f64b5f576a779c8c3df4ba45ad70c306dcb562 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Thu, 5 May 2022 20:27:06 +0800
|
|
Subject: [PATCH] net/hns3: fix rollback on RSS hash update
|
|
|
|
The RSS tuple isn't restored when RSS key length is invalid or setting
|
|
algo key failed. This patch fixes it.
|
|
|
|
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rss.c | 24 +++++++++++++-----------
|
|
1 file changed, 13 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
|
|
index 1c703952b9..4b2c24ace4 100644
|
|
--- a/drivers/net/hns3/hns3_rss.c
|
|
+++ b/drivers/net/hns3/hns3_rss.c
|
|
@@ -376,9 +376,9 @@ int
|
|
hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
|
|
struct rte_eth_rss_conf *rss_conf)
|
|
{
|
|
- struct hns3_adapter *hns = dev->data->dev_private;
|
|
- struct hns3_hw *hw = &hns->hw;
|
|
+ struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
|
struct hns3_rss_tuple_cfg *tuple = &hw->rss_info.rss_tuple_sets;
|
|
+ uint64_t rss_hf_bk = hw->rss_info.conf.types;
|
|
uint8_t key_len = rss_conf->rss_key_len;
|
|
uint64_t rss_hf = rss_conf->rss_hf;
|
|
uint8_t *key = rss_conf->rss_key;
|
|
@@ -387,27 +387,29 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
|
|
if (hw->rss_dis_flag)
|
|
return -EINVAL;
|
|
|
|
+ if (key && key_len != HNS3_RSS_KEY_SIZE) {
|
|
+ hns3_err(hw, "the hash key len(%u) is invalid, must be %u",
|
|
+ key_len, HNS3_RSS_KEY_SIZE);
|
|
+ return -EINVAL;
|
|
+ }
|
|
+
|
|
rte_spinlock_lock(&hw->lock);
|
|
ret = hns3_set_rss_tuple_by_rss_hf(hw, tuple, rss_hf);
|
|
if (ret)
|
|
- goto conf_err;
|
|
+ goto set_tuple_fail;
|
|
|
|
if (key) {
|
|
- if (key_len != HNS3_RSS_KEY_SIZE) {
|
|
- hns3_err(hw, "The hash key len(%u) is invalid",
|
|
- key_len);
|
|
- ret = -EINVAL;
|
|
- goto conf_err;
|
|
- }
|
|
ret = hns3_rss_set_algo_key(hw, key);
|
|
if (ret)
|
|
- goto conf_err;
|
|
+ goto set_algo_key_fail;
|
|
}
|
|
rte_spinlock_unlock(&hw->lock);
|
|
|
|
return 0;
|
|
|
|
-conf_err:
|
|
+set_algo_key_fail:
|
|
+ (void)hns3_set_rss_tuple_by_rss_hf(hw, tuple, rss_hf_bk);
|
|
+set_tuple_fail:
|
|
rte_spinlock_unlock(&hw->lock);
|
|
return ret;
|
|
}
|
|
--
|
|
2.33.0
|
|
|