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 71D9346C54 for ; Wed, 30 Jul 2025 17:02:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 692FC40EA5; Wed, 30 Jul 2025 17:02:01 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2086.outbound.protection.outlook.com [40.107.223.86]) by mails.dpdk.org (Postfix) with ESMTP id 01C7540EA5 for ; Wed, 30 Jul 2025 17:01:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=WCtQ6W3XUQMBpWPBcIHLuQz66ib9kc9OIeKIVUqzD/vyJH1NvFn/953VWEUfFOh57RwtZlwQKRBse7PjHcyyrztGiRit5AhUMaDhsRQUlng4mSVZ1Qh2aCedvtrFZVGz0a4+7btPyWCMSTtzPp+kjUNS20hagsbElVYFucs8jsrHJyKl1FR9TSUPWjJAYfZ17nQW0he/3REKL39UvMiau88lhhN67S/HE/DhFIczhNIPvhGQ8On9JZ0Td/NDAJcPJckr/2SfpCNesr8lzYua04OwD/g+UmosOdTAiaWtwcYdmbzqvJI1QMocSpW4wAzWJ6mI/V2Gud8ed3pcwG4OGA== 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=kYZeA0aDb5gZCkU9SWum41BfNoe6AOgpAKew8jbcIwg=; b=rL727wx07dtzSM90u1pWJqMq1xXNgeIQ6gPRFvxyC/qRsC9Po54h8NU3tqnKiy4zzRFAnxr8nFOKleMxCRKJd8zfrgGwLe4x+LIb7zeQP1KXdy6PNK6utDnzs0/UjsCoDGiD+bvS8FY0Dxvv3XWc4949CjjCuINOby80gZqOel6TmB7+nFbXoENxtWbcp/6210Fx3UcO6G3Fx1UexfQOrd/pON63SeodBtKYI/qPHpDKTOhZwPN75IPBC3UNuJjgs02ph4zzqUksGO813zdhJsbmWbZmlBYChPBkRCzxr6NpCzlkPwz6hsae1V2lL+E08UYkJMtAXbTnHvv5XLKAzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=kYZeA0aDb5gZCkU9SWum41BfNoe6AOgpAKew8jbcIwg=; b=LqTZBwWLxNUtirQMhkOxKzEaChG0zc92p50TzaU18ieMcHnUJgRPEA3f6Z8ksrQOru6uPevIRydJhYdlJCAfvzbZNHhgNZHiUhcb1r3lUUNyCocKUOsx2abfgP4evQKTQIj5LKy8wt/7ByrJQ5UAliSltCSMnY3Ymo2hdD++ZWP1MqM92DR3pu3BDTq+jK3yA/RQAhj+XqX/Loh33VAJDeU1PubKPVMADX5eUkCGzTVSOptbvnOL98mkT1e6Lc8fX7eoWFgbo6By6au0wog98neZH0ywPsslQKSSBNUFFGCs/KY595vt/Hg92L1btSFF5BCULsCsxCXqIHd2nhsaBg== Received: from BN1PR10CA0013.namprd10.prod.outlook.com (2603:10b6:408:e0::18) by CY5PR12MB6384.namprd12.prod.outlook.com (2603:10b6:930:3c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 15:01:55 +0000 Received: from BL6PEPF0002256F.namprd02.prod.outlook.com (2603:10b6:408:e0:cafe::e9) by BN1PR10CA0013.outlook.office365.com (2603:10b6:408:e0::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 15:01:55 +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 BL6PEPF0002256F.mail.protection.outlook.com (10.167.249.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 15:01:54 +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.14; Wed, 30 Jul 2025 08:01:35 -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.14; Wed, 30 Jul 2025 08:01:29 -0700 From: Xueming Li To: Bruce Richardson CC: Xueming Li , Anatoly Burakov , dpdk stable Subject: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 22:56:27 +0800 Message-ID: <20250730145633.245984-19-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730145633.245984-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-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: 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: BL6PEPF0002256F:EE_|CY5PR12MB6384:EE_ X-MS-Office365-Filtering-Correlation-Id: 104e2372-63e5-4108-421e-08ddcf7a05fc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|1800799024|36860700013|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EoORNZi0gx+V5BeL1zElRBV7+3S9EMS/8/VlEh6H8+684S3zIKCy2Sbun8o+?= =?us-ascii?Q?keXp/Eq1yc4E0jwSi/plxq5gyFT0YBdIjDR/kTMCkwGuZIgXuz5oKk+V+ONv?= =?us-ascii?Q?SdQqbAZgN2sy7fOoIfJ2bSO9NDt/hRCWyxEBhl+1gHj64SSNLi3elSZljrKk?= =?us-ascii?Q?rBDAaikbP1MPL87TRnKuQ1UDdO5+ScjgWUIYf8Gey8yg+EOoILn/Ra02tKCO?= =?us-ascii?Q?9cqKnj6XYrnUf4pk+duurkCr6JOQgd0uQzMehW0QlLJxcr0rjAl8Vf30cGd/?= =?us-ascii?Q?0bFAYHucaExoUks7jEzH2Bkn6b5IjAGLZIDv5tEPj/57hiifaHhImkh8FQPx?= =?us-ascii?Q?yuZ+v/h8m8vLor/SLQaS6RgZoKBf6vMTyZACTAN32r0XL6JZBUk69/zGO4bQ?= =?us-ascii?Q?JOAR+5u7fnKo5AG4E5hxCSSx30ahL1cz/Z+vEbYz0ryCBOzVAcCSjd9XuCmY?= =?us-ascii?Q?RdkIt2CoxTBEt7cYnp12UiOVnlwEv0Ul+rceYfsD6brXUuypMbbpOacqPari?= =?us-ascii?Q?IGEfFWe6avP/k1nBk5Ey4sM2Lv/oEAA28BCBFd+7QvKGd/PsXutBNKhn8qN1?= =?us-ascii?Q?Fd1zVMQcBc3e46VsotMfvi8xwNcyQ5XRe7YGl4+Ri3ZXZoKIdBAGxLs+Ta+4?= =?us-ascii?Q?17bLONBDJr01EPdECdpgqFTOM2ljUuIoBXAJ3IhX1ufaF1CccRkpxJQOJzG8?= =?us-ascii?Q?MDygLHLIg/zhnq1kFSS7tGZdEymkBbPdAXR99OHyqwZ9qkFWxFf1YPFKCZpk?= =?us-ascii?Q?m4Qun9nZz3Gr/+NcrolgAip/6FmEN58xGO9GNUNzCym+iac+lOWmePp6Qtax?= =?us-ascii?Q?Ybh6kvRuTcIau3UEPVOnLvT8kuncWI6z+q09yVnDYopW9hKds4a3tn5B1WSp?= =?us-ascii?Q?aIz+V3pZzfszKVtNEwUkZA5H1KBBU9rSvhm8UaRkC+pGuKTaGqmPU7uCNVCG?= =?us-ascii?Q?teGxFfUBb6FOB4YXsRsxRK12Xule/ZssMGmqs+udDGdkiB2Pm2HGCra9ggUs?= =?us-ascii?Q?GFhMns2c7Ir349QcFvMWzl982Pm2Gm4zFpW2+kPp8RQp6/vrUtHHMFZ202tX?= =?us-ascii?Q?sn5JC53Twkv0AbGQ8lTpc8m+AWinsyZ6cSfoD9i18XfhilzMcpIaVLLSDWmf?= =?us-ascii?Q?OoD6uJSCEezfclZY3hj68eUkARuXlbJiSM5iTC1AdnHJroqsetwuBbWJJIJO?= =?us-ascii?Q?O1HsZ7xAwl1Ase0ZVbNKpmzOgsc70m9l8cst35pHl6qe9trHfIPDGNBAGPBf?= =?us-ascii?Q?RtkvN2khQyhl1ws3kWQdcpfsZMX7W0jGUeWCJzSU7/8ipE6Yh3IPJv8JMSqQ?= =?us-ascii?Q?IY1SpeitJZzabCgnQ/loFgC/dPuOBBUU45FpzK0Q9dt8QaDXNRGTTjSkfzfI?= =?us-ascii?Q?h6B3eJKL7SnoGjuto0L/BzDCPvP9V70w20YbjBm44/VVt/BYBjg5/nO/SllF?= =?us-ascii?Q?kEZrYKXHxDO4Y+pVhIpOR6jQavei9eEJXBlUh03E0R0q/SZdPBPu9rRsdTcn?= =?us-ascii?Q?hDpeB9kPXUJLY34SbkBw3wWz/1H3VX9xZYe3?= 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)(82310400026)(376014)(1800799024)(36860700013)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 15:01:54.8047 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 104e2372-63e5-4108-421e-08ddcf7a05fc 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: BL6PEPF0002256F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6384 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.5 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/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=43fdac7411d9a6d408b2ce61a5c191886c6ff638 Thanks. Xueming Li --- >From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 27 Jun 2025 14:52:01 +0100 Subject: [PATCH] net/ice: fix inconsistency in Rx queue VLAN tag placement Cc: Xueming Li [ upstream commit 4cd8c72f661c005900ddc39cf0cecfca16184f2a ] When VLAN or QinQ stripping is enabled in the ice driver, an inconsistency was observed between the placement of the VLAN tag in the descriptors of the final Rx queue (irrespective of the number of queues) vs descriptors of all other queues. This inconsistency was due to the fact that the driver - when updating l2tsel (L2 tag selection) field - used the queue id, rather than the register index for the queue. Queue 0 is normally HW queue 1, etc., meaning the final queue never had its field updated. Fixes: de5da9d16430 ("net/ice: support double VLAN") Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Anatoly Burakov --- drivers/net/ice/ice_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index be826d3108..3d08e12cba 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -4744,11 +4744,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi *vsi, enum ice_l2tsel l2tsel) l2tsel_bit = BIT(ICE_L2TSEL_BIT_OFFSET); for (i = 0; i < dev_data->nb_rx_queues; i++) { + const struct ice_rx_queue *rxq = dev_data->rx_queues[i]; u32 qrx_context_offset; u32 regval; - qrx_context_offset = - QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, i); + qrx_context_offset = QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, rxq->reg_idx); regval = rd32(hw, qrx_context_offset); regval &= ~BIT(ICE_L2TSEL_BIT_OFFSET); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 22:50:04.230786948 +0800 +++ 0018-net-ice-fix-inconsistency-in-Rx-queue-VLAN-tag-place.patch 2025-07-30 22:50:03.048759617 +0800 @@ -1 +1 @@ -From 4cd8c72f661c005900ddc39cf0cecfca16184f2a Mon Sep 17 00:00:00 2001 +From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4cd8c72f661c005900ddc39cf0cecfca16184f2a ] @@ -21 +24 @@ - drivers/net/intel/ice/ice_ethdev.c | 4 ++-- + drivers/net/ice/ice_ethdev.c | 4 ++-- @@ -24,5 +27,5 @@ -diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c -index 680e7724cd..513777e372 100644 ---- a/drivers/net/intel/ice/ice_ethdev.c -+++ b/drivers/net/intel/ice/ice_ethdev.c -@@ -4988,11 +4988,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi *vsi, enum ice_l2tsel l2tsel) +diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c +index be826d3108..3d08e12cba 100644 +--- a/drivers/net/ice/ice_ethdev.c ++++ b/drivers/net/ice/ice_ethdev.c +@@ -4744,11 +4744,11 @@ static void ice_vsi_update_l2tsel(struct ice_vsi *vsi, enum ice_l2tsel l2tsel) @@ -32 +35 @@ -+ const struct ci_rx_queue *rxq = dev_data->rx_queues[i]; ++ const struct ice_rx_queue *rxq = dev_data->rx_queues[i];