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 331F7457A1 for ; Mon, 12 Aug 2024 14:52:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2CF6140654; Mon, 12 Aug 2024 14:52:17 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2043.outbound.protection.outlook.com [40.107.93.43]) by mails.dpdk.org (Postfix) with ESMTP id 6675D4029C for ; Mon, 12 Aug 2024 14:52:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ehLdNfAzOE2vBotAS5bq57wqQ2n0iyhdNeGurpARjIWnMq3RziF5XCEthw6j8GUDyM6zlxveW9ALXUSt7PUeZh4C+smlQDjXUpOHOq8h5lHFEmT/Mh5WOv78RgAJrOXG2AOi8mUixLsPbOO+Bhy9EJXokTewZgKTJmGJyW5lb/MfZs+c8tUenX987wrbhea8C57Gp/7Ln9LSsYmHG48Ex0etHgTRBzZGhg/zZ/jQSr99r0wIs+6ZKQbN4CTrEM9uflh4yMq/wkvYBYO0HRJx7HbWJbRFJy1pr7KMFZMeX14vHfXzgNS4u/op8nsZ4sDspLi/CNbWRHOOgDtCkYfNVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=YwNYGAMhF7wqW6mA5QHFLj/iw1ctalu7ozVcbvPm5gU=; b=h3dMASJnKt3cZHRKcFNrnECAKDA/mVUgW7zhOTSIAZ00QkvkpN4qGNV/f7HwR29T60EWQ9Wje+01e0KY31VwFqFqWu8ef5LzNf39rprqaSFK+Ikldb7S1vBpd/irQwNO4RP7K3IHUeCoyGV/oULGybex2fJ2NvXZysaMSzotPf1uwxCGbNSpgQXTrJ3zMsZcFv7hDExcj5OPuDCeVEcH4BtfcK25hR+gXKXCmSnaY90utRCLeGE0/oPrcMbG9r5WhbgAvi16tx/yppp9R0tZxXzqwuEqwP3puxKI6ed8P1Qjb+bCbjronP5GaQf5I+XaJWdOpp3x47VDOP1/efoCaA== 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=YwNYGAMhF7wqW6mA5QHFLj/iw1ctalu7ozVcbvPm5gU=; b=GW3bn5a7iJ07SWz2dAbZJo/XdB4A4TRjjzKz5VPqrm2d+BrVjWxkqcHc+1SBEVMC6xQMtZ8qpk4HsSG64y8/FOh11CLOocwtxhG5hfCt7M9Fobwmthw1N3o0VrkuiCVYGdRQima03jNmkPJ9Kjg3Rkz52ltml6ovD0mZhKieDTSeE+hkjDDv806Rs8bZxt52x1fwjYBuJDTfR73unMpa0xSlg5Wn0fWp9qpy55G4pgZ2mhzBkvBaWMXsocJPOQgk6wrwsEARszn2UPbTbTyR46ObGIaAhocsnbqgW4Uy2qz9C8KixsGbKjv/d2iAOTBjQ9U2kRU4xkgJcCihZ5dUaw== Received: from SA9PR11CA0014.namprd11.prod.outlook.com (2603:10b6:806:6e::19) by PH7PR12MB5974.namprd12.prod.outlook.com (2603:10b6:510:1d9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.17; Mon, 12 Aug 2024 12:52:10 +0000 Received: from SA2PEPF00003F63.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::e9) by SA9PR11CA0014.outlook.office365.com (2603:10b6:806:6e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:52:10 +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 SA2PEPF00003F63.mail.protection.outlook.com (10.167.248.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:52:10 +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.1544.4; Mon, 12 Aug 2024 05:51:58 -0700 Received: from nvidia.com (10.126.230.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.1544.4; Mon, 12 Aug 2024 05:51:55 -0700 From: Xueming Li To: Shijith Thotton CC: , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Stephen Hemminger , dpdk stable Subject: patch 'mbuf: fix dynamic fields copy' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:07 +0800 Message-ID: <20240812125035.389667-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.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: SA2PEPF00003F63:EE_|PH7PR12MB5974:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e0200f8-4f8f-4289-5e40-08dcbacd948c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?utf-8?B?TUR6SkNMd1RXSTBaSTJORzVHdUtaZ1ZUVWRxSk84MWZLdUxPWmFnS2tnMURT?= =?utf-8?B?dEU5YVJxS1A2WktWZUxZVWU5eHJiMGRUOHlnU2dGMWVwYU04RnFqaXk4Z3pM?= =?utf-8?B?aVArRzcyZ2dGQmlLNWI1cm5nTkhxaGNhb01MVTYveVhjNkJObGNhZ3huU215?= =?utf-8?B?dm1keXAxREUrWDhqRXQvZkJqNXlvUGZZMnMvOHdTM0FCaEUwNThaemE3WVAw?= =?utf-8?B?QlBJQmdwMlBDUXRzdTVCZHVrenNnVDBJUkxpVDk5RkhpTmw4Z3BBTTdRSlFa?= =?utf-8?B?RzRFVGIyOU9NanRQbTRpV0FLMi9SVy9lV1duNFhQc0dwT3VkTXRQUEtqZ2Vu?= =?utf-8?B?cGVmekRDTnJuTFo3MWtsWE9BalUzSkNEMlVLMmRCZTU5TXNKWDhONXhvQ09H?= =?utf-8?B?c2NZM2lpVEl5Y1lFaGhOQWdJODJjNmdoenFwdFNLOFZpaUxGUkUwV2lxdWNB?= =?utf-8?B?cU5BT0VHdXc5TXkyb0tQMzYwMFh6cENsV2FvQ081QmcwYmFoSWFkNzU0dzcw?= =?utf-8?B?ZURhK1hFMWVUWWNuek5UWkowcXRYY3FCaUJMODNINWNDRzZzSDFJWnp4eUtm?= =?utf-8?B?emRJdXFSZkxqLzVqNHlScUVYUnhhbUJwSCtYS3kvUDAxUERSRXE2cmxpTUI4?= =?utf-8?B?Z0ZBUHVLK2x4UUYzbjdjVisrdzhtZUY4RzM0QlFXeVdLc1BkZWxteTYvdlRN?= =?utf-8?B?REtnc08wSWNQQ1BSVlZDVXdYRytidHhsc045OVlZWlVvZzFXbmpQMmRhSWtL?= =?utf-8?B?d1lFU21FRmNQUXZFN3JyTWtCVTFiS0w3WmpTUm9DVjhJNS8vSVR5VzZxb2Fn?= =?utf-8?B?RjFpYVNKenZhb1ZYMlI5R0cwUVFvZDlIVFkzbElkZXV5UUZvaXF5YTB1YW5F?= =?utf-8?B?eTNrYjI4aTdJT1VSRlRoUnZjSEtZcGluNjRyN05XSDU0Q2xmV1puZmZBQUEz?= =?utf-8?B?b3g0TzZqOVB4VFc5Y09NTTdMOWhrV05ReXpPUDZzbDdRZ2padkdHYWpWK2M0?= =?utf-8?B?N085bFRxaGlLbU1ZNGZHcmZhMjJVcFE1d3pGMmU2SlRkUFZCNUIrNlRwK2dF?= =?utf-8?B?Si9ybGppWmRsajllVk5sbXcvaGlucW5aWlJ1enNTZjk5V3hndlgrMkI1NlBX?= =?utf-8?B?ZTFGbDk4TjNQa3VYSDJXZnJ5MlZIVnNCL1ZpYXJtZW5wT1NNcWNHU28wcFdS?= =?utf-8?B?Rkp4STBUbWtmRzBMSkY4NTk3Qi9FMTVSZU5ZV3Y1ZUk4RVVaODE5WUNMRWF3?= =?utf-8?B?eEgyUmsyOHZWWEFnazcxenVSb2ZiTzRkTkRleTVEWkVHZXBGWTJxL09jRVRP?= =?utf-8?B?aDJhM2pWY2hzb1dEQ2xxWk1PUkZkWWNmQ3pWMjNUOUJ5QnRGZUVpd0I0ZWhm?= =?utf-8?B?dUN3YmNmay9nMW1Bd2UxaHgwbkVYVzhCbFlTMGNKSVBUM2U1R091MkE2WE0r?= =?utf-8?B?Mzdyd3BaRUQ2am41MmE5WnN0OC94SmhXOVdrMjVaVWk2RkFGZVdnZG1yRXR3?= =?utf-8?B?NGNFbmF5NWdhbWw2UCtkME1NL2dNc0swbEREZVphbVJLeUZSSU4xaklHK2JC?= =?utf-8?B?L25MdGhrbnBURGJJM0diZlY0YTd5OWxoYlFXUGh1cFBqTlFDenhTSkd4TmUv?= =?utf-8?B?dkdNOUc2VzRTeDIxWmJ5MUZRZSswZkt3cE4vOUJ6OGorV2tud0dUVTJpVHhp?= =?utf-8?B?cHJ2SXNTbUNsL0RoQUdIM2JUZkhhdGNZa0YzM1NYQUNYWnpxTU9tOFZjM01Q?= =?utf-8?B?OUhteGdxR25RVjVwbEVsMTBJUUF4MWJ0cU1oSG4rTnA1U0d6Q0I5am04b1dU?= =?utf-8?B?bERSbjNJcXF6ckZ0TTdiY1p6YzNPYUFYSkhWZWNrMTlESFdxYlMrQjJIdEgx?= =?utf-8?B?VkRzQXRCNXVNSUZGT0NaQTZycnNMbW5uWnM5Z3M0dEtCaVNpdThCTjZWOUxR?= =?utf-8?Q?D/nMWgyPqs+3+vxV4rUo0siRvWlBWjMp?= 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:(13230040)(376014)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:52:10.1494 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e0200f8-4f8f-4289-5e40-08dcbacd948c 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: SA2PEPF00003F63.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5974 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=c9071e44b74503d54963e65a91ff9c57d3fc2251 Thanks. Xueming Li --- >From c9071e44b74503d54963e65a91ff9c57d3fc2251 Mon Sep 17 00:00:00 2001 From: Shijith Thotton Date: Thu, 27 Jun 2024 13:27:56 +0530 Subject: [PATCH] mbuf: fix dynamic fields copy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 95bea772528d316c969a170e6206f3b05ac39413 ] Fixed rte_mbuf_dynfield_copy() API to copy dynamic fields from one mbuf to another. When RTE_IOVA_AS_PA is not defined during the build, an additional dynamic field (dynfield2) becomes available. This field should be conditionally copied to ensure the complete duplication of dynamic fields between mbufs. This patch fixes the same. Bugzilla ID: 1472 Fixes: 03b57eb7ab9a ("mbuf: add second dynamic field member") Signed-off-by: Shijith Thotton Reviewed-by: Morten Brørup Acked-by: Stephen Hemminger --- lib/mbuf/rte_mbuf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h index 286b32b788..c266727a13 100644 --- a/lib/mbuf/rte_mbuf.h +++ b/lib/mbuf/rte_mbuf.h @@ -1119,6 +1119,9 @@ rte_pktmbuf_attach_extbuf(struct rte_mbuf *m, void *buf_addr, static inline void rte_mbuf_dynfield_copy(struct rte_mbuf *mdst, const struct rte_mbuf *msrc) { +#if !RTE_IOVA_IN_MBUF + mdst->dynfield2 = msrc->dynfield2; +#endif memcpy(&mdst->dynfield1, msrc->dynfield1, sizeof(mdst->dynfield1)); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.944962261 +0800 +++ 0010-mbuf-fix-dynamic-fields-copy.patch 2024-08-12 20:44:01.895069255 +0800 @@ -1 +1 @@ -From 95bea772528d316c969a170e6206f3b05ac39413 Mon Sep 17 00:00:00 2001 +From c9071e44b74503d54963e65a91ff9c57d3fc2251 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 95bea772528d316c969a170e6206f3b05ac39413 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -27 +29 @@ -index 4c4722e002..babe16c72c 100644 +index 286b32b788..c266727a13 100644