[dpdk-stable] patch 'net/ice: fix RSS lookup table initialization' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/06/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/f624f2e7a4c403023d9b17acff9e660ec2fdfde4

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From f624f2e7a4c403023d9b17acff9e660ec2fdfde4 Mon Sep 17 00:00:00 2001
From: Alvin Zhang <alvinx.zhang at intel.com>
Date: Fri, 8 Jan 2021 15:29:10 +0800
Subject: [PATCH] net/ice: fix RSS lookup table initialization

[ upstream commit 7fe2fde05ac8766afaed4344659e39e8fc6b2514 ]

RSS look-up table initialization is done incorrectly due to
divide-by-zero error.
Add a check to rx-queue count.

Fixes: 50370662b727 ("net/ice: support device and queue ops")

Signed-off-by: Alvin Zhang <alvinx.zhang at intel.com>
Tested-by: Wei Xie <weix.xie at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 833a3ceac3..6723a21a7a 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2612,10 +2612,12 @@ ice_dev_configure(struct rte_eth_dev *dev)
 	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
 		dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
 
-	ret = ice_init_rss(pf);
-	if (ret) {
-		PMD_DRV_LOG(ERR, "Failed to enable rss for PF");
-		return ret;
+	if (dev->data->nb_rx_queues) {
+		ret = ice_init_rss(pf);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "Failed to enable rss for PF");
+			return ret;
+		}
 	}
 
 	return 0;
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-04 12:04:29.709710734 +0100
+++ 0038-net-ice-fix-RSS-lookup-table-initialization.patch	2021-02-04 12:04:27.950789652 +0100
@@ -1 +1 @@
-From 7fe2fde05ac8766afaed4344659e39e8fc6b2514 Mon Sep 17 00:00:00 2001
+From f624f2e7a4c403023d9b17acff9e660ec2fdfde4 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7fe2fde05ac8766afaed4344659e39e8fc6b2514 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 587f485ee3..e2799a8eb2 100644
+index 833a3ceac3..6723a21a7a 100644
@@ -24 +25 @@
-@@ -3274,10 +3274,12 @@ ice_dev_configure(struct rte_eth_dev *dev)
+@@ -2612,10 +2612,12 @@ ice_dev_configure(struct rte_eth_dev *dev)