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 D30D443829 for ; Fri, 8 Mar 2024 15:33:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA72C42F0D; Fri, 8 Mar 2024 15:33:06 +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 5625042F0D for ; Fri, 8 Mar 2024 15:33:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709908384; 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=qNe4moc8dXRxTVaURFd3Mmns0j3HrETHsvgH2jfi1DY=; b=JR19bezX28hkZoCNWnDqg/KMYqKo2h3CgpxOQULHRqnrUUAyYW1CF7QIFnkHBMEeiDeA/2 Zlp1/gB0F7+nrqbf0421ASRzedVUqpFX0r3I2xcQ4jEwE2Uukb5bbohXHXivEMLolHrZ1T skeR8HFDgj7GnXw8cbfIFdzJm/2MDGI= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-29-4BNP4f9qPXu1QCuVwjvxqA-1; Fri, 08 Mar 2024 09:33:03 -0500 X-MC-Unique: 4BNP4f9qPXu1QCuVwjvxqA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 574F51C05EB7; Fri, 8 Mar 2024 14:33:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id AACED37F6; Fri, 8 Mar 2024 14:32:57 +0000 (UTC) From: Kevin Traynor To: Rakesh Kudurumalla Cc: Olivier Matz , dpdk stable Subject: patch 'test/mbuf: fix external mbuf case with assert enabled' has been queued to stable release 21.11.7 Date: Fri, 8 Mar 2024 14:28:19 +0000 Message-ID: <20240308142824.528417-31-ktraynor@redhat.com> In-Reply-To: <20240308142824.528417-1-ktraynor@redhat.com> References: <20240308142824.528417-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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.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 03/13/24. 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/3096a562357afd37be3cb1ef87018be41f5ed68b Thanks. Kevin --- >From 3096a562357afd37be3cb1ef87018be41f5ed68b Mon Sep 17 00:00:00 2001 From: Rakesh Kudurumalla Date: Thu, 23 Nov 2023 12:12:21 +0530 Subject: [PATCH] test/mbuf: fix external mbuf case with assert enabled [ upstream commit 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 ] when RTE_ENABLE_ASSERT is defined test_mbuf application is failing because we are trying to attach extbuf to a cloned buffer to which external mbuf is already attached. To make test_mbuf pass CI we have updated ol_flags. This patch fixes the same. Fixes: 7b295dceea07 ("test/mbuf: add unit test cases") Signed-off-by: Rakesh Kudurumalla Acked-by: Olivier Matz --- app/test/test_mbuf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 9c0ac63f92..35c0989add 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2348,5 +2348,5 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) __func__); - /* allocate one more mbuf */ + /* allocate one more mbuf, it is attached to the same external buffer */ clone = rte_pktmbuf_clone(m, pktmbuf_pool); if (clone == NULL) @@ -2355,7 +2355,4 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) GOTO_FAIL("%s: Bad packet length\n", __func__); - /* attach the same external buffer to the cloned mbuf */ - rte_pktmbuf_attach_extbuf(clone, ext_buf_addr, buf_iova, buf_len, - ret_shinfo); if (clone->ol_flags != RTE_MBUF_F_EXTERNAL) GOTO_FAIL("%s: External buffer is not attached to mbuf\n", -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-08 13:47:49.930978315 +0000 +++ 0031-test-mbuf-fix-external-mbuf-case-with-assert-enabled.patch 2024-03-08 13:47:49.039686726 +0000 @@ -1 +1 @@ -From 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 Mon Sep 17 00:00:00 2001 +From 3096a562357afd37be3cb1ef87018be41f5ed68b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 51ea6ef1c4..17be977f31 100644 +index 9c0ac63f92..35c0989add 100644 @@ -25 +26 @@ -@@ -2347,5 +2347,5 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) +@@ -2348,5 +2348,5 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) @@ -32 +33 @@ -@@ -2354,7 +2354,4 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) +@@ -2355,7 +2355,4 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)