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 4FD7943E57 for ; Sat, 13 Apr 2024 14:56:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4994A40294; Sat, 13 Apr 2024 14:56:28 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2049.outbound.protection.outlook.com [40.107.94.49]) by mails.dpdk.org (Postfix) with ESMTP id 67334400D6 for ; Sat, 13 Apr 2024 14:56:26 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kIjcEEZfz1tD9F0U6pycZjbH2ukcaGWMGBtFroeu+ZJ06L96NNDi7ZWwzfCevBIliq8Zt6GQLlKctAWyMNdJyy6y/B3jMbo8txGXZgLNYkRnKdRrhNC71bPnYxavEfg8MrU29PGQkWGTvfctRTm3EPYjt13Ad0nlTlh1comzU8nyz4IQW78Q8zqjc3gwUZcujHdd9wR55WbU5KnozFSiDinYPBvNQE/ycppTp6Smb5zJm4Vo4o1jdDLRDWoLNTQgaReChCOe3FywXFFBdYFUfAR25LqWOA7TaYAlHIf0HpoPoBEaIbhB/It5EeLgaoi3j/Uv0yoU/jYdg9z5GyixdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Wiy7/7mjzmDlEwBZH1A1b7Rad8Q6H3k2Dmg8NvgqnTY=; b=n7gNqcLcKjW0zrOaisU2ATdg8DyR8GY8l5iXQZ/9btC5WamFxwxcCn+yG/aFScUx6CL9deILqgnBe1Z7PPXlckxVFaoURb10aEZngGmF79cwrhT/6Gr4uBU3Uz0vYedQt2fuVaKt0q7Fwuu0gPK0nSCO1Cz85EzxID5S77uYfZyvpF+zzTT2LYruYgBucl6X3gMkzc8oi4rD2Gwf6iYeBwUEwyzWzOR/AkvVJbQNhhlB74CqBo+6H/gKCxxpibee3AD5pr7qJCs22QsLTVbxLyZtnsZhFg3RkyXEfn8JMPh7qIbTWAc5M1HH5ml+3T83u1NYAdXKupXF6KV8Hdt4RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Wiy7/7mjzmDlEwBZH1A1b7Rad8Q6H3k2Dmg8NvgqnTY=; b=kJrBaE3a/CzNIBTzh41f9waaeW4Uwx5htwg1BE2wtVk0WcLxt4PHBJXfVfwTkDjKrmZAUgo71rzhu0Bb925OGDwlCSNNc2SO1YNHwDB7S5gH6n8rtOWFFZrew0z+g2woe8Nw69ekz1UJdio6l31a1Cqjoqy0jOpHtycL2Ntl0D2w3lce5rY7XQreREeD36+4Fg9njnV2dEWnEazUNmZ/P6I2FSoNV8LMI7OjeUm99SoczIe89RTyIbqdc/iLRMQkJ3k/WYHak9RAgwbsMQYuiPTfdeYUs4uZ7UYDdfFMNnDiAMFL5vweqUBnOCJEa6z8t+8jalacXdbPJqS6pV6PUg== Received: from DM6PR21CA0028.namprd21.prod.outlook.com (2603:10b6:5:174::38) by SA1PR12MB8144.namprd12.prod.outlook.com (2603:10b6:806:337::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:56:23 +0000 Received: from DS3PEPF0000C381.namprd04.prod.outlook.com (2603:10b6:5:174:cafe::d) by DM6PR21CA0028.outlook.office365.com (2603:10b6:5:174::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.4 via Frontend Transport; Sat, 13 Apr 2024 12:56:23 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS3PEPF0000C381.mail.protection.outlook.com (10.167.23.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:56:23 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:56:12 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:56:11 -0700 From: Xueming Li 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 23.11.1 Date: Sat, 13 Apr 2024 20:49:06 +0800 Message-ID: <20240413125005.725659-66-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF0000C381:EE_|SA1PR12MB8144:EE_ X-MS-Office365-Filtering-Correlation-Id: 7e3951d0-474c-4abd-a5d8-08dc5bb91f52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DoYHOIcdiRg2JwgNwfxBXTwLo4dXFkJ0WElwDsvGuyOdjj9ZESSTIkFwMcwd4sLz+sTp9ezVAqqm9VP0AsUPe5gKS4GrKSG1ObKTFfGGaQcBy2Nrcz/yhYZ1oln24EHo4JAx+GeRcnHQYwspNM3S9w+NriHyI1hxf9B1XS/7FXSTY82QwXrRUi9QYq0Y8/Too3jAjjypQUStgCQ3pDlvZPwQl1XRPVCJQdUuS/2saLdZD7j6p5pDF0MEtNsXsX3Ez0b6UHwps//zz71NZuhsoIsXxNY7hAYSxY9OFanpUCKJp+KBY5YnGIgjjqLGdNXKpbhl+8z1NXnd2Ki+6YwZ60hyQfoUdd2ac9zYOoQeA4BQTSd/WHx4Gj8ZJowKgXNTavV3CjPx+AIr+FNvXaBTb9zzQNc2p6dJ4imDGycUchbLA8wazFmGKjUcY5QC0+ara0t5K5kE3f0wPLXDw2+Vi8I2/NPF0jrXPlgU7BGyVUTiSbTV0/biyuxoWDG1LL0Lo7a/PVvB+OInQ34s47yTeu4F4sy0AKXbIHyBgzD6u9ahs/Km1phtn7cpSrgh10SjSzs1UzQceZx33pPYH2z2x0cWtsnw3Rw27phRU2Pmq0/ZBM+PXP0ilQ8AXpt1SkExdsgx3k/fJjHkBeKOvHkFdYgfuD35PedgeQLNxi1M3UO0cfsdLT6zFDvh4kCQm/2dOOKBZMZFV4zAfib3T9MLBUgdUtdltlpXH3GYzrdwWfcEJWD21gIq1B68VKpb0iJm X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:56:23.0792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7e3951d0-474c-4abd-a5d8-08dc5bb91f52 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF0000C381.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8144 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=de3976eb27efa755499f0982e0be846e305e7226 Thanks. Xueming Li --- >From de3976eb27efa755499f0982e0be846e305e7226 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 Cc: Xueming Li [ 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 d7393df7eb..a39288a5f8 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2345,16 +2345,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) GOTO_FAIL("%s: External buffer is not attached to mbuf\n", __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) GOTO_FAIL("%s: mbuf clone allocation failed!\n", __func__); if (rte_pktmbuf_pkt_len(clone) != 0) 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", __func__); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.075992217 +0800 +++ 0066-test-mbuf-fix-external-mbuf-case-with-assert-enabled.patch 2024-04-13 20:43:05.017753905 +0800 @@ -1 +1 @@ -From 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 Mon Sep 17 00:00:00 2001 +From de3976eb27efa755499f0982e0be846e305e7226 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 51ea6ef1c4..17be977f31 100644 +index d7393df7eb..a39288a5f8 100644 @@ -25 +27 @@ -@@ -2346,16 +2346,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) +@@ -2345,16 +2345,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)