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 EA50B46532 for ; Tue, 8 Apr 2025 10:05:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E115B4027F; Tue, 8 Apr 2025 10:05:32 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2077.outbound.protection.outlook.com [40.107.237.77]) by mails.dpdk.org (Postfix) with ESMTP id 3483840E6E for ; Tue, 8 Apr 2025 10:05:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MsVOHTQvZECm78k7p7qz/thSiIJZHS3zMFbeDgI3q5hpuW5h6S27+WtyqU/u/SCALzXIAKRJp8VOPT2gc+obzNv8v8culjYnPa7WjJKLg0E9UngoC9DF8asD9yorEV6qi7SKOGdwvrFZ0Hzy2Y+Z6laDGct2zgLXyCl8eNPnp7PJohsU9riTTgRF/TWGWeBdgCfg4S/zQUKNd1HSKayQtq2EK7KhHhBvyZqrAkz3tCANYpcDG+NpflcXCefl7XjAQB2L8ahoNEuQ10RniDUGdYsKJU0QM4nCae2ILhs29a4fh5fc/l4owqzHWWixRCvz3ohtSo2iLP8jJYWUSgLleg== 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=G6st6kYKkEneXS1Ylxl2LhQnvQksnShXM0HX4xNoU5o=; b=Tc8rGTwDI4DfAXc3+0JYiO24dMeKP1kSYDa1I3N0D2hQEXkGuPnlhSCIFzkd0wd0bNHYy/vQ9QaXxjJR1kn8Wa5sI7cIV5cqZvIVWacjEwDeEvVla8oHm/tZpM4DT9YK8IDaj8o/EPsnKYgM0C2t59sFGXEPm82qpkEDF2QYuS3mJEpXFAiXTF3a451lL0E4pCkeoIKK94I/pne/cyXgh9vyOlQMzk2Y7LbYr8cDNMpwDSlqmJ0NNh08ytvatutO09fw3R16s6FLms6dzQk6qpbu9M2Om9VWCl4n2g2eoFYg9z/klM0qPdCgMxImoAqKMb66ymU0KfQOLZCASsUjqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=nokia-sbell.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=G6st6kYKkEneXS1Ylxl2LhQnvQksnShXM0HX4xNoU5o=; b=bptH3wwnlwd2Zeu1jrfRyoxARkXk129hiQ06DOFQnatHgmqCdxk1ypjsNhlHkb1MsI/75EvOcQHOFnMQJxzJFDrpTweE0nFv2KEpe8hcJi9/SxkABK2ziOjLGh0f+VwlLAOWKbrtqc3sZTM1fXE9PY4Rf+gt+OOMUQHNPpQUgMEh+n8UQXbPsiCyt/EKltcGDXDDbEGxKTY4gFncuwWjz43T/KlwFnCxCSGAFt9bXwJ85vVAjlAAAvqdUi2T2fE4vjDOElFsxPZyrrtLdltFmOJ/Wf3tmhGm+ED5+lvje0dJRg3i2jtRsb/ac0mEVVWhIE6bx4UjBibc4SJQOk+n6g== Received: from PH7P221CA0083.NAMP221.PROD.OUTLOOK.COM (2603:10b6:510:328::8) by BN3PR12MB9571.namprd12.prod.outlook.com (2603:10b6:408:2ca::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Tue, 8 Apr 2025 08:05:26 +0000 Received: from BY1PEPF0001AE16.namprd04.prod.outlook.com (2603:10b6:510:328:cafe::9e) by PH7P221CA0083.outlook.office365.com (2603:10b6:510:328::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8606.28 via Frontend Transport; Tue, 8 Apr 2025 08:05:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BY1PEPF0001AE16.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.22 via Frontend Transport; Tue, 8 Apr 2025 08:05:24 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 8 Apr 2025 01:05:07 -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.1544.14; Tue, 8 Apr 2025 01:05:00 -0700 From: Xueming Li To: Yang Ming CC: Xueming Li , Bruce Richardson , dpdk stable Subject: patch 'net/iavf: fix mbuf release in Arm multi-process' has been queued to stable release 23.11.4 Date: Tue, 8 Apr 2025 16:01:56 +0800 Message-ID: <20250408080214.371154-18-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250408080214.371154-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> <20250408080214.371154-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE16:EE_|BN3PR12MB9571:EE_ X-MS-Office365-Filtering-Correlation-Id: dbda617e-2bb4-4caa-9eb2-08dd76741e07 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tAUrTrK/Z5x1R71b3+ixFOEPA/9UC1D4KtiDCuR9WTfbldkHrsqwT+LF4sEF?= =?us-ascii?Q?vFhD4OOT8+QB04QQ2qS+dbOYaYY8NBmGyk6uTq4Jxv3IsWse9HNtGxaDA/Jk?= =?us-ascii?Q?uLIBwe9dZxJgLs1AtfomzwbN7brQQq9rLI5M/JBXCGD9bqsZDld5ktNqEals?= =?us-ascii?Q?oLqVq14DFXzJOpAsml0qAi7JZRo3rz4fcDL6sB4X4VsqMLqyfIwVyxLeu6Kw?= =?us-ascii?Q?VeTGXya3iAvFOYGhtvGoqWYWEd86JmkXgDJpUz4jiLfqJgV4UUOWlH9VJr+E?= =?us-ascii?Q?VWM/5tdWJ+TW47x9y1+inRmmVEjwZSH1zdjNi4/vyxVHewVLcE4cNsCgRIsp?= =?us-ascii?Q?B4KVNjCTN+JhhAJ8+vA56LN/fMVDRl/tohsgJddTh44PxdRbMpa1C91qrrcV?= =?us-ascii?Q?njsbgfIlhBHzr8kZsfz3sMa6o43IWVTD+Q1UNoRb+FDtPo4WFGpTB2+B45Gs?= =?us-ascii?Q?j5RpZ59F118Z+3t8Xuq6lcB9uw3DQN+cKyafd4stoqByy1z9HqzGwbOJIoEg?= =?us-ascii?Q?9WzuoP3pSm0HsdgQl8lHQMan1/G6w/TiLIwXJYLfHuhIswmxvIZTIxfBq0bq?= =?us-ascii?Q?Hqfqmp1NOCIJGcKsjAKlBSp8Dfi4AEhZAZYXfTq5xubDr275ZVIyN3EKmRzE?= =?us-ascii?Q?2D6TlN2ZlcfyLFJYHk2MAh9auni8u5DgTwzAYaogEZ8mxSXMlQWuP1XYuySN?= =?us-ascii?Q?YYcTwAXIU8BoyhPWMOjGgCyQOa2IfTlCNtGKymcgYxAyeE+7wNCPR4a8wsu0?= =?us-ascii?Q?Vogmfn+q/WMC5jz4uWTo6DqAsVChuqZY6bGmNEw0aQnhAa1x9IwPGDPM4FbG?= =?us-ascii?Q?uCt6br2nlR01nieMH4YXSSfkCiWF/ywWRG7C2vqdzhYiRXGOKULMpz93T3/B?= =?us-ascii?Q?QponDgvaOk8SYAYIUMVX2SeyNG8g5OME5zS3IP/LXJINl93zshB40LJ6i+eU?= =?us-ascii?Q?bgBF0sC+rXwXGt3z4TqkoUkGSD5n49tkb7IkIzWc3RoBgpZ670Al+cKb1Ovs?= =?us-ascii?Q?gtU1odtL0mXtAz9aGEQjcMvBQaREIjSBYXl7fQiU+DWKDBMFSLXMbwi14UJh?= =?us-ascii?Q?rJ9IEYHwB2m1YWs5JRhWMx0GfE3bGQD/gyT6nuKBk2/YdM3oX4Mflv5LHXaK?= =?us-ascii?Q?ikJLUD7fsnZXuGGrbyRQ8VEluX3YybmheC+Mz+wB6lLMHYSBSMo9SY8enPOm?= =?us-ascii?Q?bWQgv8vczlcG6GEQU+yTcNgrXRpx1ztts9N5Dvk6tGaDtZrLxibKZVfoNLQP?= =?us-ascii?Q?wrzsi9GNQrwWszH+1Te+jM738lccguo+2qQKY3du54bOWc0vMOvWNHvBL6gO?= =?us-ascii?Q?w/ajN1jaeBPVKLWVJyVzYe392iGq28rbW8kRqDake6IC7ceFVdPcMOOCtopY?= =?us-ascii?Q?IEfW3PGO1Kn9Yj00S+Tfpv63Ifh7oHXuoXOeWQKSS9ZJCIoxnPO6XP3m1D14?= =?us-ascii?Q?8tXtvwAwhbM3NplIL+QO+yuD5Bz9bC67klkJds47LvEXy/ItClH9u+Xcot47?= =?us-ascii?Q?JYCaITIp1SWrMSU=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2025 08:05:24.8265 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dbda617e-2bb4-4caa-9eb2-08dd76741e07 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0001AE16.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR12MB9571 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.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 04/10/25. 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=407880c33ec2927739644ee65608deeb9cbb61f6 Thanks. Xueming Li --- >From 407880c33ec2927739644ee65608deeb9cbb61f6 Mon Sep 17 00:00:00 2001 From: Yang Ming Date: Fri, 7 Mar 2025 13:40:22 +0800 Subject: [PATCH] net/iavf: fix mbuf release in Arm multi-process Cc: Xueming Li [ upstream commit 289d1b2e348032543f9b823d2eaf3d0e0073af56 ] This patch addresses a bug related to mbuf release in the Arm architecture. The previous patch resolved the mbuf release issue in a multi-process environment but was only applicable to the x86 architecture, leaving Arm unaddressed. This patch extends the fix to include the Arm architecture, ensuring consistent behavior across both x86 and Arm platforms. Fixes: fced83c1229e ("net/iavf: fix mbuf release in multi-process") Signed-off-by: Yang Ming Acked-by: Bruce Richardson --- drivers/net/iavf/iavf_rxtx.c | 3 +++ drivers/net/iavf/iavf_rxtx.h | 2 ++ drivers/net/iavf/iavf_rxtx_vec_neon.c | 8 ++------ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index ced1c21c24..c4bd128043 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -411,6 +411,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = { #ifdef RTE_ARCH_X86 [IAVF_REL_MBUFS_SSE_VEC].release_mbufs = iavf_rx_queue_release_mbufs_sse, #endif +#ifdef RTE_ARCH_ARM64 + [IAVF_REL_MBUFS_NEON_VEC].release_mbufs = iavf_rx_queue_release_mbufs_neon, +#endif }; static const diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index f432f9d956..d6731327f6 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -437,6 +437,7 @@ enum iavf_rxtx_rel_mbufs_type { IAVF_REL_MBUFS_DEFAULT = 0, IAVF_REL_MBUFS_SSE_VEC = 1, IAVF_REL_MBUFS_AVX512_VEC = 2, + IAVF_REL_MBUFS_NEON_VEC = 3, }; /* Receive Flex Descriptor profile IDs: There are a total @@ -760,6 +761,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev); void iavf_tx_queue_release_mbufs_avx512(struct iavf_tx_queue *txq); void iavf_rx_queue_release_mbufs_sse(struct iavf_rx_queue *rxq); void iavf_tx_queue_release_mbufs_sse(struct iavf_tx_queue *txq); +void iavf_rx_queue_release_mbufs_neon(struct iavf_rx_queue *rxq); static inline void iavf_dump_rx_descriptor(struct iavf_rx_queue *rxq, diff --git a/drivers/net/iavf/iavf_rxtx_vec_neon.c b/drivers/net/iavf/iavf_rxtx_vec_neon.c index 83825aa427..23c1d6c3a2 100644 --- a/drivers/net/iavf/iavf_rxtx_vec_neon.c +++ b/drivers/net/iavf/iavf_rxtx_vec_neon.c @@ -391,20 +391,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue, return _recv_raw_pkts_vec(rx_queue, rx_pkts, nb_pkts, NULL); } -static void __rte_cold +void __rte_cold iavf_rx_queue_release_mbufs_neon(struct iavf_rx_queue *rxq) { _iavf_rx_queue_release_mbufs_vec(rxq); } -static const struct iavf_rxq_ops neon_vec_rxq_ops = { - .release_mbufs = iavf_rx_queue_release_mbufs_neon, -}; - int __rte_cold iavf_rxq_vec_setup(struct iavf_rx_queue *rxq) { - rxq->ops = &neon_vec_rxq_ops; + rxq->rel_mbufs_type = IAVF_REL_MBUFS_NEON_VEC; return iavf_rxq_vec_setup_default(rxq); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-04-08 15:39:06.888909270 +0800 +++ 0032-net-iavf-fix-mbuf-release-in-Arm-multi-process.patch 2025-04-08 15:39:05.966436568 +0800 @@ -1 +1 @@ -From 289d1b2e348032543f9b823d2eaf3d0e0073af56 Mon Sep 17 00:00:00 2001 +From 407880c33ec2927739644ee65608deeb9cbb61f6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 289d1b2e348032543f9b823d2eaf3d0e0073af56 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -19,3 +21,3 @@ - drivers/net/intel/iavf/iavf_rxtx.c | 3 +++ - drivers/net/intel/iavf/iavf_rxtx.h | 2 ++ - drivers/net/intel/iavf/iavf_rxtx_vec_neon.c | 8 ++------ + drivers/net/iavf/iavf_rxtx.c | 3 +++ + drivers/net/iavf/iavf_rxtx.h | 2 ++ + drivers/net/iavf/iavf_rxtx_vec_neon.c | 8 ++------ @@ -24,5 +26,5 @@ -diff --git a/drivers/net/intel/iavf/iavf_rxtx.c b/drivers/net/intel/iavf/iavf_rxtx.c -index 657963750d..a999073691 100644 ---- a/drivers/net/intel/iavf/iavf_rxtx.c -+++ b/drivers/net/intel/iavf/iavf_rxtx.c -@@ -380,6 +380,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = { +diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c +index ced1c21c24..c4bd128043 100644 +--- a/drivers/net/iavf/iavf_rxtx.c ++++ b/drivers/net/iavf/iavf_rxtx.c +@@ -411,6 +411,9 @@ struct iavf_rxq_ops iavf_rxq_release_mbufs_ops[] = { @@ -37,6 +39,6 @@ - static inline void -diff --git a/drivers/net/intel/iavf/iavf_rxtx.h b/drivers/net/intel/iavf/iavf_rxtx.h -index 6a54b446cf..823a6efa9a 100644 ---- a/drivers/net/intel/iavf/iavf_rxtx.h -+++ b/drivers/net/intel/iavf/iavf_rxtx.h -@@ -404,6 +404,7 @@ enum iavf_rxtx_rel_mbufs_type { + static const +diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h +index f432f9d956..d6731327f6 100644 +--- a/drivers/net/iavf/iavf_rxtx.h ++++ b/drivers/net/iavf/iavf_rxtx.h +@@ -437,6 +437,7 @@ enum iavf_rxtx_rel_mbufs_type { @@ -50,2 +52,2 @@ -@@ -729,6 +730,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev); - void iavf_tx_queue_release_mbufs_avx512(struct ci_tx_queue *txq); +@@ -760,6 +761,7 @@ void iavf_set_default_ptype_table(struct rte_eth_dev *dev); + void iavf_tx_queue_release_mbufs_avx512(struct iavf_tx_queue *txq); @@ -53 +55 @@ - void iavf_tx_queue_release_mbufs_sse(struct ci_tx_queue *txq); + void iavf_tx_queue_release_mbufs_sse(struct iavf_tx_queue *txq); @@ -58,5 +60,5 @@ -diff --git a/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c b/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c -index 6bc8e1db2a..a583340f15 100644 ---- a/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c -+++ b/drivers/net/intel/iavf/iavf_rxtx_vec_neon.c -@@ -393,20 +393,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue, +diff --git a/drivers/net/iavf/iavf_rxtx_vec_neon.c b/drivers/net/iavf/iavf_rxtx_vec_neon.c +index 83825aa427..23c1d6c3a2 100644 +--- a/drivers/net/iavf/iavf_rxtx_vec_neon.c ++++ b/drivers/net/iavf/iavf_rxtx_vec_neon.c +@@ -391,20 +391,16 @@ iavf_recv_pkts_vec(void *__rte_restrict rx_queue, @@ -82,2 +84 @@ - rxq->mbuf_initializer = ci_rxq_mbuf_initializer(rxq->port_id); - return 0; + return iavf_rxq_vec_setup_default(rxq); @@ -84,0 +86 @@ +