patch 'mempool/cnxk: fix free from non-EAL threads' has been queued to stable release 21.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.6

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/08/23. 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/5bbab978092b6753c0dcec94bb2c07ae70a7b014

Thanks.

Kevin

---
>From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001
From: Harman Kalra <hkalra at marvell.com>
Date: Tue, 22 Aug 2023 22:31:56 +0530
Subject: [PATCH] mempool/cnxk: fix free from non-EAL threads

[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ]

For non-EAL pthreads, rte_lcore_id() will not be valid.
So, batch free cannot be used as those threads won't have
dedicated lmtlines. So, fallback to bulk alloc in such cases.

Fixes: ecbc731a2286 ("mempool/cnxk: add cn10k batch enqueue")

Signed-off-by: Harman Kalra <hkalra at marvell.com>
Signed-off-by: Ashwin Sekhar T K <asekhar at marvell.com>
---
 drivers/mempool/cnxk/cn10k_mempool_ops.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/mempool/cnxk/cn10k_mempool_ops.c b/drivers/mempool/cnxk/cn10k_mempool_ops.c
index 6ebbf91de5..55ebd6bfeb 100644
--- a/drivers/mempool/cnxk/cn10k_mempool_ops.c
+++ b/drivers/mempool/cnxk/cn10k_mempool_ops.c
@@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,
 	rte_io_wmb();
 
+	/* For non-EAL threads, rte_lcore_id() will not be valid. Hence
+	 * fallback to bulk alloc
+	 */
+	if (unlikely(rte_lcore_id() == LCORE_ID_ANY))
+		return cnxk_mempool_enq(mp, obj_table, n);
+
 	if (n == 1) {
 		roc_npa_aura_op_free(mp->pool_id, 1, ptr[0]);
-- 
2.41.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-11-02 13:09:42.007667831 +0000
+++ 0048-mempool-cnxk-fix-free-from-non-EAL-threads.patch	2023-11-02 13:09:40.847163445 +0000
@@ -1 +1 @@
-From e97668dd1e34c7049a7a568bb945f739d7eff9da Mon Sep 17 00:00:00 2001
+From 5bbab978092b6753c0dcec94bb2c07ae70a7b014 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e97668dd1e34c7049a7a568bb945f739d7eff9da ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 41b755b52b..2e46204c8d 100644
+index 6ebbf91de5..55ebd6bfeb 100644
@@ -23 +24 @@
-@@ -163,4 +163,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,
+@@ -145,4 +145,10 @@ cn10k_mempool_enq(struct rte_mempool *mp, void *const *obj_table,