patch 'net/axgbe: fix length of each segment 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/81a3b2b2be3551e833c1fb4dbd365d56160da605

Thanks.

Luca Boccassi

---
>From 81a3b2b2be3551e833c1fb4dbd365d56160da605 Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Fri, 2 Sep 2022 04:47:53 -0400
Subject: [PATCH] net/axgbe: fix length of each segment in scattered Rx

[ upstream commit d901cc0596317a861b90a2c26b6560bde92bd2df ]

Updating mbuf data_len, Pkt_len for each segment before chaining them

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

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index cbcbe0e682..b498f94ae2 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -392,6 +392,10 @@ next_desc:
 			}
 
 		}
+		/* Mbuf populate */
+		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
+		mbuf->data_len = data_len;
+		mbuf->pkt_len = data_len;
 
 		if (first_seg != NULL) {
 			if (rte_pktmbuf_chain(first_seg, mbuf) != 0)
@@ -405,10 +409,6 @@ next_desc:
 		if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
 			mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
 
-		/* Mbuf populate */
-		mbuf->data_off = RTE_PKTMBUF_HEADROOM;
-		mbuf->data_len = data_len;
-
 err_set:
 		rxq->cur++;
 		rxq->sw_ring[idx++] = tmbuf;
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:25.994405255 +0000
+++ 0008-net-axgbe-fix-length-of-each-segment-in-scattered-Rx.patch	2022-11-03 09:27:25.305421124 +0000
@@ -1 +1 @@
-From d901cc0596317a861b90a2c26b6560bde92bd2df Mon Sep 17 00:00:00 2001
+From 81a3b2b2be3551e833c1fb4dbd365d56160da605 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d901cc0596317a861b90a2c26b6560bde92bd2df ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -14,2 +15,2 @@
- drivers/net/axgbe/axgbe_rxtx.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ drivers/net/axgbe/axgbe_rxtx.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
@@ -18 +19 @@
-index 2c2554e900..7c07fd90ef 100644
+index cbcbe0e682..b498f94ae2 100644
@@ -21 +22 @@
-@@ -412,6 +412,10 @@ next_desc:
+@@ -392,6 +392,10 @@ next_desc:
@@ -32,4 +33,4 @@
-@@ -443,9 +447,6 @@ next_desc:
- 				mbuf->vlan_tci = 0;
- 			}
- 		}
+@@ -405,10 +409,6 @@ next_desc:
+ 		if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
+ 			mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
+ 
@@ -39 +40 @@
- 
+-
@@ -41,0 +43 @@
+ 		rxq->sw_ring[idx++] = tmbuf;