[dpdk-stable] patch 'net/virtio: fix check scatter on all Rx queues' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 11/12/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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/9e14b11f35b4c2c1bf699bcb3d10c47340132a1c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9e14b11f35b4c2c1bf699bcb3d10c47340132a1c Mon Sep 17 00:00:00 2001
From: Zhihong Peng <zhihongx.peng at intel.com>
Date: Fri, 8 Oct 2021 05:49:45 +0000
Subject: [PATCH] net/virtio: fix check scatter on all Rx queues
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 84cc857b5d9a344a1f04ec9f55417b58cd38e260 ]

This patch fixes the wrong way to obtain virtqueue.
The end of virtqueue cannot be judged based on whether
the array is NULL.

Fixes: 4e8169eb0d2d ("net/virtio: fix Rx scatter offload")

Signed-off-by: Zhihong Peng <zhihongx.peng at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index ed20b1427e..afa9fb591f 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -900,8 +900,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev,
 	if (hw->vqs == NULL)
 		return true;
 
-	for (qidx = 0; (vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]) != NULL;
-	     qidx++) {
+	for (qidx = 0; qidx < hw->max_queue_pairs; qidx++) {
+		vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX];
+		if (vq == NULL)
+			continue;
+
 		rxvq = &vq->rxq;
 		if (rxvq->mpool == NULL)
 			continue;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:09.795391724 +0800
+++ 0177-net-virtio-fix-check-scatter-on-all-Rx-queues.patch	2021-11-10 14:17:01.990745109 +0800
@@ -1 +1 @@
-From 84cc857b5d9a344a1f04ec9f55417b58cd38e260 Mon Sep 17 00:00:00 2001
+From 9e14b11f35b4c2c1bf699bcb3d10c47340132a1c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 84cc857b5d9a344a1f04ec9f55417b58cd38e260 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index 047d3f43a3..ddf0e26ab4 100644
+index ed20b1427e..afa9fb591f 100644
@@ -23 +25 @@
-@@ -882,8 +882,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev,
+@@ -900,8 +900,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev,