[dpdk-stable] patch 'net/ice: fix queue config in DCF' 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/073599bf922da392da2107290727108ca3d1534c

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 073599bf922da392da2107290727108ca3d1534c Mon Sep 17 00:00:00 2001
From: Jie Wang <jie1x.wang at intel.com>
Date: Tue, 24 Aug 2021 15:13:17 +0000
Subject: [PATCH] net/ice: fix queue config in DCF
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 415363e2fc58ad89caf65d3d170b004751376f1a ]

When DCF configures rx_queues, it may cause the pointer of
rx_queues to go out of bounds.

This patch expands the scope of the judgment condition to
fix this issue.

Fixes: 4b0d391f0eab ("net/ice: add queue config in DCF")

Signed-off-by: Jie Wang <jie1x.wang at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/ice/ice_dcf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c
index 3925a51f12..6a24f4f36c 100644
--- a/drivers/net/ice/ice_dcf.c
+++ b/drivers/net/ice/ice_dcf.c
@@ -863,11 +863,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
 		}
 		vc_qp->rxq.vsi_id = hw->vsi_res->vsi_id;
 		vc_qp->rxq.queue_id = i;
-		vc_qp->rxq.max_pkt_size = rxq[i]->max_pkt_len;
 
 		if (i >= hw->eth_dev->data->nb_rx_queues)
 			continue;
 
+		vc_qp->rxq.max_pkt_size = rxq[i]->max_pkt_len;
 		vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc;
 		vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_dma;
 		vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len;
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:03.187932589 +0800
+++ 0024-net-ice-fix-queue-config-in-DCF.patch	2021-11-10 14:17:01.764080297 +0800
@@ -1 +1 @@
-From 415363e2fc58ad89caf65d3d170b004751376f1a Mon Sep 17 00:00:00 2001
+From 073599bf922da392da2107290727108ca3d1534c Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 415363e2fc58ad89caf65d3d170b004751376f1a ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -22 +24 @@
-index 5b23cc90e0..ee3c85b90d 100644
+index 3925a51f12..6a24f4f36c 100644
@@ -25 +27 @@
-@@ -882,11 +882,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)
+@@ -863,11 +863,11 @@ ice_dcf_configure_queues(struct ice_dcf_hw *hw)