[dpdk-stable] patch 'net/sfc: allow to query RSS key and HF when RSS is disabled' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From fcd376d4082e9b0cd1d070029e0061e8f2844caa Mon Sep 17 00:00:00 2001
From: Ivan Malov <ivan.malov at oktetlabs.ru>
Date: Thu, 11 Oct 2018 15:51:13 +0100
Subject: [PATCH] net/sfc: allow to query RSS key and HF when RSS is disabled

[ upstream commit 662e382244fb29d8bf03113524a139541e10123f ]

If global RSS is not enabled in the multiqueue mode setting,
it will not be possible to change RSS configuration. However,
querying default RSS settings should be possible in any case since
it may be needed by RTE flow API users to find out what RSS settings
will be used by default for a flow rule with RSS action if custom
RSS key and hash function choice are not specified.

Fixes: 63ab5e0c8fda ("net/sfc: use zero RSS channels as disabled RSS indicator")

Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/sfc_ethdev.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index d38a3f4e8..f972d2b82 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -1348,7 +1348,4 @@ sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 		return -ENOTSUP;
 
-	if (rss->channels == 0)
-		return -EINVAL;
-
 	sfc_adapter_lock(sa);
 
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.767448721 +0000
+++ 0067-net-sfc-allow-to-query-RSS-key-and-HF-when-RSS-is-di.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,8 +1,10 @@
-From 662e382244fb29d8bf03113524a139541e10123f Mon Sep 17 00:00:00 2001
+From fcd376d4082e9b0cd1d070029e0061e8f2844caa Mon Sep 17 00:00:00 2001
 From: Ivan Malov <ivan.malov at oktetlabs.ru>
 Date: Thu, 11 Oct 2018 15:51:13 +0100
 Subject: [PATCH] net/sfc: allow to query RSS key and HF when RSS is disabled
 
+[ upstream commit 662e382244fb29d8bf03113524a139541e10123f ]
+
 If global RSS is not enabled in the multiqueue mode setting,
 it will not be possible to change RSS configuration. However,
 querying default RSS settings should be possible in any case since
@@ -11,7 +13,6 @@
 RSS key and hash function choice are not specified.
 
 Fixes: 63ab5e0c8fda ("net/sfc: use zero RSS channels as disabled RSS indicator")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ivan Malov <ivan.malov at oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -20,10 +21,10 @@
  1 file changed, 3 deletions(-)
 
 diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
-index 00f088013..b2e17f26e 100644
+index d38a3f4e8..f972d2b82 100644
 --- a/drivers/net/sfc/sfc_ethdev.c
 +++ b/drivers/net/sfc/sfc_ethdev.c
-@@ -1359,7 +1359,4 @@ sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
+@@ -1348,7 +1348,4 @@ sfc_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
  		return -ENOTSUP;
  
 -	if (rss->channels == 0)