patch 'net/axgbe: fix checksum and RSS 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/437187fe7cba7b75057b8eb3e349b011c46904a0

Thanks.

Luca Boccassi

---
>From 437187fe7cba7b75057b8eb3e349b011c46904a0 Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Fri, 2 Sep 2022 04:47:54 -0400
Subject: [PATCH] net/axgbe: fix checksum and RSS in scattered Rx

[ upstream commit 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 ]

Updated the RSS hash and CSUM checks with first_seg instead of mbufs.

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

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index b498f94ae2..6696f49a1e 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -407,7 +407,8 @@ next_desc:
 
 		/* Get the RSS hash */
 		if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
-			mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
+			first_seg->hash.rss =
+				rte_le_to_cpu_32(desc->write.desc1);
 
 err_set:
 		rxq->cur++;
@@ -429,18 +430,24 @@ err_set:
 
 		first_seg->port = rxq->port_id;
 		if (rxq->pdata->rx_csum_enable) {
-			mbuf->ol_flags = 0;
-			mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
-			mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+			first_seg->ol_flags = 0;
+			first_seg->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+			first_seg->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
 			if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) {
-				mbuf->ol_flags &= ~PKT_RX_IP_CKSUM_GOOD;
-				mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-				mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD;
-				mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
+				first_seg->ol_flags &=
+					~PKT_RX_IP_CKSUM_GOOD;
+				first_seg->ol_flags |=
+					PKT_RX_IP_CKSUM_BAD;
+				first_seg->ol_flags &=
+					~PKT_RX_L4_CKSUM_GOOD;
+				first_seg->ol_flags |=
+					PKT_RX_L4_CKSUM_UNKNOWN;
 			} else if (unlikely(error_status
 						== AXGBE_L4_CSUM_ERR)) {
-				mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD;
-				mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+				first_seg->ol_flags &=
+					~PKT_RX_L4_CKSUM_GOOD;
+				first_seg->ol_flags |=
+					PKT_RX_L4_CKSUM_BAD;
 			}
 		}
 
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:26.051985842 +0000
+++ 0009-net-axgbe-fix-checksum-and-RSS-in-scattered-Rx.patch	2022-11-03 09:27:25.309421202 +0000
@@ -1 +1 @@
-From 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 Mon Sep 17 00:00:00 2001
+From 437187fe7cba7b75057b8eb3e349b011c46904a0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 970d2e22ca48581dcb8ee467a3521e9a22fbf8f4 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -14,2 +15,2 @@
- drivers/net/axgbe/axgbe_rxtx.c | 41 +++++++++++++++++++++-------------
- 1 file changed, 25 insertions(+), 16 deletions(-)
+ drivers/net/axgbe/axgbe_rxtx.c | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
@@ -18 +19 @@
-index 7c07fd90ef..2bad638f79 100644
+index b498f94ae2..6696f49a1e 100644
@@ -21 +22 @@
-@@ -427,24 +427,27 @@ next_desc:
+@@ -407,7 +407,8 @@ next_desc:
@@ -28,27 +28,0 @@
- 		etlt = AXGMAC_GET_BITS_LE(desc->write.desc3,
- 				RX_NORMAL_DESC3, ETLT);
- 		offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;
- 		if (!err || !etlt) {
- 			if (etlt == RX_CVLAN_TAG_PRESENT) {
--				mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN;
--				mbuf->vlan_tci =
-+				first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN;
-+				first_seg->vlan_tci =
- 					AXGMAC_GET_BITS_LE(desc->write.desc0,
- 							RX_NORMAL_DESC0, OVT);
- 				if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
--					mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED;
-+					first_seg->ol_flags |=
-+						RTE_MBUF_F_RX_VLAN_STRIPPED;
- 				else
--					mbuf->ol_flags &= ~RTE_MBUF_F_RX_VLAN_STRIPPED;
-+					first_seg->ol_flags &=
-+						~RTE_MBUF_F_RX_VLAN_STRIPPED;
- 			} else {
--				mbuf->ol_flags &=
-+				first_seg->ol_flags &=
- 					~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED);
--				mbuf->vlan_tci = 0;
-+				first_seg->vlan_tci = 0;
- 			}
- 		}
@@ -56 +30,3 @@
-@@ -468,18 +471,24 @@ err_set:
+ err_set:
+ 		rxq->cur++;
+@@ -429,18 +430,24 @@ err_set:
@@ -61,2 +37,2 @@
--			mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
--			mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+-			mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+-			mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
@@ -64,2 +40,2 @@
-+			first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-+			first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
++			first_seg->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
++			first_seg->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
@@ -67,4 +43,4 @@
--				mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
--				mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
--				mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
--				mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+-				mbuf->ol_flags &= ~PKT_RX_IP_CKSUM_GOOD;
+-				mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+-				mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD;
+-				mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
@@ -72 +48 @@
-+					~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
++					~PKT_RX_IP_CKSUM_GOOD;
@@ -74 +50 @@
-+					RTE_MBUF_F_RX_IP_CKSUM_BAD;
++					PKT_RX_IP_CKSUM_BAD;
@@ -76 +52 @@
-+					~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
++					~PKT_RX_L4_CKSUM_GOOD;
@@ -78 +54 @@
-+					RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
++					PKT_RX_L4_CKSUM_UNKNOWN;
@@ -81,2 +57,2 @@
--				mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
--				mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
+-				mbuf->ol_flags &= ~PKT_RX_L4_CKSUM_GOOD;
+-				mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
@@ -84 +60 @@
-+					~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
++					~PKT_RX_L4_CKSUM_GOOD;
@@ -86 +62 @@
-+					RTE_MBUF_F_RX_L4_CKSUM_BAD;
++					PKT_RX_L4_CKSUM_BAD;