From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 047B4A0547 for ; Mon, 8 Feb 2021 12:15:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB40740147; Mon, 8 Feb 2021 12:15:13 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D855540147 for ; Mon, 8 Feb 2021 12:15:12 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l94Vc-0001Dc-6e; Mon, 08 Feb 2021 11:15:12 +0000 From: Christian Ehrhardt To: Olivier Matz Cc: Andrew Rybchenko , dpdk stable Date: Mon, 8 Feb 2021 12:14:29 +0100 Message-Id: <20210208111429.1875789-17-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210208111429.1875789-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> <20210208111429.1875789-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mempool: fix panic on dump or audit' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 --- >From fd0254ee353479e9bc7e17fd2ffa1e2e59eba572 Mon Sep 17 00:00:00 2001 From: Olivier Matz 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 Acked-by: Andrew Rybchenko --- 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@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)