[dpdk-stable] patch 'test/mempool: fix object initializer' has been queued to stable release 19.11.9

Christian Ehrhardt christian.ehrhardt at canonical.com
Mon May 17 18:09:35 CEST 2021


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 <christian.ehrhardt at canonical.com>

---
>From 5c5016bdfda75a75ad2c5b536096f0fe53265024 Mon Sep 17 00:00:00 2001
From: Olivier Matz <olivier.matz at 6wind.com>
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 <wenwux.ma at intel.com>
Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
 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 at dpdk.org
@@ -26 +27 @@
-index 084842fdaa..3adadd6731 100644
+index c32a5d387d..06a0f7a034 100644


More information about the stable mailing list