patch 'ethdev: fix RSS update when RSS is disabled' has been queued to stable release 21.11.2

[Kevin Traynor]

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/15b794b1521c40942aefc133e68f5e337e87d06c

Thanks.

Kevin

---
>From 15b794b1521c40942aefc133e68f5e337e87d06c Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong at huawei.com>
Date: Wed, 6 Apr 2022 14:57:00 +0800
Subject: [PATCH] ethdev: fix RSS update when RSS is disabled

[ upstream commit 93e1ea6dfa99dea359b8d66123576a395c2c0acd ]

The RTE_ETH_MQ_RX_RSS_FLAG flag is a switch to enable RSS. If the flag
is not set in dev_configure, RSS will be not configured and enabled.
However, RSS hash and reta can still be configured by ethdev ops to
enable RSS if the flag isn't set. The behavior is inconsistent.

Fixes: 99a2dd955fba ("lib: remove librte_ prefix from directory names")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at xilinx.com>
---
 lib/ethdev/rte_ethdev.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index bf93534b90..0ab5a3470d 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -4082,4 +4082,5 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
 			    uint16_t reta_size)
 {
+	enum rte_eth_rx_mq_mode mq_mode;
 	struct rte_eth_dev *dev;
 	int ret;
@@ -4113,4 +4114,10 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
 		return ret;
 
+	mq_mode = dev->data->dev_conf.rxmode.mq_mode;
+	if (!(mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
+		RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
+		return -ENOTSUP;
+	}
+
 	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->reta_update, -ENOTSUP);
 	return eth_err(port_id, (*dev->dev_ops->reta_update)(dev, reta_conf,
@@ -4152,4 +4159,5 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
 	struct rte_eth_dev *dev;
 	struct rte_eth_dev_info dev_info = { .flow_type_rss_offloads = 0, };
+	enum rte_eth_rx_mq_mode mq_mode;
 	int ret;
 
@@ -4177,4 +4185,11 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
 		return -EINVAL;
 	}
+
+	mq_mode = dev->data->dev_conf.rxmode.mq_mode;
+	if (!(mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
+		RTE_ETHDEV_LOG(ERR, "Multi-queue RSS mode isn't enabled.\n");
+		return -ENOTSUP;
+	}
+
 	RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->rss_hash_update, -ENOTSUP);
 	return eth_err(port_id, (*dev->dev_ops->rss_hash_update)(dev,
-- 
2.34.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-05-25 17:26:59.205703543 +0100
+++ 0026-ethdev-fix-RSS-update-when-RSS-is-disabled.patch	2022-05-25 17:26:58.582828353 +0100
@@ -1 +1 @@
-From 93e1ea6dfa99dea359b8d66123576a395c2c0acd Mon Sep 17 00:00:00 2001
+From 15b794b1521c40942aefc133e68f5e337e87d06c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 93e1ea6dfa99dea359b8d66123576a395c2c0acd ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 29a3d80466..8520aec561 100644
+index bf93534b90..0ab5a3470d 100644
@@ -25 +26 @@
-@@ -3868,4 +3868,5 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
+@@ -4082,4 +4082,5 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
@@ -31 +32 @@
-@@ -3899,4 +3900,10 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
+@@ -4113,4 +4114,10 @@ rte_eth_dev_rss_reta_update(uint16_t port_id,
@@ -42 +43 @@
-@@ -3938,4 +3945,5 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
+@@ -4152,4 +4159,5 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
@@ -48 +49 @@
-@@ -3963,4 +3971,11 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,
+@@ -4177,4 +4185,11 @@ rte_eth_dev_rss_hash_update(uint16_t port_id,