patch 'net/axgbe: clear buffer on scattered Rx chaining failure' 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/2f92b609867414b2821caf311d4994f5bbf1de49

Thanks.

Luca Boccassi

---
>From 2f92b609867414b2821caf311d4994f5bbf1de49 Mon Sep 17 00:00:00 2001
From: Bhagyada Modali <bhagyada.modali at amd.com>
Date: Wed, 7 Sep 2022 23:31:08 -0400
Subject: [PATCH] net/axgbe: clear buffer on scattered Rx chaining failure

[ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ]

Clearing mbuf, first_seg when chaining mbufs fail.
Increment the error count for the same.

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

diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 3875348f97..35925d3a7f 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -398,8 +398,10 @@ next_desc:
 
 		if (first_seg != NULL) {
 			if (rte_pktmbuf_chain(first_seg, mbuf) != 0) {
-				rte_mempool_put(rxq->mb_pool,
-						first_seg);
+				rte_pktmbuf_free(first_seg);
+				first_seg = NULL;
+				rte_pktmbuf_free(mbuf);
+				rxq->errors++;
 				eop = 0;
 				break;
 			}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-03 09:27:28.632232059 +0000
+++ 0053-net-axgbe-clear-buffer-on-scattered-Rx-chaining-fail.patch	2022-11-03 09:27:25.457424066 +0000
@@ -1 +1 @@
-From 30ff4d00d92dd4126efc8236299126e199e92461 Mon Sep 17 00:00:00 2001
+From 2f92b609867414b2821caf311d4994f5bbf1de49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 30ff4d00d92dd4126efc8236299126e199e92461 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
-index 4c16c59f37..f2136e30b0 100644
+index 3875348f97..35925d3a7f 100644
@@ -22 +23 @@
-@@ -418,8 +418,10 @@ next_desc:
+@@ -398,8 +398,10 @@ next_desc: