patch 'net/hns3: remove unnecessary RSS switch' has been queued to stable release 21.11.2

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to stable release 21.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/30/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/66b7e330d6f075245880dd79e0b1c207e010f208

Thanks.

Kevin

---
From 66b7e330d6f075245880dd79e0b1c207e010f208 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

[ upstream commit ec1691494273ef4f9cb60ed24099196de1ce0cc4 ]

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")

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 9992b64d4e..7fb246c193 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2031,5 +2031,4 @@ hns3_dev_configure(struct rte_eth_dev *dev)
 		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)
@@ -2850,5 +2849,4 @@ 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;
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 952434c864..134a33ee2f 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -531,5 +531,4 @@ 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 7ad37b08d2..7a843fd7d5 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -497,5 +497,4 @@ hns3vf_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;
-		hw->rss_dis_flag = false;
 		rss_conf = conf->rx_adv_conf.rss_conf;
 		ret = hns3_dev_rss_hash_update(dev, &rss_conf);
@@ -1032,5 +1031,4 @@ hns3vf_get_configuration(struct hns3_hw *hw)
 
 	hw->mac.media_type = HNS3_MEDIA_TYPE_NONE;
-	hw->rss_dis_flag = false;
 
 	/* Get device capability */
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index ea88deca32..4fc938cee0 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1402,5 +1402,4 @@ hns3_disable_rss(struct hns3_hw *hw)
 	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
@@ -382,7 +382,4 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
 	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",
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.228553607 +0100
+++ 0027-net-hns3-remove-unnecessary-RSS-switch.patch	2022-05-25 17:26:58.591828367 +0100
@@ -1 +1 @@
-From ec1691494273ef4f9cb60ed24099196de1ce0cc4 Mon Sep 17 00:00:00 2001
+From 66b7e330d6f075245880dd79e0b1c207e010f208 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ec1691494273ef4f9cb60ed24099196de1ce0cc4 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 4d5a595aab..0b565a5614 100644
+index 9992b64d4e..7fb246c193 100644
@@ -27 +28 @@
-@@ -2019,5 +2019,4 @@ hns3_dev_configure(struct rte_eth_dev *dev)
+@@ -2031,5 +2031,4 @@ hns3_dev_configure(struct rte_eth_dev *dev)
@@ -33 +34 @@
-@@ -2825,5 +2824,4 @@ hns3_get_board_configuration(struct hns3_hw *hw)
+@@ -2850,5 +2849,4 @@ hns3_get_board_configuration(struct hns3_hw *hw)
@@ -40 +41 @@
-index bb6ddd97ba..5e8a746514 100644
+index 952434c864..134a33ee2f 100644
@@ -43 +44 @@
-@@ -527,5 +527,4 @@ struct hns3_hw {
+@@ -531,5 +531,4 @@ struct hns3_hw {
@@ -50 +51 @@
-index f641e0dc36..589de0ab3a 100644
+index 7ad37b08d2..7a843fd7d5 100644
@@ -53 +54 @@
-@@ -496,5 +496,4 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
+@@ -497,5 +497,4 @@ hns3vf_dev_configure(struct rte_eth_dev *dev)
@@ -59 +60 @@
-@@ -998,5 +997,4 @@ hns3vf_get_configuration(struct hns3_hw *hw)
+@@ -1032,5 +1031,4 @@ hns3vf_get_configuration(struct hns3_hw *hw)
@@ -66 +67 @@
-index 317f91fc71..86ebbf69b6 100644
+index ea88deca32..4fc938cee0 100644
@@ -69 +70 @@
-@@ -1450,5 +1450,4 @@ hns3_disable_rss(struct hns3_hw *hw)
+@@ -1402,5 +1402,4 @@ hns3_disable_rss(struct hns3_hw *hw)