62a20ce454
Signed-off-by: speech_white <humin29@huawei.com> (cherry picked from commit 39c2c5154122fef74060ffd6dbbe8cd4fdd9d21b)
104 lines
3.6 KiB
Diff
104 lines
3.6 KiB
Diff
From ec1691494273ef4f9cb60ed24099196de1ce0cc4 Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Wed, 6 Apr 2022 14:57:01 +0800
|
|
Subject: [PATCH] net/hns3: remove unnecessary RSS switch
|
|
|
|
Whether the RSS is enabled depends on RTE_ETH_MQ_RX_RSS_FLAG and packet
|
|
tuple are enabled. So the RSS switch is unnecessary.
|
|
|
|
Fixes: 5e782bc2570c ("net/hns3: fix configuring RSS hash when rules are flushed")
|
|
Fixes: fd8196838763 ("net/hns3: fix configuring device with RSS enabled")
|
|
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_ethdev.c | 2 --
|
|
drivers/net/hns3/hns3_ethdev.h | 1 -
|
|
drivers/net/hns3/hns3_ethdev_vf.c | 2 --
|
|
drivers/net/hns3/hns3_flow.c | 1 -
|
|
drivers/net/hns3/hns3_rss.c | 3 ---
|
|
5 files changed, 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
|
|
index 4d5a595aab..0b565a5614 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev.c
|
|
@@ -2018,7 +2018,6 @@ hns3_dev_configure(struct rte_eth_dev *dev)
|
|
if ((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
|
|
conf->rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
|
|
rss_conf = conf->rx_adv_conf.rss_conf;
|
|
- hw->rss_dis_flag = false;
|
|
ret = hns3_dev_rss_hash_update(dev, &rss_conf);
|
|
if (ret)
|
|
goto cfg_err;
|
|
@@ -2824,7 +2823,6 @@ hns3_get_board_configuration(struct hns3_hw *hw)
|
|
|
|
hw->mac.media_type = cfg.media_type;
|
|
hw->rss_size_max = cfg.rss_size_max;
|
|
- hw->rss_dis_flag = false;
|
|
memcpy(hw->mac.mac_addr, cfg.mac_addr, RTE_ETHER_ADDR_LEN);
|
|
hw->mac.phy_addr = cfg.phy_addr;
|
|
hw->dcb_info.num_pg = 1;
|
|
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
|
|
index bb6ddd97ba..5e8a746514 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev.h
|
|
+++ b/drivers/net/hns3/hns3_ethdev.h
|
|
@@ -526,7 +526,6 @@ struct hns3_hw {
|
|
|
|
/* The configuration info of RSS */
|
|
struct hns3_rss_conf rss_info;
|
|
- bool rss_dis_flag; /* disable rss flag. true: disable, false: enable */
|
|
uint16_t rss_ind_tbl_size;
|
|
uint16_t rss_key_size;
|
|
|
|
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
index f641e0dc36..589de0ab3a 100644
|
|
--- a/drivers/net/hns3/hns3_ethdev_vf.c
|
|
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
|
|
@@ -495,7 +495,6 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
|
|
/* When RSS is not configured, redirect the packet queue 0 */
|
|
if ((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
|
|
conf->rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
|
|
- hw->rss_dis_flag = false;
|
|
rss_conf = conf->rx_adv_conf.rss_conf;
|
|
ret = hns3_dev_rss_hash_update(dev, &rss_conf);
|
|
if (ret)
|
|
@@ -997,7 +996,6 @@ hns3vf_get_configuration(struct hns3_hw *hw)
|
|
int ret;
|
|
|
|
hw->mac.media_type = HNS3_MEDIA_TYPE_NONE;
|
|
- hw->rss_dis_flag = false;
|
|
|
|
/* Get device capability */
|
|
ret = hns3vf_get_capability(hw);
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index 317f91fc71..86ebbf69b6 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1449,7 +1449,6 @@ hns3_disable_rss(struct hns3_hw *hw)
|
|
ret = hns3_set_rss_tuple_by_rss_hf(hw, 0);
|
|
if (ret)
|
|
return ret;
|
|
- hw->rss_dis_flag = true;
|
|
|
|
return 0;
|
|
}
|
|
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
|
|
index e149c16bfe..d376486a1d 100644
|
|
--- a/drivers/net/hns3/hns3_rss.c
|
|
+++ b/drivers/net/hns3/hns3_rss.c
|
|
@@ -381,9 +381,6 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
|
|
uint8_t *key = rss_conf->rss_key;
|
|
int ret;
|
|
|
|
- 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);
|
|
--
|
|
2.33.0
|
|
|