patch 'net/axgbe: optimise scattered Rx' has been queued to stable release 21.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.3

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/01/22. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/c57a09f16a5cf3c47127fa43bdbb695970094f63

Thanks.

Kevin

---
>From c57a09f16a5cf3c47127fa43bdbb695970094f63 Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Tue, 6 Sep 2022 07:59:15 -0400
Subject: [PATCH] net/axgbe: optimise scattered Rx

[ upstream commit 2770163844038ed4fe862c438a7e65443be0c817 ]

Updated the logic to remove the extra increments of the variables.

Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")

Signed-off-by: Bhagyada Modali <bhagyada.modali at amd.com>
Acked-by: Chandubabu Namburu <chandu at amd.com>
---
 drivers/net/axgbe/axgbe_rxtx.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 9d6ea38f45..7a95a1c437 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -342,5 +342,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 	volatile union axgbe_rx_desc *desc;
 
-	uint64_t old_dirty = rxq->dirty;
 	struct rte_mbuf *first_seg = NULL;
 	struct rte_mbuf *mbuf, *tmbuf;
@@ -354,6 +353,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 		bool eop = 0;
 next_desc:
-		if (unlikely(idx == rxq->nb_desc))
-			idx = 0;
+		idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
 
 		desc = &rxq->desc[idx];
@@ -448,5 +446,6 @@ next_desc:
 			} else {
 				first_seg->ol_flags &=
-					~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED);
+					~(RTE_MBUF_F_RX_VLAN |
+							RTE_MBUF_F_RX_VLAN_STRIPPED);
 				first_seg->vlan_tci = 0;
 			}
@@ -455,10 +454,9 @@ next_desc:
 err_set:
 		rxq->cur++;
-		rxq->sw_ring[idx++] = tmbuf;
+		rxq->sw_ring[idx] = tmbuf;
 		desc->read.baddr =
 			rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf));
 		memset((void *)(&desc->read.desc2), 0, 8);
 		AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1);
-		rxq->dirty++;
 
 		if (!eop) {
@@ -503,10 +501,11 @@ err_set:
 	rxq->pkts += nb_rx;
 
-	if (rxq->dirty != old_dirty) {
+	if (rxq->dirty != rxq->cur) {
 		rte_wmb();
-		idx = AXGBE_GET_DESC_IDX(rxq, rxq->dirty - 1);
+		idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur - 1);
 		AXGMAC_DMA_IOWRITE(rxq, DMA_CH_RDTR_LO,
 				   low32_value(rxq->ring_phys_addr +
 				   (idx * sizeof(union axgbe_rx_desc))));
+		rxq->dirty = rxq->cur;
 	}
 	return nb_rx;
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:18:58.869446248 +0100
+++ 0013-net-axgbe-optimise-scattered-Rx.patch	2022-10-25 14:18:58.363797919 +0100
@@ -1 +1 @@
-From 2770163844038ed4fe862c438a7e65443be0c817 Mon Sep 17 00:00:00 2001
+From c57a09f16a5cf3c47127fa43bdbb695970094f63 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2770163844038ed4fe862c438a7e65443be0c817 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 2bad638f79..8b43e8160b 100644
+index 9d6ea38f45..7a95a1c437 100644
@@ -21 +22 @@
-@@ -341,5 +341,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
+@@ -342,5 +342,4 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
@@ -27 +28 @@
-@@ -353,6 +352,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
+@@ -354,6 +353,5 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
@@ -35 +36 @@
-@@ -447,5 +445,6 @@ next_desc:
+@@ -448,5 +446,6 @@ next_desc:
@@ -43 +44 @@
-@@ -454,10 +453,9 @@ next_desc:
+@@ -455,10 +454,9 @@ next_desc:
@@ -55 +56 @@
-@@ -502,10 +500,11 @@ err_set:
+@@ -503,10 +501,11 @@ err_set: