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 68E7E46C5D for ; Thu, 31 Jul 2025 08:07:38 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4D0634025A; Thu, 31 Jul 2025 08:07:38 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2072.outbound.protection.outlook.com [40.107.243.72]) by mails.dpdk.org (Postfix) with ESMTP id 867A64025A for ; Thu, 31 Jul 2025 08:07:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fzAk/fwoLQg+5rM7JqMbhx7cuIqKXi/gXj9SDU46SBfHm/0VE8vjT4G6j+D3jQh0MqMU4UqFTsFjRmrbsIU2Y3GO4oUsn1CEggAbZj8K8Hf/6W8waRE3YxgQd5+3YmnmBd4J5OGZFE4jzI6qwzToWom4M/Kzb8ruNEmZik28YdI6olFo0LeCO1HVaInIVRuDrzKfZoQ7IAQ0nOvmT7bfVKzuhBfohhCNVX00Ac3W6mFTXNdezDDagSbjD20g+R6XQgOJefgz5bFbKUnlbbMzD5RP7DYfJIL864CiirFcuLI+5vngPubvnhdtndpyAOHhGvKwFETpd0RcHNLO/bLH3w== 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=8iy4kitpEDwaSzi4IS/cwMSU3b2jO5Alc/fNig6WkKk=; b=pqVPzTzB2yZZ8Zv6v0IeU8uwLO1T75ubROLSrJTBv9gZApFnqAmkP8txZE9/eBjyirogQ5qur+dS7eX2pHhbPLmOJAK/ePpzM5NOgNJn26ISmYrwAVEZzYuQanYgK1qChBH6dYUnjOjQTARsFsH9jCU13eF4A1FNfKrEE3RWzr17ZhIo3ir8SSIoCRDEDBnlUSYUTnoKh6b+ltw9psHe6kYdGOCX9gGTRxDeadC35pcyXThSgcIwqki26sLpAiqQ1FjEp92TFpyGXaDj5LGlT7eyiSQefS3+x83m7zW88uxIg9Yamv80uUkZAXLY42EebOjNeqhWMFKJ2f7/vweGjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none 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=8iy4kitpEDwaSzi4IS/cwMSU3b2jO5Alc/fNig6WkKk=; b=N/8A8+fYMvLWmhnOUaNNQAsIZUg5YQgjrnTUqrdenD17a5hD4r5rheDFiSMR+ho25D8jx9xdPpKkvkfiMpG1NIdQO2SXNnQQr2vSLJSXQJEvm7IDvmhy++yPB8t0oWqwP2jSpz4nR2n3czY1OaHmax1p0d9as6qvXhcBHdQYs9WJjsn8c4+xwMvsVozFNpU1iYrN7JYEcbTY/zOBez81hsELlB6QHoRj0Y0YtqBMUeZEfFmE1vqo/erdsz1h104zUuenTya8ivh7Mw8iycEPgCUTxahy5ZPLATM3tNR6nUJ1yCwB6lojcpWnF/seMCPX88mtJnbhpv2/2L5x7JLzSQ== Received: from CH3PR12MB8658.namprd12.prod.outlook.com (2603:10b6:610:175::8) by SN7PR12MB6789.namprd12.prod.outlook.com (2603:10b6:806:26b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.26; Thu, 31 Jul 2025 06:07:34 +0000 Received: from CH3PR12MB8658.namprd12.prod.outlook.com ([fe80::d5cc:cc84:5e00:2f42]) by CH3PR12MB8658.namprd12.prod.outlook.com ([fe80::d5cc:cc84:5e00:2f42%4]) with mapi id 15.20.8989.010; Thu, 31 Jul 2025 06:07:34 +0000 From: Xueming Li To: "Richardson, Bruce" CC: "Burakov, Anatoly" , dpdk stable Subject: Re: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement' has been queued to stable release 23.11.5 Thread-Topic: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement' has been queued to stable release 23.11.5 Thread-Index: AQHcAWLmULDmzjYkZEieosZb+m+Gh7RKw3kAgAD8Oo4= Date: Thu, 31 Jul 2025 06:07:33 +0000 Message-ID: References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> <20250730145633.245984-19-xuemingl@nvidia.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR12MB8658:EE_|SN7PR12MB6789:EE_ x-ms-office365-filtering-correlation-id: 94c63736-2669-4ade-4242-08ddcff88a89 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|1800799024|366016|376014|7053199007|8096899003|13003099007|38070700018; x-microsoft-antispam-message-info: =?us-ascii?Q?z+ZRqL9ccYBbvrXh7JAf0JZGMRTVmBPlzmVWprpJtYMp5lk80T0upmlOICCs?= =?us-ascii?Q?ud2WFxqdAVr5qrvsVBjQiVettZuCNKvji/3hCE+QXbsWzMX6ygx47mQD5uPo?= =?us-ascii?Q?ZCqg09kno5OgqimLhKLi66iaiWGeqy7wje0N18V2el9ujtVzwO1U9DsrPuZ2?= =?us-ascii?Q?5UnBbhkj9fplocUhgs5c7GSm9UADi39isLZBb00EQOuidVQMxUt9mKiU+iXQ?= =?us-ascii?Q?wuEKK8V85jUo9uyYD35nT0W4Op/3AxvdtF0vxNc6QO7sUN7JwDOahO2zSN2X?= =?us-ascii?Q?MH6YBSYH0R/yLfHUg/Y11a1I8iHEodtfHWqAmT5lOCf5qOIuO6DkM/+bNWVg?= =?us-ascii?Q?S/nJePQ+CJOEYlYaDs7MAn0UtgmcnjYveG5Cw6NiRscWwD0aIWPGqYlpAHAz?= =?us-ascii?Q?l5pJ6X20NXiRADYbc+xzJT6f4LadovUsnP0bYGg9wcDIDy0uuZHV47Vin9rE?= =?us-ascii?Q?IEy21C2YuceE8J2Cx5K16kTFvXESJHrJfVRGavHNKDBVQPQAP8YSdl+my4f6?= =?us-ascii?Q?cHfe66MGOOf3hg7ekS0oRaorPH0JNtq+3ve5yQ4TaXiRHismOYjeqCftC1kH?= =?us-ascii?Q?qXuMd8SRYr/Atoen6/K3pjHn9aelZY4Au634paLutzm4iaKJ3PUFnY0DpYpP?= =?us-ascii?Q?sdDSUyvJOrCKA5YcCB45+Wu7MdJubw5HQD5IeISBeStnK9AJnBJ3RQFqOZRa?= =?us-ascii?Q?L6ueivwIoO4gvdZKE2ntRdXxeElcLT4np81FZUfhlD3t8XhUw/vqmEmkOCv1?= =?us-ascii?Q?RXqDhsVQj5zRDO8oYNlHzNuKNeygLeHV8atcRF356glBjJOuQZEHjR2sFkgi?= =?us-ascii?Q?o7k9TRO8vZAEUaiGCnI15yoAklfamQAtxEn87K87EaMvD5Z7BpSHWubAENmF?= =?us-ascii?Q?QChE+NhNCJTU9aQU2sCQp7jOvgF0AbHW7IfIfB/SsNgf46rWDh9ciI0bGmeU?= =?us-ascii?Q?1FdAbKf1SUt3pr3Lp7ZIt9vQz4YLtalRthS3rrYahYTAZkJyGWp4MyXRU7sn?= =?us-ascii?Q?hHeMO2itmcbH8Ea59AzJPYCdwfjtWngrYk0kJZmIk6xM210H3uCv3x4gOaHH?= =?us-ascii?Q?OIFc4MAs2NVrmcCFXmSRWVGmVQhciNp79ic3Bh8N2INIeLK1dI3WUxd7ErPl?= =?us-ascii?Q?k4BB/laJbuQARLYBQBDnah08Kggj7B9gQc8W5Jneorm+AY3IArGwOBeEDYQ1?= =?us-ascii?Q?hYq2qNJX6cnOd4w4Cg/lqxYco/Ydq7aey81HE3WGLOEijw1bxq0pPGJANCHs?= =?us-ascii?Q?CrTLIn04cLw931cX7EgacNbDzbkxCtpFJsWwI3wrnuqHFTuCAvbP0mwZfdkE?= =?us-ascii?Q?vkw40kFSRWRipRkyB11WJl/AHxdOqf/thuRCW0+0OadHD43lkK04iAz+V6bZ?= =?us-ascii?Q?c2BkTkLUB4LZaq1M1yCY3BIO5vFVU2XdtExIIYWHE1nTCqRASdhCf8foj9lO?= =?us-ascii?Q?rf5yz4tjzwO9Ho+leFoaWii1XrgZ/1y3ctrneuQiNKcs8O6b2yspCUc5DcVe?= =?us-ascii?Q?yaS9QjZMrneX/jk=3D?= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH3PR12MB8658.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014)(7053199007)(8096899003)(13003099007)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?a4AyZXj5hGEVs64/g80TgCH/KM5/IHgHDGeLjUj3zpyqmX/KS6b+vn1GGYck?= =?us-ascii?Q?Fvduhgnc2/W1l2CBhhyBOlmdgofYtF0RA/cZfXjmzDp6lyHRP7YJKIePdT02?= =?us-ascii?Q?kLqF+tf8eOifL6FHws/o7WOqKVhS8uDI1lfzqld9hyd+56sQa77XcpA/Zn/W?= =?us-ascii?Q?oULuvI6AJuzjqmRrRkGaoX6mLcDqfF930eYFM2IS2lPqGLmUYBijk4cLmgSr?= =?us-ascii?Q?8IzJzyPtMUew/HjbRtVc3QRDCpxs/gjDFI6qClIsZQP2l7m51yvf7v8naDAy?= =?us-ascii?Q?QKu7WwWZ6o3aMLmQbob2g5EK5hqRV7e3IZLv+wnlXIQOhTHMAQ3cB2vFxibl?= =?us-ascii?Q?GRehSLw/CBLrMGfdLYcPJCfjwQUL8cH+LzkkDSyM+iVmGHUrj3ryHlZYC560?= =?us-ascii?Q?ndOvXLk38ZOowuwcB6K7w5HiS/li2FuH+CbbqzCf0q+VWzuv107pGSvApBj0?= =?us-ascii?Q?y19NRp7ZnEwNdXAUdYWzcmHZ5Fho6Y+gxTnzBGLS26xjdE/QtwYiIC8DhXf9?= =?us-ascii?Q?8Hfhf9e6ZJzK7pwi1KYcwQy2ztXtqgm7nPgyJ4j7dXstYLcZVA4XHp/fpVg5?= =?us-ascii?Q?kfkMd+izom5iFg6N2giJeHZm5UqHhQu45rIOXjeBZ5qlhQpHbTrQJpHkzj3W?= =?us-ascii?Q?8+4E5ZL279pbZ/ZftekPtXO1VI+vFFnAAbsgNCWRUG7TZegEk0ir+eSE6pxZ?= =?us-ascii?Q?rqH+ycJG1Zeq0kAEaFpsvF6Ce/YhTvU8qFToFLdKUB2t93zwGgJwITkIEh2R?= =?us-ascii?Q?blN0I5G49dl47/z/OeEWhdUabTM4rz4heBtE7CCGqvSH0ldcRvGB0UsTjpDG?= =?us-ascii?Q?UjCA2d2f7lnKDU44yfE3/lwJJRnb99mLhW6byd8Yghn8COdD1sPhppCKh65i?= =?us-ascii?Q?KFYKNGitGZ9+jolAmCcDJjiDy5ik/ucyCNu1sOt73qllrEZ4mTowC/AEad7j?= =?us-ascii?Q?0TFXh59kXCaEWzm086qtIrOliKn943f5JWAV2EOWMP//9qu8Xryh3dUzhEN1?= =?us-ascii?Q?nqFzVsxDK8Vpg6D2HIqvlYIaK6ZA29xa5zChwULf4mdstcM0OEfHfiAuW5Kn?= =?us-ascii?Q?YddDbMguVaMO7amU1wnLkDBFCHa72MB8FGBjuCKydYwLAwq+T/25Im5IhSCk?= =?us-ascii?Q?45srVxqsvtBm2TJSpOlcQL3xy7gWXfBYO9kVr0ebIOYjkwuepw3OrtW67rZE?= =?us-ascii?Q?xjQa2CDlrOUaU8xhX5TbRi6WmI4lcw9WB2+DVWSD48g1yuRz0nrAm+ASkbf/?= =?us-ascii?Q?tLAsH2FrxdgM1hLZjY3nvv1SONNbnqIby5XO9IQLrrLAZvFK6vnhlyAvNFXn?= =?us-ascii?Q?jwl7KyEBqR/4ApG5RqaEYlFbXDpY1eI7ZSOMWwrcCrZ7fXeI2HU3Q5g1vwG5?= =?us-ascii?Q?HTeSL4sy5uKzUuHbIdoBhUhueVTj9cDrtTL1I6BPV0qUIHsIQfiDnN9DSfR1?= =?us-ascii?Q?0aZfUbyjA7JVBU7D4diuFE2kwaquks0xOk7T0muOofQQ8mori1eaPU1BpX5f?= =?us-ascii?Q?AGZbEZqP9M1LLxRuziBw4uWzlIj+EsCmabNWj2KTm11MnzMVFwDSMkdZiU3n?= =?us-ascii?Q?ZOQbR6QIbixM7f5EoqppHKV53JdZcpMyJFyCqS9z?= Content-Type: multipart/alternative; boundary="_000_CH3PR12MB86580F4B89C1E27EC8AFE973A127ACH3PR12MB8658namp_" MIME-Version: 1.0 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR12MB8658.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94c63736-2669-4ade-4242-08ddcff88a89 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jul 2025 06:07:33.9396 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: pw6UrZRhKu/7xO0Bp1D2QN7JFdXlxzv7n0C6n9MjsE1wJQT/2vzUwNR+WftaTPiJOBdUovEDkeUubWwpECBc9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6789 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 --_000_CH3PR12MB86580F4B89C1E27EC8AFE973A127ACH3PR12MB8658namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Richardson, Thanks for the feedback, will remove it. ________________________________ From: Richardson, Bruce Sent: Wednesday, July 30, 2025 11:03 PM To: Xueming Li Cc: Burakov, Anatoly ; dpdk stable Subject: RE: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placeme= nt' has been queued to stable release 23.11.5 I would hold off on this patch for backport, even though it's a fix. I worr= y that some users may be depending on the old behaviour, especially if they= have a single-queue setup. /Bruce > -----Original Message----- > From: Xueming Li > Sent: Wednesday, July 30, 2025 3:56 PM > To: Richardson, Bruce > Cc: Xueming Li ; Burakov, Anatoly > ; dpdk stable > Subject: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placement= ' has > been queued to stable release 23.11.5 > > 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 t= he > 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 reba= sing > (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=3D23.11-staging > > This queued commit can be viewed at: > https://git.dpdk.org/dpdk-stable/commit/?h=3D23.11- > staging&id=3D43fdac7411d9a6d408b2ce61a5c191886c6ff638 > > 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 placemen= t > 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 =3D BIT(ICE_L2TSEL_BIT_OFFSET); > > for (i =3D 0; i < dev_data->nb_rx_queues; i++) { > + const struct ice_rx_queue *rxq =3D dev_data->rx_queues[i]; > u32 qrx_context_offset; > u32 regval; > > - qrx_context_offset =3D > - QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, > i); > + qrx_context_offset =3D > QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, rxq->reg_idx); > > regval =3D rd32(hw, qrx_context_offset); > regval &=3D ~BIT(ICE_L2TSEL_BIT_OFFSET); > -- > 2.34.1 > > --- > Diff of the applied patch vs upstream commit (please double-check if no= n- > empty: > --- > --- - 2025-07-30 22:50:04.230786948 +0800 > +++ 0018-net-ice-fix-inconsistency-in-Rx-queue-VLAN-tag-place.patch 202= 5- > 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 =3D dev_data->rx_queues[i]; > ++ const struct ice_rx_queue *rxq =3D dev_data->rx_queues[i]; --_000_CH3PR12MB86580F4B89C1E27EC8AFE973A127ACH3PR12MB8658namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
Hi Richardson,

Thanks for the feedback, will remove it.
From: Richardson, Bruce <= ;bruce.richardson@intel.com>
Sent: Wednesday, July 30, 2025 11:03 PM
To: Xueming Li <xuemingl@nvidia.com>
Cc: Burakov, Anatoly <anatoly.burakov@intel.com>; dpdk stable = <stable@dpdk.org>
Subject: RE: patch 'net/ice: fix inconsistency in Rx queue VLAN tag = placement' has been queued to stable release 23.11.5
 
I would hold off on this patch for backport, even = though it's a fix. I worry that some users may be depending on the old beha= viour, especially if they have a single-queue setup.

/Bruce

> -----Original Message-----
> From: Xueming Li <xuemingl@nvidia.com>
> Sent: Wednesday, July 30, 2025 3:56 PM
> To: Richardson, Bruce <bruce.richardson@intel.com>
> Cc: Xueming Li <xuemingl@nvidia.com>; Burakov, Anatoly
> <anatoly.burakov@intel.com>; dpdk stable <stable@dpdk.org>=
> Subject: patch 'net/ice: fix inconsistency in Rx queue VLAN tag placem= ent' has
> been queued to stable release 23.11.5
>
> 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 v= s the
> patch applied to the branch. This will indicate if there was any rebas= ing
> needed to apply to the stable branch. If there were code changes for r= ebasing
> (ie: not only metadata diffs), please double check that the rebase was=
> correctly done.
>
> Queued patches are on a temporary branch at:
> ht= tps://git.dpdk.org/dpdk-stable/log/?h=3D23.11-staging
>
> This queued commit can be viewed at:
> https:= //git.dpdk.org/dpdk-stable/commit/?h=3D23.11-
> staging&id=3D43fdac7411d9a6d408b2ce61a5c191886c6ff638
>
> Thanks.
>
> Xueming Li <xuemingl@nvidia.com>
>
> ---
> From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00 2001=
> From: Bruce Richardson <bruce.richardson@intel.com>
> Date: Fri, 27 Jun 2025 14:52:01 +0100
> Subject: [PATCH] net/ice: fix inconsistency in Rx queue VLAN tag place= ment
> Cc: Xueming Li <xuemingl@nvidia.com>
>
> [ 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 th= e
> descriptors of the final Rx queue (irrespective of the number of queue= s)
> vs descriptors of all other queues. This inconsistency was due to the<= br> > 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 <bruce.richardson@intel.com>
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
> ---
>  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_v= si *vsi,
> enum ice_l2tsel l2tsel)
>            = ;    l2tsel_bit =3D BIT(ICE_L2TSEL_BIT_OFFSET);
>
>        for (i =3D 0; i < dev_dat= a->nb_rx_queues; i++) {
> +           &nb= sp; const struct ice_rx_queue *rxq =3D dev_data->rx_queues[i];
>            = ;    u32 qrx_context_offset;
>            = ;    u32 regval;
>
> -           &nb= sp; qrx_context_offset =3D
> -           &nb= sp;         QRX_CONTEXT(ICE_L2TSEL_= QRX_CONTEXT_REG_IDX,
> i);
> +           &nb= sp; qrx_context_offset =3D
> QRX_CONTEXT(ICE_L2TSEL_QRX_CONTEXT_REG_IDX, rxq->reg_idx);
>
>            = ;    regval =3D rd32(hw, qrx_context_offset);
>            = ;    regval &=3D ~BIT(ICE_L2TSEL_BIT_OFFSET);
> --
> 2.34.1
>
> ---
>   Diff of the applied patch vs upstream commit (please doubl= e-check if non-
> empty:
> ---
> --- - 2025-07-30 22:50:04.230786948 +0800
> +++ 0018-net-ice-fix-inconsistency-in-Rx-queue-VLAN-tag-place.patch&nb= sp;  2025-
> 07-30 22:50:03.048759617 +0800
> @@ -1 +1 @@
> -From 4cd8c72f661c005900ddc39cf0cecfca16184f2a Mon Sep 17 00:00:00 200= 1
> +From 43fdac7411d9a6d408b2ce61a5c191886c6ff638 Mon Sep 17 00:00:00
> 2001
> @@ -4,0 +5,3 @@
> +Cc: Xueming Li <xuemingl@nvidia.com>
> +
> +[ 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_ethde= v.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 @@
> -+            c= onst struct ci_rx_queue *rxq =3D dev_data->rx_queues[i];
> ++            c= onst struct ice_rx_queue *rxq =3D dev_data->rx_queues[i];
--_000_CH3PR12MB86580F4B89C1E27EC8AFE973A127ACH3PR12MB8658namp_--