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 E3635A0A02 for ; Mon, 17 May 2021 18:16:23 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D952E410F3; Mon, 17 May 2021 18:16:23 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8D6C7410F3 for ; Mon, 17 May 2021 18:16:23 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuo-0008Kn-S4; Mon, 17 May 2021 16:16:22 +0000 From: Christian Ehrhardt To: Olivier Matz Cc: Wenwu Ma , dpdk stable Date: Mon, 17 May 2021 18:09:35 +0200 Message-Id: <20210517161039.3132619-146-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/mempool: fix object initializer' has been queued to stable release 19.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/5c5016bdfda75a75ad2c5b536096f0fe53265024 Thanks. Christian Ehrhardt --- >From 5c5016bdfda75a75ad2c5b536096f0fe53265024 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Tue, 27 Apr 2021 15:56:45 +0200 Subject: [PATCH] test/mempool: fix object initializer [ upstream commit e1064f80b61157250250353718ff196d2f050041 ] The function rte_pktmbuf_init() expects that the mempool private area is large enough and was previously initialized by rte_pktmbuf_pool_init(), which is not the case. This causes the function rte_pktmbuf_priv_size() to return an unpredictable value, and this value is used as a size in a memset. Replace the mempool object initializer by my_obj_init(), which does not have this constraint, and fits the needs for this test. Fixes: 923ceaeac140 ("test/mempool: add unit test cases") Reported-by: Wenwu Ma Signed-off-by: Olivier Matz --- app/test/test_mempool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c index c32a5d387d..06a0f7a034 100644 --- a/app/test/test_mempool.c +++ b/app/test/test_mempool.c @@ -552,7 +552,7 @@ test_mempool(void) GOTO_ERR(ret, err); /* test to initialize mempool objects and memory */ - nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, rte_pktmbuf_init, + nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, my_obj_init, NULL); if (nb_objs == 0) GOTO_ERR(ret, err); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:35.120221923 +0200 +++ 0146-test-mempool-fix-object-initializer.patch 2021-05-17 17:40:29.423811460 +0200 @@ -1 +1 @@ -From e1064f80b61157250250353718ff196d2f050041 Mon Sep 17 00:00:00 2001 +From 5c5016bdfda75a75ad2c5b536096f0fe53265024 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1064f80b61157250250353718ff196d2f050041 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 084842fdaa..3adadd6731 100644 +index c32a5d387d..06a0f7a034 100644