[dpdk-stable] patch 'mempool: fix panic on dump or audit' has been queued to stable release 19.11.7

[Christian Ehrhardt]

Hi,

FYI, your patch has been queued to stable release 19.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 02/10/21. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/fd0254ee353479e9bc7e17fd2ffa1e2e59eba572

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From fd0254ee353479e9bc7e17fd2ffa1e2e59eba572 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz at 6wind.com>
Date: Wed, 3 Feb 2021 10:01:01 +0100
Subject: [PATCH] mempool: fix panic on dump or audit

[ upstream commit daeb7c7f412a4d24d2d9a7d9f1344ef2338b12f4 ]

When doing a mempool dump or an audit, the application can panic because
the length of the cache is greater than the flush threshold, which is
seen as a fatal error. But this can temporarily happen when the mempool
is in use.

Fix the panic condition to abort only when the cache length is greater
than the array.

Fixes: ea5dd2744b90 ("mempool: cache optimisations")

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko at oktetlabs.ru>
---
 lib/librte_mempool/rte_mempool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c
index e39135d474..89b6d39ac0 100644
--- a/lib/librte_mempool/rte_mempool.c
+++ b/lib/librte_mempool/rte_mempool.c
@@ -1160,7 +1160,7 @@ mempool_audit_cache(const struct rte_mempool *mp)
 	for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
 		const struct rte_mempool_cache *cache;
 		cache = &mp->local_cache[lcore_id];
-		if (cache->len > cache->flushthresh) {
+		if (cache->len > RTE_DIM(cache->objs)) {
 			RTE_LOG(CRIT, MEMPOOL, "badness on cache[%u]\n",
 				lcore_id);
 			rte_panic("MEMPOOL: invalid cache len\n");
-- 
2.30.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-08 12:04:30.183432327 +0100
+++ 0017-mempool-fix-panic-on-dump-or-audit.patch	2021-02-08 12:04:29.555496794 +0100
@@ -1 +1 @@
-From daeb7c7f412a4d24d2d9a7d9f1344ef2338b12f4 Mon Sep 17 00:00:00 2001
+From fd0254ee353479e9bc7e17fd2ffa1e2e59eba572 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit daeb7c7f412a4d24d2d9a7d9f1344ef2338b12f4 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -24 +25 @@
-index b9f3fbd614..afb1239c8d 100644
+index e39135d474..89b6d39ac0 100644
@@ -27 +28 @@
-@@ -1167,7 +1167,7 @@ mempool_audit_cache(const struct rte_mempool *mp)
+@@ -1160,7 +1160,7 @@ mempool_audit_cache(const struct rte_mempool *mp)