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 62FA14625C for ; Tue, 18 Feb 2025 13:37:39 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A75D402A0; Tue, 18 Feb 2025 13:37:39 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2052.outbound.protection.outlook.com [40.107.93.52]) by mails.dpdk.org (Postfix) with ESMTP id 1C90B402E9 for ; Tue, 18 Feb 2025 13:37:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zE/ZSXbrEUsGs+mERXoMoAa2F6sdsNohl9BL7gF8UR8IqdpWptyCw+LAeZ6uyrfTrzYiYnzL267LBSZz8JwTT9d3aisiqs5R8QHs6MHvS6sReKL1+6jri3HFLZJFLVwB03udxY9U1CR8k+1F7u4ZDnyU+TclTKC2mue9tU/M8SA0O+t/eYF/l6TQNH1WAOGiggItscBfyKwKqPhhOXhuSkWp4Njk2Ada/1YdTV3qpYsm4BQ4AtCYCjmeahzWWHVEv9daisCkC6yNE241CHBAIYCtoTn7b7DRnD+yrihynf7ui0C7mwNxF8W6tykVL7fXv/w1CkQDnPUEwP5mpsn27A== 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=hak4hwxxivrXVVXxz+C62T2aE77r9l0Mv/Yf+hNktKI=; b=vI3o0P+yadlduDuHxyiFEsuN4nKgAeHwxcUt6vG36fajPF+cxZX6M/kBj5WNZnucYa3uV0VUf0s7CwATd7YvvM3CWDRNyQWOnFtJCrL7nc85zjMnPU0giZVKCgJbBOXLstdX+r/55RI1Qn9lfSOk+oiohN+5KlxjLxLPm4f3Tn9WQ6xbdf9Av2z7jDA25GVZK2lza1JVquG6TvT+B0iX59wmQ4fYYkN2vtnUxjx2e2rFhdcKJHjc0ZUipuUJfljuFpwQNqLd1RhxuFxoFKRS7GyxvNLokgReI89rLlNVevEoCf6K2AnmXviIBg9DtyEhFX6S0litmqXNj03kCsgkKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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=hak4hwxxivrXVVXxz+C62T2aE77r9l0Mv/Yf+hNktKI=; b=Jqx8eRSVosorxql3EkwL/TxZwT4kobwnEQtN6EBnLe+gzPKN92ZDroa5mSoqREUAaXQoRtxxTSuRTeioFxL3wyLw9Nw/5HpdrmU8rIq0wpEsX68Ur24S5F7Qz9GyibaIudl3GUaUm4N7tznf9Zn42Qa8FRjlvaVMtKq9JZpC7BCOn1CKHZrB+Wml9IrzvAerR77iY9dn+MB2ZMTtLkV5CWqvQfxazAaCuIrJL2354bfACoAvLV47r2qdozZh8nTlsIAhHRUN4SHLaorYClx2/Vix9N0Gk/b7YNMRDx57bD2OkqOvcL1NPFr5NTRxUgOmVmR7RCgdUJwNetQhFKhYkw== Received: from BN8PR07CA0029.namprd07.prod.outlook.com (2603:10b6:408:ac::42) by SA1PR12MB6870.namprd12.prod.outlook.com (2603:10b6:806:25e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Tue, 18 Feb 2025 12:37:33 +0000 Received: from BN3PEPF0000B06A.namprd21.prod.outlook.com (2603:10b6:408:ac:cafe::44) by BN8PR07CA0029.outlook.office365.com (2603:10b6:408:ac::42) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8445.17 via Frontend Transport; Tue, 18 Feb 2025 12:37:33 +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 BN3PEPF0000B06A.mail.protection.outlook.com (10.167.243.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:37:33 +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, 18 Feb 2025 04:37:19 -0800 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.14; Tue, 18 Feb 2025 04:37:17 -0800 From: Xueming Li To: Bruce Richardson CC: , Vladimir Medvedkin , dpdk stable Subject: patch 'net/iavf: remove reset of Tx prepare function pointer' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:11 +0800 Message-ID: <20250218123523.36836-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: BN3PEPF0000B06A:EE_|SA1PR12MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: 08690bdf-eeff-4ebd-2c8e-08dd5019047d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kPf4iv6JvFEYC1QMEa/Fc4UvlwmjCDsuckT3WytbQmX7G9al1jvHG1PE/WBq?= =?us-ascii?Q?vViB3owbr7iG4mcZzQuF8Asn0QXgvyQWl7TgUDW+Qjv7YQQfs9UJD11+5LCl?= =?us-ascii?Q?aLffajIJnxsABzxUPFW/PpP/nREEL+A2uLJ9ITROUZJirazEZckKx4HqbKsD?= =?us-ascii?Q?dum0MxOLG8N1BHsN8ozqWyZJL1iqQXL5/FvaUvktGHrsqe4zl5E0Kz9Uhbk6?= =?us-ascii?Q?kISH3SbkHKpIQll7lOnas5m3cOEjQt6UUfQaRlCdBv4HMbtllg9VCubo805R?= =?us-ascii?Q?ewHuvDZK5NpdtwxJUFyyntl7PkjGAT2092bVV40rM1Po/dxZ3HPaEMj+snd8?= =?us-ascii?Q?Ij72BGi0SvOfaqnHNsJ7v2CAVxyQT52cyigLfCHkOR1VMKab/MAw/DSGscZ0?= =?us-ascii?Q?SzfpkKGPne2F7iVpLSncyWQwhJVrQdAj5r/ngBUklgWIhQKn6Kr0BR18w72u?= =?us-ascii?Q?l4lI5wpKi/a7ufL9G4k04TF84IntPpyd8mBYRkorRfXUBXiEyztAzTSkOlyR?= =?us-ascii?Q?P/kHgMlPuELfrkTsu5HzKiIFST6Iv1sRi1XhaGIP85sAVDiUSKxrSjLaBYI8?= =?us-ascii?Q?sz7HfZzGVJ2tpU7CPOFvsROAS1+Y63ruLWqaunKMLXhlx4mTmttG91Szw9DQ?= =?us-ascii?Q?QZdEghEbf+f4qN2blZ+OSA1lWKOJK4fXF6Mzt9dOFX0FOdjTtwUR/WK1Hn8g?= =?us-ascii?Q?WKhHL7aPgnhc28Y7jYx3piigbc8b6hYVTo9ridic66IemMILu8974bFOGzec?= =?us-ascii?Q?Wi0Ul+wr5KeiqNPkWOVIZU5OjvUophNXUb+E/P0ciz5lZCnxcj31YkoCrOxn?= =?us-ascii?Q?WnI2vN7WsYfq2W0wJ5lCxLU7GV3zYuK4uQsPWOHhqKJpY7aGSmZok+w25uh1?= =?us-ascii?Q?YRxgqidN+mIxN8IAjyvt4Jx+2XE0oijBSc/iiDptU90EWW0JODHkfUthY8mw?= =?us-ascii?Q?2+6PsCgphc8eO+3PAMUvrmCSA5pGOjkzwMzhXitmyovaiM1FEfw+UlSCJ1+d?= =?us-ascii?Q?kKwV/ofkmD0O5w8+HFdHaAcpw9EVG0KS7rZ5CIwO+m7Qpf3jAXRvqPPGMJb/?= =?us-ascii?Q?j3joGqQrc7lcRK7zgd7IC2KaP2Xag0PMWQsIhVTzLwu3/tMM1jKMaZq0OIwx?= =?us-ascii?Q?TMdO0JdsldNimvhGtyK9e2z3MryKV0EE8gqzJCpaIZm1sajkD8VxagpH9AE5?= =?us-ascii?Q?OtGoJjSZTo8/+6up6ste+BXZVi5xCPuimK4JDHVdDrrcL2eQbuU9xAwoNhdb?= =?us-ascii?Q?vy0zSN5BTh7O2sENUakg4w45NQXcJFDhP7ecNLPhti3InJKc7n5TJ2vTYp2M?= =?us-ascii?Q?J+kuqvMOxJ71i6wPVRo/8eW3A4k8HIRmS8m8mXI3A212+pcLOEfURsB3lMLe?= =?us-ascii?Q?HeXMR6xWKm4UADLmNTnPWf7mbFjcGUY8C7F5pJutjjDkwt7eCTCJSOJNWAS4?= =?us-ascii?Q?L6mndYCOP1o18CGNOHs8anAHfj+1aAWzl47xbYDs/hgOirekCKmQgI7N3zxv?= =?us-ascii?Q?HndfmtRCBtGwxQ8=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)(376014)(1800799024)(82310400026)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:33.4163 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08690bdf-eeff-4ebd-2c8e-08dd5019047d 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: BN3PEPF0000B06A.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6870 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. 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=f5753bf08752b3d848a30f20f956ee734425560c Thanks. Xueming Li --- >From f5753bf08752b3d848a30f20f956ee734425560c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 13 Dec 2024 14:33:19 +0000 Subject: [PATCH] net/iavf: remove reset of Tx prepare function pointer Cc: Xueming Li [ upstream commit 41be96c907607bc709654f71901913f1534264f8 ] The iavf driver only contains a single Tx prepare function, so when selecting the Tx path, there is no need to reset and reassign the function pointer in the ethdev structure. This fixes an issue where the pointer was reset to NULL, but never assigned back later on function selection. Fixes: 5712bf9d6e14 ("net/iavf: add Tx AVX2 offload path") Fixes: 08eb6a9cc2e1 ("net/iavf: fix Tx L4 checksum") Fixes: 4f8259df563a ("net/iavf: enable Tx outer checksum offload on AVX512") Signed-off-by: Bruce Richardson Acked-by: Vladimir Medvedkin --- drivers/net/iavf/iavf_rxtx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 5fbc581b95..ced1c21c24 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -4010,7 +4010,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) if (!use_sse && !use_avx2 && !use_avx512) goto normal; - dev->tx_pkt_prepare = NULL; if (use_sse) { PMD_DRV_LOG(DEBUG, "Using Vector Tx (port %d).", dev->data->port_id); @@ -4027,7 +4026,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) goto normal; } else { dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx2_offload; - dev->tx_pkt_prepare = iavf_prep_pkts; PMD_DRV_LOG(DEBUG, "Using AVX2 OFFLOAD Vector Tx (port %d).", dev->data->port_id); } @@ -4040,12 +4038,10 @@ iavf_set_tx_function(struct rte_eth_dev *dev) dev->data->port_id); } else if (check_ret == IAVF_VECTOR_OFFLOAD_PATH) { dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_offload; - dev->tx_pkt_prepare = iavf_prep_pkts; PMD_DRV_LOG(DEBUG, "Using AVX512 OFFLOAD Vector Tx (port %d).", dev->data->port_id); } else { dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_ctx_offload; - dev->tx_pkt_prepare = iavf_prep_pkts; PMD_DRV_LOG(DEBUG, "Using AVX512 CONTEXT OFFLOAD Vector Tx (port %d).", dev->data->port_id); } @@ -4078,7 +4074,6 @@ normal: PMD_DRV_LOG(DEBUG, "Using Basic Tx callback (port=%d).", dev->data->port_id); dev->tx_pkt_burst = iavf_xmit_pkts; - dev->tx_pkt_prepare = iavf_prep_pkts; if (no_poll_on_link_down) { adapter->tx_pkt_burst = dev->tx_pkt_burst; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.320662928 +0800 +++ 0016-net-iavf-remove-reset-of-Tx-prepare-function-pointer.patch 2025-02-18 19:39:00.448244079 +0800 @@ -1 +1 @@ -From 41be96c907607bc709654f71901913f1534264f8 Mon Sep 17 00:00:00 2001 +From f5753bf08752b3d848a30f20f956ee734425560c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 41be96c907607bc709654f71901913f1534264f8 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -20,2 +22,2 @@ - drivers/net/iavf/iavf_rxtx.c | 6 ------ - 1 file changed, 6 deletions(-) + drivers/net/iavf/iavf_rxtx.c | 5 ----- + 1 file changed, 5 deletions(-) @@ -24 +26 @@ -index f7df5f21f2..457b5a5655 100644 +index 5fbc581b95..ced1c21c24 100644 @@ -27 +29 @@ -@@ -4173,7 +4173,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) +@@ -4010,7 +4010,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) @@ -35 +37 @@ -@@ -4190,7 +4189,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) +@@ -4027,7 +4026,6 @@ iavf_set_tx_function(struct rte_eth_dev *dev) @@ -38 +40 @@ - tx_burst_type = IAVF_TX_AVX2_OFFLOAD; + dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx2_offload; @@ -43 +45 @@ -@@ -4203,17 +4201,14 @@ iavf_set_tx_function(struct rte_eth_dev *dev) +@@ -4040,12 +4038,10 @@ iavf_set_tx_function(struct rte_eth_dev *dev) @@ -46 +48 @@ - tx_burst_type = IAVF_TX_AVX512_OFFLOAD; + dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_offload; @@ -50,5 +51,0 @@ - } else if (check_ret == IAVF_VECTOR_CTX_PATH) { - tx_burst_type = IAVF_TX_AVX512_CTX; -- dev->tx_pkt_prepare = iavf_prep_pkts; - PMD_DRV_LOG(DEBUG, "Using AVX512 CONTEXT Vector Tx (port %d).", - dev->data->port_id); @@ -56 +53 @@ - tx_burst_type = IAVF_TX_AVX512_CTX_OFFLOAD; + dev->tx_pkt_burst = iavf_xmit_pkts_vec_avx512_ctx_offload; @@ -61 +58 @@ -@@ -4251,7 +4246,6 @@ normal: +@@ -4078,7 +4074,6 @@ normal: @@ -64 +61 @@ - tx_burst_type = IAVF_TX_DEFAULT; + dev->tx_pkt_burst = iavf_xmit_pkts; @@ -68 +65 @@ - adapter->tx_burst_type = tx_burst_type; + adapter->tx_pkt_burst = dev->tx_pkt_burst;