patch 'test/mbuf: fix test with mbuf debug enabled' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Wed Mar 22 11:31:51 CET 2023


Hi,

FYI, your patch has been queued to stable release 21.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/24/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/655c88665d3403664d1ab4e6f6baaa2f099273c7

Thanks.

Kevin

---
>From 655c88665d3403664d1ab4e6f6baaa2f099273c7 Mon Sep 17 00:00:00 2001
From: Pavel Ivashchenko <pivashchenko at nfware.com>
Date: Thu, 16 Mar 2023 22:14:56 +0300
Subject: [PATCH] test/mbuf: fix test with mbuf debug enabled

[ upstream commit ce5440e0350df101443aa4d0e96bea0a06ef9364 ]

How to reproduce:

1. Define RTE_LIBRTE_MBUF_DEBUG
2. MALLOC_PERTURB_=178 DPDK_TEST=mbuf_autotest gdb --args
	obj-x86_64-linux-gnu/app/test/dpdk-test
	--file-prefix=mbuf_autotest

   PANIC in rte_mbuf_sanity_check():
   bad pkt_len

   ...
   #6  0x00007ffff7d3d4cc in rte_mbuf_sanity_check
	(m=m at entry=0x17f8c3400, is_header=is_header at entry=1)
	at ../lib/mbuf/rte_mbuf.c:384
   #7  0x0000555555653d57 in rte_pktmbuf_free (m=0x17f8c3400)
	at ../lib/mbuf/rte_mbuf.h:1385
   #8  0x000055555565c7a6 in test_nb_segs_and_next_reset ()
	at ../app/test/test_mbuf.c:2752
   #9  test_mbuf () at ../app/test/test_mbuf.c:2967
   ...

   (gdb) frame 6
   #6  0x00007ffff7d3d4cc in rte_mbuf_sanity_check
	(m=m at entry=0x17f8c3400, is_header=is_header at entry=1)
	at ../lib/mbuf/rte_mbuf.c:384
   384			rte_panic("%s\n", reason);
   (gdb) p/d m->pkt_len
   $4 = 1500

Fixes: efc6f9104c80 ("mbuf: fix reset on mbuf free")

Signed-off-by: Pavel Ivashchenko <pivashchenko at nfware.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 app/test/test_mbuf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c
index 02b4a92db9..2287bce2f9 100644
--- a/app/test/test_mbuf.c
+++ b/app/test/test_mbuf.c
@@ -2746,4 +2746,5 @@ test_nb_segs_and_next_reset(void)
 	/* split m0 chain in two, between m1 and m2 */
 	m0->nb_segs = 2;
+	m0->pkt_len -= m2->data_len;
 	m1->next = NULL;
 	m2->nb_segs = 1;
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-22 10:30:08.024165922 +0000
+++ 0004-test-mbuf-fix-test-with-mbuf-debug-enabled.patch	2023-03-22 10:30:07.878866521 +0000
@@ -1 +1 @@
-From ce5440e0350df101443aa4d0e96bea0a06ef9364 Mon Sep 17 00:00:00 2001
+From 655c88665d3403664d1ab4e6f6baaa2f099273c7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ce5440e0350df101443aa4d0e96bea0a06ef9364 ]
+
@@ -36 +37,0 @@
-Cc: stable at dpdk.org
@@ -45 +46 @@
-index 81a6632d11..8d8d3b9386 100644
+index 02b4a92db9..2287bce2f9 100644
@@ -48 +49 @@
-@@ -2745,4 +2745,5 @@ test_nb_segs_and_next_reset(void)
+@@ -2746,4 +2746,5 @@ test_nb_segs_and_next_reset(void)



More information about the stable mailing list