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 A8314470E5 for ; Thu, 25 Dec 2025 10:25:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A77B40430; Thu, 25 Dec 2025 10:25:10 +0100 (CET) Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011064.outbound.protection.outlook.com [40.107.208.64]) by mails.dpdk.org (Postfix) with ESMTP id BD93C402B2 for ; Thu, 25 Dec 2025 10:25:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VKzqwX6IqURqRzmW4GkfmQpfhAHS9WYGlsheQs/gPhy67pY+InyLH10vXYRxy5BDeslsmRrl4hayeez3WMfsg0KXOA4x6Qserenc+HKnTKOAKv08oMCtlbK02YQDvRX+6hDy55br2T6goZsojMn27i905OYMtyZf7QoXNf9025/Vl0vGxm1cbXVVtFI0OvGB4QAM6fK10CN12lLNPPpGRWkD+KTK9Cu2Fw0hS1NBw9nZGbbLqGs/ILrLy4e6R1j5TEfroeBAwvHKNQXalL/1bgUX1l1/9oLn5zu0xtcH6aU0pFSoYLlTFabejICI5oCQt9o4qh5gehgYi9jobWBI/Q== 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=vzteROxxpxTlaYTFaZL2sa5VUwm48Zsjmmmy/d5pKUY=; b=shj4Zl4je7Lj0marrQiAOBL5gK0WJdDh0k1ztJt+KY+5ZkZm9EnGtiVhOou75hLhakxsfS0U4aps4cmBm9iP1bD6DINXdKlKPZXXOeA8emYiQbAPhHxPuI8uNrxPGzhcL+LDlk0Yf0gYdjhpB2/0nHx4uBHUOS1f9wQPFC5W86/Bc8wp719PXyhmRY7wMUG+HGWq1xa1er/ERLF8oYxAt4nIEirqAnAef9sNjGEVnew/xy2ExBTYCJb+wRueZub+wnScNtQEbq0mywhddGFUJPIqiSeUt506Wm9gJ1XNS3a43/USmf3b0IyHioAgOI2Oz/gHwcaIS9Qgz9PIt5Avdw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.118.233) 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=vzteROxxpxTlaYTFaZL2sa5VUwm48Zsjmmmy/d5pKUY=; b=tXjXtcjy3eRNoOLqzHdPq6XF7ANyoq7LqKEnE+QZyy2EgXQHWHXXrFRJEjg1HP4v5vCJyhowXgdsmaT13yNLDc3OBTRYtkca23Tc5jBqulY8BPLknvpc06nGojQwa6+DAuEN5AMCX830EKzFNVnLGgdgmHJP1doOEKOAlx+6fjg0aruB09ebmneOvpU7Cvhj4Q4+no1Ali2MiYsanTv0WwWdPx9ph4yP6UbELx71IrYrQpzHtGnQGVTMAU/jRG9F5KcWtwOcIGisj9DjvZsl0rTEWgifpfCNDrcTaBTBeRZYL5Q6YVa2Iwkv2rLn8PsjtXkIDa5LnscT9X3G4ScrSg== Received: from SN6PR01CA0001.prod.exchangelabs.com (2603:10b6:805:b6::14) by SN7PR12MB7979.namprd12.prod.outlook.com (2603:10b6:806:32a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.11; Thu, 25 Dec 2025 09:25:04 +0000 Received: from SA2PEPF00003AEA.namprd02.prod.outlook.com (2603:10b6:805:b6:cafe::37) by SN6PR01CA0001.outlook.office365.com (2603:10b6:805:b6::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9456.11 via Frontend Transport; Thu, 25 Dec 2025 09:25:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.118.233) 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.118.233 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.118.233) by SA2PEPF00003AEA.mail.protection.outlook.com (10.167.248.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9456.9 via Frontend Transport; Thu, 25 Dec 2025 09:25:04 +0000 Received: from drhqmail201.nvidia.com (10.126.190.180) by mail.nvidia.com (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:57 -0800 Received: from drhqmail201.nvidia.com (10.126.190.180) by drhqmail201.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Thu, 25 Dec 2025 01:24:56 -0800 Received: from nvidia.com (10.127.8.12) by mail.nvidia.com (10.126.190.180) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20 via Frontend Transport; Thu, 25 Dec 2025 01:24:55 -0800 From: Shani Peretz To: Bruce Richardson CC: Ciara Loftus , dpdk stable Subject: patch 'net/ice: fix path selection for QinQ Tx offload' has been queued to stable release 23.11.6 Date: Thu, 25 Dec 2025 11:18:37 +0200 Message-ID: <20251225091938.345892-76-shperetz@nvidia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251225091938.345892-1-shperetz@nvidia.com> References: <20251221145746.763179-93-shperetz@nvidia.com> <20251225091938.345892-1-shperetz@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-NV-OnPremToCloud: ExternallySecured X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003AEA:EE_|SN7PR12MB7979:EE_ X-MS-Office365-Filtering-Correlation-Id: ec21b46d-0e74-4305-d64d-08de43977cb2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XDunL9gL9iqvmRUlqoJWULKndfQiYC1gCGxBYHCSMVaicYrS0DLjUHAj3TF3?= =?us-ascii?Q?Hi4fj6kS9qtXBlBqFxVTsg1S/1UjTohYt+BMOPOcnrrWLEjrsikO6iXIKiZQ?= =?us-ascii?Q?UxHf80meH3KDTwfoMIsz47nAxzIe3cpa+2KvcWdBGHZnn2VaW9TgyCNxZS0M?= =?us-ascii?Q?6luRf8La0D3tfx8dLZXf1q2w/7DJuXdkFLni1P6PSDbO55PE5pPKHVS/CNcq?= =?us-ascii?Q?Z231yRjO1KsdFtfg300sUXJmpQA/5mdvGCT7/OlvgMXZhy44Uii/KHLxVWyy?= =?us-ascii?Q?BaA/gY5SNBA32OtBifgWXOzOLBJ7G31U8lpD55dJ2lAjmsdGIkRfYMuXIXZe?= =?us-ascii?Q?NZTRJEtP7IZRUmJ/Bi33serK4W/P1qYkGlkjnJyL/R7mBIon4JPxgvAkzCA1?= =?us-ascii?Q?0Bm6UPT93QFBIXpD5HpqB73oet1HNcfJHgTO66zxOzMucJreu/m7cvvg/YfR?= =?us-ascii?Q?TbHuepNkWaRLaswXGbW2+/phbm3ECL57NlqOJ4aR5BNsS9qbyEMCU0zGI8Yj?= =?us-ascii?Q?W2ICWbOuh7r/04UWluNDbbI8YSLpd2H7JlYv8fla5vZR4kBfllpauh98AVKf?= =?us-ascii?Q?nHHiDF0BMDoyWAXi1tG65Qpi6dd9+vEl5eCaYY78cZGBbDSZzoNowcVtyrlr?= =?us-ascii?Q?PiyQmJy2JcGiQ92cnWi/fj8PofMCkuWuXDfi1IyqlpsSAMpkutclOAaxF44C?= =?us-ascii?Q?5agyPwFLv++QsbA01DRy5Frjnqng15r21zqto212oYy3Cepv3pg38ylnIDuE?= =?us-ascii?Q?+GyZnirPNL3LSFienSV8oZj13qFsGjC5140ZxEZALXADQCZFaSSm9mi+81DM?= =?us-ascii?Q?LvsaaVrVSGWkeCcTFiLZ9RFrMfh9xCCe0rLzW2c7uw0c1AF0+WRzX5eF7am5?= =?us-ascii?Q?BrJxlFjgDgCdLPAi7wx94aehNm+DRmi34FRDGkjnivKI7h+XM40dYQ8u7JOE?= =?us-ascii?Q?D0C7TeRY6LyF2GlyehQA1RtuW6tP8Etms/6aTz1QW1I5Ed2+NVbtMxtaFSnz?= =?us-ascii?Q?4SKtFb4itgYZgFU90DvWSOtfeO/Te5V9r4XsZiZFL+hkH3ExfIFLjsUuLIz/?= =?us-ascii?Q?LGs+/tns44MY2BZhvHtTXuqo/yyAABLUEhXQYNYTtld0nZp4GH3Tf9Tg/u5z?= =?us-ascii?Q?W14U7Pgrz70RLwaU0Z5LqVYt9HN+5Bz8mGPtag3g+xtmhSmPCjtRzoRyiXdH?= =?us-ascii?Q?OobLCQNdBqgoF9RrEVAxO9mFKggXLX7rr5j6eFirRPi1AwQop6DFcyaEM6lE?= =?us-ascii?Q?gX2Bzp7z3NIBZpnmD236Y94LMC7mjfZ0s66ZSJUJtAYBJAIcUC36n/LBporO?= =?us-ascii?Q?zRrT1HAGI+EXkxz8ROQXx2m1eCiiNz2zuGCYUKYPMoTAVICr3pdh6prDq1WY?= =?us-ascii?Q?L+bX4vcd2ihgHXd8QW9vVmCFJcb4X0QsxVS/9gtHZaWkXVnmDoB8n6M5Dte3?= =?us-ascii?Q?j9tmTfkGW/2ymDn1+P7JDTU8XSjwSbI9iepty8neuF9MF1sJyQIsxqWeroLc?= =?us-ascii?Q?Bo19j3781eBYUNknzmy6GzlcifgcFY1a5liZwOLOPMwqmo4KSUtzN0PE4Ait?= =?us-ascii?Q?1AKKsxJnsqSf1v3tosTsSZoZnvAUq800RPiIlE4D?= X-Forefront-Antispam-Report: CIP:216.228.118.233; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc7edge2.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(36860700013)(376014)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Dec 2025 09:25:04.3519 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec21b46d-0e74-4305-d64d-08de43977cb2 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.118.233]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003AEA.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7979 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/30/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://github.com/shanipr/dpdk-stable This queued commit can be viewed at: https://github.com/shanipr/dpdk-stable/commit/13c0e5bacbe088bc8912073660e6b6903731c34b Thanks. Shani --- >From 13c0e5bacbe088bc8912073660e6b6903731c34b Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 12 Nov 2025 11:57:26 +0000 Subject: [PATCH] net/ice: fix path selection for QinQ Tx offload [ upstream commit 61ccab85e3972d6e3ee61b3e6a6a6872a33e5ac3 ] The capabilities flag for the vector offload path include the QinQ offload capability, but in fact the offload path lacks any ability to create context descriptors. This means that it cannot insert multiple vlan tags for QinQ support, so move the offload from the VECTOR_OFFLOAD list to the NO_VECTOR list. Similarly, remove any check for the QinQ mbuf flag in any packets being transmitted, since that offload is invalid to request if the feature is not enabled. Fixes: 808a17b3c1e6 ("net/ice: add Rx AVX512 offload path") Signed-off-by: Bruce Richardson Acked-by: Ciara Loftus --- drivers/net/ice/ice_rxtx_vec_common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/ice/ice_rxtx_vec_common.h index d745eda567..fa6db8f44f 100644 --- a/drivers/net/ice/ice_rxtx_vec_common.h +++ b/drivers/net/ice/ice_rxtx_vec_common.h @@ -249,6 +249,7 @@ ice_rxq_vec_setup_default(struct ice_rx_queue *rxq) #define ICE_TX_NO_VECTOR_FLAGS ( \ RTE_ETH_TX_OFFLOAD_MULTI_SEGS | \ + RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM | \ RTE_ETH_TX_OFFLOAD_TCP_TSO | \ RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO | \ @@ -259,7 +260,6 @@ ice_rxq_vec_setup_default(struct ice_rx_queue *rxq) #define ICE_TX_VECTOR_OFFLOAD ( \ RTE_ETH_TX_OFFLOAD_VLAN_INSERT | \ - RTE_ETH_TX_OFFLOAD_QINQ_INSERT | \ RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_TX_OFFLOAD_SCTP_CKSUM | \ RTE_ETH_TX_OFFLOAD_UDP_CKSUM | \ @@ -415,8 +415,8 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt, *txd_hi |= ((uint64_t)td_offset) << ICE_TXD_QW1_OFFSET_S; - /* Tx VLAN/QINQ insertion Offload */ - if (ol_flags & (RTE_MBUF_F_TX_VLAN | RTE_MBUF_F_TX_QINQ)) { + /* Tx VLAN insertion Offload */ + if (ol_flags & RTE_MBUF_F_TX_VLAN) { td_cmd |= ICE_TX_DESC_CMD_IL2TAG1; *txd_hi |= ((uint64_t)tx_pkt->vlan_tci << ICE_TXD_QW1_L2TAG1_S); -- 2.43.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-12-25 11:16:40.128424489 +0200 +++ 0076-net-ice-fix-path-selection-for-QinQ-Tx-offload.patch 2025-12-25 11:16:36.110780000 +0200 @@ -1 +1 @@ -From 61ccab85e3972d6e3ee61b3e6a6a6872a33e5ac3 Mon Sep 17 00:00:00 2001 +From 13c0e5bacbe088bc8912073660e6b6903731c34b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 61ccab85e3972d6e3ee61b3e6a6a6872a33e5ac3 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - drivers/net/intel/ice/ice_rxtx_vec_common.h | 6 +++--- + drivers/net/ice/ice_rxtx_vec_common.h | 6 +++--- @@ -23,5 +24,5 @@ -diff --git a/drivers/net/intel/ice/ice_rxtx_vec_common.h b/drivers/net/intel/ice/ice_rxtx_vec_common.h -index a24694c0b1..39581cb7ae 100644 ---- a/drivers/net/intel/ice/ice_rxtx_vec_common.h -+++ b/drivers/net/intel/ice/ice_rxtx_vec_common.h -@@ -53,6 +53,7 @@ _ice_rx_queue_release_mbufs_vec(struct ci_rx_queue *rxq) +diff --git a/drivers/net/ice/ice_rxtx_vec_common.h b/drivers/net/ice/ice_rxtx_vec_common.h +index d745eda567..fa6db8f44f 100644 +--- a/drivers/net/ice/ice_rxtx_vec_common.h ++++ b/drivers/net/ice/ice_rxtx_vec_common.h +@@ -249,6 +249,7 @@ ice_rxq_vec_setup_default(struct ice_rx_queue *rxq) @@ -35 +36 @@ -@@ -64,7 +65,6 @@ _ice_rx_queue_release_mbufs_vec(struct ci_rx_queue *rxq) +@@ -259,7 +260,6 @@ ice_rxq_vec_setup_default(struct ice_rx_queue *rxq) @@ -43 +44 @@ -@@ -195,8 +195,8 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt, +@@ -415,8 +415,8 @@ ice_txd_enable_offload(struct rte_mbuf *tx_pkt,