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 604AE48B59 for ; Thu, 20 Nov 2025 13:45:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B525402DD; Thu, 20 Nov 2025 13:45:21 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 534FC402D4 for ; Thu, 20 Nov 2025 13:45:20 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-477619f8ae5so5111465e9.3 for ; Thu, 20 Nov 2025 04:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763642720; x=1764247520; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YqcgNaP3wuPaelGtPYy8VLkWCEiOK8B2tWmYbRK+Koo=; b=dxlQZ6/RgebqTsl9NTX/Uo4y/nOWPYf7zQIXZhmO2vMujWV+HkSnlS8cPX2A6sR4+q tFUSd3MHsjuXWtZcvHZeaWUwuuR2zIgvJaT2Ly7aQFDCrsJ1niP6ISayESgsK3h9wX45 5kdK1mWRGOAaAlMphB87brZOOGJ+QdI20qIWkwhi53c8WnpYfpOXOixlEQ4qH/HuwZLQ hwMffGurqMXVXB3aOo8BC3+jsa2Wd3XD3m7vlCXiROK8MjK1W9b4NRYuuAwnpyEEHT8T 8Q3+WX5m/T9AsCWCZjbvx/MtBJLNsaYLsOQaZeTcwyy8DuQXeu7CbzIyKRM6keM6tplI qwuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763642720; x=1764247520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YqcgNaP3wuPaelGtPYy8VLkWCEiOK8B2tWmYbRK+Koo=; b=IURGB7RVtLigGudGZlAFmwK6JoByAESTRC7u3XTOr7Y/HnspwCJs0wPILrrhe/kQdZ Nt4OGWOFpPr6AG9iz82d1lwBDaluzu6T0WJ+aWdNNL8vC+/10rbqHKUmVc4tEHL6+48F Iz9jK32Yaln4SBARjixzebfXUKvGqI3w5BmZsWITgYJ7tBPHtd4Aglm/uY0Sk/9oOoTL ftduIJYl0nZPSXdJFB1hbJT8S8nSBsyG5cuNALgyhUaX79fPl5wLIUST+oqiD3daxLVm e1SEPgSpc9oYPZiFfcY2sWZelJ6kccyOIUrTp4+xxUxhLhNxVeevbyYymX3y1ku66lVV N7iA== X-Forwarded-Encrypted: i=1; AJvYcCV2ynPWbPv8dJnjLLYj97Y5eMrYc9ns4C0QFfKkETnY0PZmH8rRA2x4DdrVC2YhSnU2qTXLBKE=@dpdk.org X-Gm-Message-State: AOJu0YzkkbZcTxuPY+v3OvEDwVba1JJq69wCmY/hYQ3h9AP91whmLEVC 9nm2y/F4D6AIV1ieC1pXOO21EvU59L87MTpbYyw9GWFc96XtkSjacdJoEDv/B4LM X-Gm-Gg: ASbGncsChTUkICFA/hziuWcT9PhxkY+2s6DU42WTfMNrgoj1u3jmyuEK5Hz2u1d8mov yn/GpAbNWv/b2qOtimWaNdNZr9BcUHzA4ZDQLvNVHaNeQIRR2F2p7DDEDJgeQBbdKkSnfebCH9J VpQDks0vQpEbzgUYc5gEc32SwZsULDl+beFuwDCGiOwE27xH0awY/WO0Aq7X/MffLbEDKhcs2PO 2ymUsXnW5QKE2l8VelGhBUSv+MiT0+RJM5R+FxuL44xjnx8FfVxdNxKKVYFgSUjbb1T+9RftsQ4 PnAspwhkA/6k9n7fwk/8mKpUo6K+ER6PDpsJoMqe6kS+ddMGvrzXrD2q3jVehcvxHNvDTZYCv45 VzICLdbwIm5AUv+04Q8YuUnLsl4QL4iSdGpqIeF1+XziCiQoH3kByToq1R9hDChOmht2VkOQwgE vzKCHnmeNxuPiQgBWq X-Google-Smtp-Source: AGHT+IE0IlrGJXYkRk3+Wzsj8juCYbVvH7QQ+bxjZGkucl2jhUH6ZATPOoa8sobFHoB9tArZAoypHA== X-Received: by 2002:a05:600c:1c85:b0:477:994b:dbb8 with SMTP id 5b1f17b1804b1-477babcf5c5mr19306175e9.11.1763642719648; Thu, 20 Nov 2025 04:45:19 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f372:8d1a:399f:e8a2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-42cb7fb919bsm5267804f8f.34.2025.11.20.04.45.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 04:45:18 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.11 Date: Thu, 20 Nov 2025 12:44:35 +0000 Message-ID: <20251120124514.757933-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120124514.757933-1-luca.boccassi@gmail.com> References: <20251112165308.1618107-49-luca.boccassi@gmail.com> <20251120124514.757933-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b3fc7f52fa16e82fe4c94b7d4d0681b8908187f8 Thanks. Luca Boccassi --- >From b3fc7f52fa16e82fe4c94b7d4d0681b8908187f8 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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-20 12:44:12.908113645 +0000 +++ 0003-net-ice-fix-path-selection-for-QinQ-Tx-offload.patch 2025-11-20 12:44:12.770087792 +0000 @@ -1 +1 @@ -From 61ccab85e3972d6e3ee61b3e6a6a6872a33e5ac3 Mon Sep 17 00:00:00 2001 +From b3fc7f52fa16e82fe4c94b7d4d0681b8908187f8 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,