[dpdk-stable] patch 'net/nfp: fix RSS hash configuration reporting' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 07/26/20. 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.

Thanks.

Luca Boccassi

---
>From 74b620c90cb5b57e4b504a22f1f91c26f2c0eda2 Mon Sep 17 00:00:00 2001
From: Heinrich Kuhn <heinrich.kuhn at netronome.com>
Date: Fri, 10 Jul 2020 16:28:46 +0200
Subject: [PATCH] net/nfp: fix RSS hash configuration reporting

[ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ]

Prior to this fix the NFP PMD implementation of the .rss_hash_conf_get
callback did not propagate the current hardware state of rss_hf back up
to the caller. Users of the hash_conf_get callback would receive an
incorrect representation of what the RSS configuration currently is in
hardware.

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

Signed-off-by: Heinrich Kuhn <heinrich.kuhn at netronome.com>
Signed-off-by: Simon Horman <simon.horman at netronome.com>
---
 drivers/net/nfp/nfp_net.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index a670be949..082aa4682 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2621,6 +2621,9 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,
 	if (cfg_rss_ctrl & NFP_NET_CFG_RSS_IPV6)
 		rss_hf |= ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_NONFRAG_IPV6_UDP;
 
+	/* Propagate current RSS hash functions to caller */
+	rss_conf->rss_hf = rss_hf;
+
 	/* Reading the key size */
 	rss_conf->rss_key_len = nn_cfg_readl(hw, NFP_NET_CFG_RSS_KEY_SZ);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:53.998056889 +0100
+++ 0141-net-nfp-fix-RSS-hash-configuration-reporting.patch	2020-07-24 12:53:48.479010037 +0100
@@ -1,8 +1,10 @@
-From 198e745083b960d167bd769e2f81818c835f68b8 Mon Sep 17 00:00:00 2001
+From 74b620c90cb5b57e4b504a22f1f91c26f2c0eda2 Mon Sep 17 00:00:00 2001
 From: Heinrich Kuhn <heinrich.kuhn at netronome.com>
 Date: Fri, 10 Jul 2020 16:28:46 +0200
 Subject: [PATCH] net/nfp: fix RSS hash configuration reporting
 
+[ upstream commit 198e745083b960d167bd769e2f81818c835f68b8 ]
+
 Prior to this fix the NFP PMD implementation of the .rss_hash_conf_get
 callback did not propagate the current hardware state of rss_hf back up
 to the caller. Users of the hash_conf_get callback would receive an
@@ -10,7 +12,6 @@
 hardware.
 
 Fixes: 934e4c60fbff ("nfp: add RSS")
-Cc: stable at dpdk.org
 
 Signed-off-by: Heinrich Kuhn <heinrich.kuhn at netronome.com>
 Signed-off-by: Simon Horman <simon.horman at netronome.com>
@@ -19,7 +20,7 @@
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
-index 474719b79..99946279d 100644
+index a670be949..082aa4682 100644
 --- a/drivers/net/nfp/nfp_net.c
 +++ b/drivers/net/nfp/nfp_net.c
 @@ -2621,6 +2621,9 @@ nfp_net_rss_hash_conf_get(struct rte_eth_dev *dev,