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 34D57427EF for ; Wed, 22 Mar 2023 11:32:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3169B4282D; Wed, 22 Mar 2023 11:32:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 1B51841148 for ; Wed, 22 Mar 2023 11:32:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679481146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sDuSYy1tII8ONEEYp/zYspL9wlNfUDVz9lvAdhTNpf0=; b=iLoX2i3LSeY73xBKtDmXnMcjJFKfN3hYUDdM1+UbY7sIl53GRSiORwBleaCHfLRVFBfHVj bhE7zdkYXEW7w0QzxkCfPyXstvdvt9y/LgLb5MEp7KkA8ALzxjQ6KAEoOxgaJji7HFxPDB 5kx7GHYLE3+57LbJfADoLnj6w9P44X4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-587-Nj1AlOMcM3Ss_nao0gYeUg-1; Wed, 22 Mar 2023 06:32:23 -0400 X-MC-Unique: Nj1AlOMcM3Ss_nao0gYeUg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5B5A3858F0E; Wed, 22 Mar 2023 10:32:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F4C3492C13; Wed, 22 Mar 2023 10:32:22 +0000 (UTC) From: Kevin Traynor To: Pavel Ivashchenko Cc: Olivier Matz , dpdk stable Subject: patch 'test/mbuf: fix test with mbuf debug enabled' has been queued to stable release 21.11.4 Date: Wed, 22 Mar 2023 10:31:51 +0000 Message-Id: <20230322103209.456098-4-ktraynor@redhat.com> In-Reply-To: <20230322103209.456098-1-ktraynor@redhat.com> References: <20230322103209.456098-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 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 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@entry=0x17f8c3400, is_header=is_header@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@entry=0x17f8c3400, is_header=is_header@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 Acked-by: Olivier Matz --- 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@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)