patch 'net/nfp: fix getting RSS configuration' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/20/23. 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/2d42946f45224e6024d740c7cab4eb69d43fc5fc

Thanks.

Kevin

---
>From 2d42946f45224e6024d740c7cab4eb69d43fc5fc Mon Sep 17 00:00:00 2001
From: Long Wu <long.wu at corigine.com>
Date: Tue, 21 Feb 2023 13:52:22 +0800
Subject: [PATCH] net/nfp: fix getting RSS configuration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ]

"NFP_NET_CFG_RSS_IPV4" and "NFP_NET_CFG_RSS_IPV6" represent that
firmware will calculate RSS base on L3 rather than UDP or TCP
information from packets. So the logic of return RSS configuration in
driver is wrong.

Modify code to return the right configuration.

Fixes: 934e4c60fbff ("nfp: add RSS")

Signed-off-by: Long Wu <long.wu at corigine.com>
Reviewed-by: Chaoyong He <chaoyong.he at corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund at corigine.com>
---
 drivers/net/nfp/nfp_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
index b81eec58d3..ae087d0153 100644
--- a/drivers/net/nfp/nfp_common.c
+++ b/drivers/net/nfp/nfp_common.c
@@ -1249,5 +1249,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_NONFRAG_IPV4_UDP;
+		rss_hf |= RTE_ETH_RSS_IPV4;
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_TCP)
@@ -1264,5 +1264,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6)
-		rss_hf |= RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_NONFRAG_IPV6_UDP;
+		rss_hf |= RTE_ETH_RSS_IPV6;
 
 	/* Propagate current RSS hash functions to caller */
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:21.044601255 +0000
+++ 0018-net-nfp-fix-getting-RSS-configuration.patch	2023-03-15 14:30:20.571123651 +0000
@@ -1 +1 @@
-From ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd Mon Sep 17 00:00:00 2001
+From 2d42946f45224e6024d740c7cab4eb69d43fc5fc Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit ef26b8a08cd2ba0b47d3ca71316ea6e865abb6fd ]
+
@@ -17 +18,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 837056cc12..5922bfea8e 100644
+index b81eec58d3..ae087d0153 100644
@@ -30 +31 @@
-@@ -1421,5 +1421,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1249,5 +1249,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -37 +38 @@
-@@ -1436,5 +1436,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1264,5 +1264,5 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
@@ -43 +44 @@
- 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV4_SCTP)
+ 	/* Propagate current RSS hash functions to caller */