patch 'mempool/cnxk: fix batch allocation failure path' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/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/dbafc478b0524db951f89162ba53331dc76b65bd

Thanks.

Kevin

---
>From dbafc478b0524db951f89162ba53331dc76b65bd Mon Sep 17 00:00:00 2001
From: Ashwin Sekhar T K <asekhar at marvell.com>
Date: Fri, 18 Feb 2022 12:57:12 +0530
Subject: [PATCH] mempool/cnxk: fix batch allocation failure path

[ upstream commit 5582a60effbb8599ad7be827abe4d06ca436b04b ]

Fix bug in batch alloc issue failure path where it was
enqueuing invalid pointers back to the pool. The code
should rightly be falling back to default dequeue path
in such cases.

Fixes: 91531e63f43b ("mempool/cnxk: add cn10k batch dequeue")

Signed-off-by: Ashwin Sekhar T K <asekhar at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 drivers/mempool/cnxk/cn10k_mempool_ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c
index 4c669b878f..6ebbf91de5 100644
--- a/drivers/mempool/cnxk/cn10k_mempool_ops.c
+++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c
@@ -203,5 +203,5 @@ cn10k_mempool_deq(struct rte_mempool *mp, void **obj_table, unsigned int n)
 		/* If issue fails, try falling back to default alloc */
 		if (unlikely(rc))
-			return cn10k_mempool_enq(mp, obj_table, n);
+			return cnxk_mempool_deq(mp, obj_table, n);
 		mem->status = BATCH_ALLOC_OP_ISSUED;
 	}
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:03.848142855 +0000
+++ 0088-mempool-cnxk-fix-batch-allocation-failure-path.patch	2022-03-01 10:41:01.456244129 +0000
@@ -1 +1 @@
-From 5582a60effbb8599ad7be827abe4d06ca436b04b Mon Sep 17 00:00:00 2001
+From dbafc478b0524db951f89162ba53331dc76b65bd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5582a60effbb8599ad7be827abe4d06ca436b04b ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org