patch 'net/axgbe: reset end of packet in scattered Rx' has been queued to stable release 20.11.7

[luca.boccassi at gmail.com]

Hi,

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

Thanks.

Luca Boccassi

---
>From c8fbd023ef95008f1a0f5ea8caeef0489584c99e Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Wed, 7 Sep 2022 23:31:07 -0400
Subject: [PATCH] net/axgbe: reset end of packet in scattered Rx

[ upstream commit 2a761aec228caf66025cacf07c7c9662ae021e03 ]

Reset the EOP in the failure scenario and also after the last segment.
Remove updating the packet length explicitly as it is done in chaining.

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 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 55aed1e73b..3875348f97 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -326,10 +326,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
 	unsigned int err = 0;
 	uint32_t error_status = 0;
 	uint16_t idx, pidx, data_len = 0, pkt_len = 0;
+	bool eop = 0;
 
 	idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
+
 	while (nb_rx < nb_pkts) {
-		bool eop = 0;
 next_desc:
 		idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur);
 
@@ -396,9 +397,12 @@ next_desc:
 		mbuf->pkt_len = data_len;
 
 		if (first_seg != NULL) {
-			if (rte_pktmbuf_chain(first_seg, mbuf) != 0)
+			if (rte_pktmbuf_chain(first_seg, mbuf) != 0) {
 				rte_mempool_put(rxq->mb_pool,
 						first_seg);
+				eop = 0;
+				break;
+			}
 		} else {
 			first_seg = mbuf;
 		}
@@ -418,8 +422,8 @@ err_set:
 
 		if (!eop)
 			goto next_desc;
+		eop = 0;
 
-		first_seg->pkt_len = pkt_len;
 		rxq->bytes += pkt_len;
 
 		first_seg->port = rxq->port_id;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:28.580658796 +0000
+++ 0052-net-axgbe-reset-end-of-packet-in-scattered-Rx.patch	2022-11-03 09:27:25.457424066 +0000
@@ -1 +1 @@
-From 2a761aec228caf66025cacf07c7c9662ae021e03 Mon Sep 17 00:00:00 2001
+From c8fbd023ef95008f1a0f5ea8caeef0489584c99e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2a761aec228caf66025cacf07c7c9662ae021e03 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index d4224992ee..4c16c59f37 100644
+index 55aed1e73b..3875348f97 100644
@@ -22 +23,2 @@
-@@ -346,10 +346,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
+@@ -326,10 +326,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
+ 	unsigned int err = 0;
@@ -25 +26,0 @@
- 	uint64_t offloads;
@@ -35 +36 @@
-@@ -416,9 +417,12 @@ next_desc:
+@@ -396,9 +397,12 @@ next_desc:
@@ -49 +50 @@
-@@ -460,8 +464,8 @@ err_set:
+@@ -418,8 +422,8 @@ err_set: