[dpdk-stable] patch 'net/ice: check Rx queue number on RSS init' 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/593797bd16ee8b886a9179723184c534b0ccfc23

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 593797bd16ee8b886a9179723184c534b0ccfc23 Mon Sep 17 00:00:00 2001
From: Dapeng Yu <dapengx.yu at intel.com>
Date: Wed, 23 Dec 2020 13:30:18 +0800
Subject: [PATCH] net/ice: check Rx queue number on RSS init

[ upstream commit bfa4f648728a742f0b38edb628e2978fa5721b01 ]

When RSS is initialized, rx queues number is used as denominator to set
default value into the RSS lookup table. If it is zero, there will be
error of being divided by 0. So add value check to avoid the error.

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

Signed-off-by: Dapeng Yu <dapengx.yu at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 8acfce00aa..833a3ceac3 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2459,6 +2459,12 @@ static int ice_init_rss(struct ice_pf *pf)
 	vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;
 	vsi->rss_lut_size = pf->hash_lut_size;
 
+	if (nb_q == 0) {
+		PMD_DRV_LOG(WARNING,
+			"RSS is not supported as rx queues number is zero\n");
+		return 0;
+	}
+
 	if (is_safe_mode) {
 		PMD_DRV_LOG(WARNING, "RSS is not supported in safe mode\n");
 		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.391013145 +0100
+++ 0030-net-ice-check-Rx-queue-number-on-RSS-init.patch	2021-02-04 12:04:27.914789616 +0100
@@ -1 +1 @@
-From bfa4f648728a742f0b38edb628e2978fa5721b01 Mon Sep 17 00:00:00 2001
+From 593797bd16ee8b886a9179723184c534b0ccfc23 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit bfa4f648728a742f0b38edb628e2978fa5721b01 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 9a5d6a559f..bbb8c14606 100644
+index 8acfce00aa..833a3ceac3 100644
@@ -23 +24 @@
-@@ -3182,6 +3182,12 @@ static int ice_init_rss(struct ice_pf *pf)
+@@ -2459,6 +2459,12 @@ static int ice_init_rss(struct ice_pf *pf)