patch 'net/axgbe: save segment data 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/f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe

Thanks.

Luca Boccassi

---
>From f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Wed, 7 Sep 2022 23:31:09 -0400
Subject: [PATCH] net/axgbe: save segment data in scattered Rx

[ upstream commit 91907ec24783fedb28c7ebd82b88942caf0863ca ]

Saving the current segments of the packet, when the next segment data is
not ready.

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 ++++++++++
 drivers/net/axgbe/axgbe_rxtx.h |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 35925d3a7f..edc0844a25 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -396,11 +396,17 @@ next_desc:
 		mbuf->data_len = data_len;
 		mbuf->pkt_len = data_len;
 
+		if (rxq->saved_mbuf) {
+			first_seg = rxq->saved_mbuf;
+			rxq->saved_mbuf = NULL;
+		}
+
 		if (first_seg != NULL) {
 			if (rte_pktmbuf_chain(first_seg, mbuf) != 0) {
 				rte_pktmbuf_free(first_seg);
 				first_seg = NULL;
 				rte_pktmbuf_free(mbuf);
+				rxq->saved_mbuf = NULL;
 				rxq->errors++;
 				eop = 0;
 				break;
@@ -457,6 +463,10 @@ err_set:
 		first_seg = NULL;
 	}
 
+	/* Check if we need to save state before leaving */
+	if (first_seg != NULL && eop == 0)
+		rxq->saved_mbuf = first_seg;
+
 	/* Save receive context.*/
 	rxq->pkts += nb_rx;
 
diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h
index f2fbe9299d..54eaca1be5 100644
--- a/drivers/net/axgbe/axgbe_rxtx.h
+++ b/drivers/net/axgbe/axgbe_rxtx.h
@@ -65,6 +65,12 @@ struct axgbe_rx_queue {
 	uint16_t crc_len;
 	/* address of  s/w rx buffers */
 	struct rte_mbuf **sw_ring;
+
+	/* For segemented packets - save the current state
+	 * of packet, if next descriptor is not ready yet
+	 */
+	struct rte_mbuf *saved_mbuf;
+
 	/* Port private data */
 	struct axgbe_port *pdata;
 	/* Number of Rx descriptors in queue */
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:28.683741179 +0000
+++ 0054-net-axgbe-save-segment-data-in-scattered-Rx.patch	2022-11-03 09:27:25.457424066 +0000
@@ -1 +1 @@
-From 91907ec24783fedb28c7ebd82b88942caf0863ca Mon Sep 17 00:00:00 2001
+From f7b1922b93acfc46b00d19b35aa8d21e21e3c8fe Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 91907ec24783fedb28c7ebd82b88942caf0863ca ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index f2136e30b0..a1a463bc79 100644
+index 35925d3a7f..edc0844a25 100644
@@ -23 +24 @@
-@@ -416,11 +416,17 @@ next_desc:
+@@ -396,11 +396,17 @@ next_desc:
@@ -41 +42 @@
-@@ -499,6 +505,10 @@ err_set:
+@@ -457,6 +463,10 @@ err_set:
@@ -53 +54 @@
-index 2a330339cd..2da3095547 100644
+index f2fbe9299d..54eaca1be5 100644