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 EF75646C5C for ; Thu, 31 Jul 2025 08:05:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E9EC04025A; Thu, 31 Jul 2025 08:05:01 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2055.outbound.protection.outlook.com [40.107.237.55]) by mails.dpdk.org (Postfix) with ESMTP id A8F3B4026A for ; Thu, 31 Jul 2025 08:05:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Bup9u7Fza+ug3Ux3/XbRVKSedcX6Icemjz59WPhf7qeGq4O0wKw4UaJDlNQm3bzvHGk63s8YzxXIf4TRMtD3MRPkOyKHn3IXkQcKp4mfzht+9rgX45kyX0ETg0L30hXYeTTsQtrcKSRkrD7Y+hew9gw1rPATiXuiTgO5sXj3j0Yeytb7vmz3yrJ6MkcE9issQTNwCp2BfAczptCaqaO/CySbcC/F2wwyddEuEcvkYwWNh99rAu5cxnlkHTnAbsJC4RVpY0XFPc83YIcKmkmv3ntEXxIgrmUHKKMn6TJ7TLweuSPpoQQLF3jXUdZibcynv2U9NsrDOdvczmWvo5ddkQ== 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=eZN8XP/O1LYemqHj3AkluNeIcxR4fUTQKwa22UdjwhA=; b=wS+TDL25shjbK4daaJbaOiO65nxBf2+hYWot/g7CwH8cKKwTQPnUdcxdj5r6EvXji7aD9oRCOoC1LHL4VNhbrrFaCY8Ln6CSJS/YFX8iUCMMVH1IRj4o7/bT1Hu56pBOd4ZGntpdID0XpDEYfsq3EP8TFPU2e++zyNoWxe1A8AjHBnKW+56+McWg2vpqEfB2VFUk7GVb332ccIoKJ3OYHyXk2BRcVNuFm7L1q3IuVTDCE12SxkxD2g7GxjINQ44jaIaK02X5J+SuAEGVQ8/TR49RhNGKFsrPYXWgWqsbReatZQWaCKEoNq2QvXJZb3pROCjaFXgr9bcDy/nWetiY9Q== 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=eZN8XP/O1LYemqHj3AkluNeIcxR4fUTQKwa22UdjwhA=; b=LDNjiEd1ybDAJgTG1uO+L0IwId+xp3jf++ZMzvVWhXvEFDiWjAVp9GyG1CPemjLKW79ZK8bVdCB+DklzFN4+mAPXPrQh5buyuh+yn0BuCKAQO6YHsb2vXVq67tPBGvHSIVJspvTT+Iohzkag0Wa0Serl4CWMA0mF/NR21g7TFaSQArb/oL1/iQW7nEOVdusRSJLSeQSL4EHGhB1bPDhViYEY1rUFvyP3qMTLroiA6VIe9sDIw9fqGUT0t8a7fl2AnezdG7c3faSvcG3hC91sTD3r3j68+wnVR+OxdCh9YwC+NTA5+M3yeAvimbbBbnGcV6V1DOwqSRec1vF6qQ9BJA== Received: from CH3PR12MB8658.namprd12.prod.outlook.com (2603:10b6:610:175::8) by DS0PR12MB8017.namprd12.prod.outlook.com (2603:10b6:8:146::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Thu, 31 Jul 2025 06:04:57 +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:04:57 +0000 From: Xueming Li To: Amiya Ranjan Mohakud CC: Ciara Loftus , dpdk stable Subject: Re: patch 'net/iavf: fix VLAN strip setting after enabling filter' has been queued to stable release 23.11.5 Thread-Topic: patch 'net/iavf: fix VLAN strip setting after enabling filter' has been queued to stable release 23.11.5 Thread-Index: AQHcAWKrVKiQWn4sX0iqDs6GzUTV77RKyR4AgAD18yM= Date: Thu, 31 Jul 2025 06:04:57 +0000 Message-ID: References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730145633.245984-1-xuemingl@nvidia.com> <20250730145633.245984-11-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_|DS0PR12MB8017:EE_ x-ms-office365-filtering-correlation-id: b7e78053-f686-4612-1c30-08ddcff82d04 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|376014|1800799024|366016|13003099007|8096899003|7053199007|38070700018; x-microsoft-antispam-message-info: =?us-ascii?Q?hLcq0iFuNcEazJsZYpvBSxFUqwvTsJpcQnECRJduAdtjP+GL5l8BMCmpIOVf?= =?us-ascii?Q?hbpQ4qaXDiT/RiS0AjLTCfi5nFrBLedvdeM6uDZv2y2euhRdUHsVhIUeDme+?= =?us-ascii?Q?Ozspxsc4/y9cc6mNVCpJaa/dTNUmOhs8/k8nzhaA5GeZ5aodPJ9PlIpLKeNk?= =?us-ascii?Q?1gBKOSLuq3doB8qb72vdJhl6Q4TqUDPowfsDTQESgOLwOgynLsss4ijBZ+si?= =?us-ascii?Q?XxDQ4sCHceB8OxZiXEGLEEQ8+d5I1PKHkuYEWZKT7QwUvxCvZqBqoe6u98xq?= =?us-ascii?Q?qYSRO1ndA1ELrYnnFsk1QdV0+27B5IJA36qMly22pFJi0bgY69HlihMk0075?= =?us-ascii?Q?ANmbYulfZU/du5F4RSlFsK8ER5TyDTyS4oW1pemiceuLHmZVajHORHLhXWcd?= =?us-ascii?Q?HFLASz3ge/woW7CV4aBFXebEMIbPdSYatuv3ZywjWz4g3zU3YuQ/YT+rElqU?= =?us-ascii?Q?UujUYSRNH3VbS4zWYhqrg7zdDjFE3kBFoxLyQgNkPkqWv1xZNR8gWCk7MQ5d?= =?us-ascii?Q?aaQyAkITH83clPzSylxDJ5oks2GAISqdXXPitOrELOvWHoKdf4pxcwdDtpBS?= =?us-ascii?Q?zQTxpHd9pUORmWnqBziOjEP4fFII9UDO0n8BuQHXZl5VMg9XgQpy2yOLbGBn?= =?us-ascii?Q?kVBhtAOhbnAsFlrnDT4UnnSBrlIM3AOdQqfxVbpdpNMtnx2S/qfahdAenEZ3?= =?us-ascii?Q?yzVRzMl8/96g33jMS3aIC+1gWqys7DAyQsfNvwistNZTqjgvFsLp1X2tqigI?= =?us-ascii?Q?dOKn2TVNhR5TI6BAAOnnfDRZcmn8kW5kw8nNo6agPbcAvm1aNmoM+zggRUfL?= =?us-ascii?Q?WeTUwwjQb6dQi9HSad496wkhCmBcVvdgQREltXhbr4PG1PYRQQpmPNjTvyc9?= =?us-ascii?Q?md+ZpZnw2CfGghoqDxQAvVFIcxblJqGJJNt3xNpLpmsB6Weli6shRM6ev+QL?= =?us-ascii?Q?QvVwI7RMyPXMfdvnu2V+Fc24TWSXYULzsjxIVN+UKAtcTdZZRwXOIIPicbRD?= =?us-ascii?Q?Z0eyls1MO0DvnML7WfF53pHHjSjNiZo0LXI5v/0PbhI/McxFmNRH78C9hvRp?= =?us-ascii?Q?LvxMdXB4hGAEKw5PlnncWEaV2sV+c5md9BNxfjiqpR5BWQxX0p8LXDeXiYFw?= =?us-ascii?Q?3rzBWa4bgsvX1i04T5hLQsJeACghsptJwuT7XtXokWMy+vGPejCxrC4+JSFN?= =?us-ascii?Q?ZzCHnbiMvFzyh9lE6BNTUHLKk3mB/YoroLe/1ncJy6xETbYRvY93sLsreA3k?= =?us-ascii?Q?XwLYTzk7YasuiSuWCtTEQlJIYGQeeAnZI1ya6xBlgfyIwmY3OLKOx+13+8RE?= =?us-ascii?Q?mx//OEcnPUeX3FjFaKy89hjc2eZU1wd5p+T/MalRsW9iHqBuQTC0ITAwFhsc?= =?us-ascii?Q?+51CwvYwOeVUYK5H0NPk84jGiBoW5J05HAogglZzVXAYqssWF539q/bQqnGD?= =?us-ascii?Q?tGWFpfpi+oT75fzhQ6JzZxOhIibv65Q5yQybcL2mrZOtBGd9F/T75VMXDiia?= =?us-ascii?Q?ZO2Kq10EsNsxZQM=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)(376014)(1800799024)(366016)(13003099007)(8096899003)(7053199007)(38070700018); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?3SB9o8+psAYXdafkIEV5pXAYwnH96zlKNTNuhyT7d2ALHtr8RNkFkwaXKUpM?= =?us-ascii?Q?waAqiIByMxC9I+J2FkFWZy09pBGziqZPrxMIUGovYKrzbBG4TG479i/CBSUd?= =?us-ascii?Q?A98EwlMbdkxTqszHfrNqA9K63iSzo/i9D7osf8Ub6BV+Q5qlg+keYb13d9U2?= =?us-ascii?Q?GGWY2XrL36ni/NKRJeLveCUWP0npGyODlWVSqo4AsfZ/WuSR2Lkw+hpOpLmA?= =?us-ascii?Q?+u9YCI8OMB3VfzDv3kPtqQlRotzpKX0lsnrmyCxdjCn+SGC3RHWFMFPDQCt+?= =?us-ascii?Q?LmYIkftQ79EqqIgce2JL4Rne2yN0STjhhd+rT+Fo3g2L7sPS/kEbyKuKhwoc?= =?us-ascii?Q?mexSAxjoMCo1PKzWimEl6SZJxXGt5nJgAsYlrQSxmdfN3h5INPvobeBcWV2P?= =?us-ascii?Q?aJsHLYIVe6ZHC8wV+kI5hFsB0aH8oIgxPNxbNo2uw4tY3FqTNmAElrXPtbIu?= =?us-ascii?Q?bEtl143iU2GSveIdHpN0Od2rMItgVbN7bDhxX2u8788v9zLY/eEsfxGd1M5y?= =?us-ascii?Q?rcjqJ/F6I3VkmLtg9JMBewoSiSudFEzL4m1wVIT/PaH17xZybLwthtbwcLhI?= =?us-ascii?Q?LLxx5qzcP3979L6ss4U3D3b3prMJFolxDGQy3nFFTOejTRnV2iilmG2f9zSy?= =?us-ascii?Q?zkWTW70XHepDUlKFxT0uw80Uj1SVMoCvX1xswOS0XcnOvA8t33ZDSPtkOOmc?= =?us-ascii?Q?xL3t+mGGWPHkbS5rfmiE3+MtGCb/nPzeLrYCamY5Cn9MqIZeWOtG+3CRImL2?= =?us-ascii?Q?BT1sKgLqJ1iPzf1DnggtK3RZIy06ifW4gRNo2QkfGOgZymHV+aRC0SSRnTLK?= =?us-ascii?Q?Gf0gkJchI/Oajzhq2PoFHQ4Hygnm0uk6VkMPgGBnsKhQIl4+3lI1GvCqvr+E?= =?us-ascii?Q?KAHvOMbVrwf3KhsWJwsk3iZvA7VDDyeM0IxgZ5yf9TRUTMau8A+ZD11n/pgD?= =?us-ascii?Q?K6oM3tp3mr9pkltkETZD5Avv3CpcUTZWaYiDE6p1xKIln3nB2mUQaP3F090h?= =?us-ascii?Q?uswk27cr7sqJcYfad2tDxlibiDPggKFhVTZifMltzWToiEVDtZRuZ+nYzKmp?= =?us-ascii?Q?2U9HTJD89qBpihMt+QcT8oO9PiGoKyGAeawBE68TUF8dXZcPtcd8/3dl914a?= =?us-ascii?Q?KvtP0s1772mluA0HTY9oIprZNNKHGAfY76E2tBiMZMsU3NxRzTUkZQVZUanc?= =?us-ascii?Q?TZgmnTztgvBtZaSSQGmYBA/ChLAcbPZuHNOClAQ4MVfLaAkUpezWzd2u4MBA?= =?us-ascii?Q?dx9zraQeZ242c7+3uCjoAsPo58S+1ypnzP+1T1lU9ifSlCLExEcypJhBTmlx?= =?us-ascii?Q?qH1BSBAA4LWVN94dPzE1axJjPAWSpvVEiKrvVBx15fSreiWbhkZYsFT4vHkV?= =?us-ascii?Q?zEhQnTuV9MhH+urU6KeRItojzuMFwf11TV5Yy/9eUUw+LV8eSVXljWxgZ07p?= =?us-ascii?Q?4lG/ioNazSPkf6fUtIQOPvoGIW84dY/F+C7j06CLcGXkyecFpKcdXKihzKll?= =?us-ascii?Q?iSubOkM9eWfe8AdA7iBT987i9+ubLPnYvCQlqZGeb5abEHrzeNztTuQukc1X?= =?us-ascii?Q?GWXNP2NBMHqHWnKaTHmFstoExlkYQCCFBBROkepx?= Content-Type: multipart/alternative; boundary="_000_CH3PR12MB8658939D26F381F898E8E2FAA127ACH3PR12MB8658namp_" 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: b7e78053-f686-4612-1c30-08ddcff82d04 X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jul 2025 06:04:57.0446 (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: KvGUVOHKYnYav+Vwd3FrHJOTR2AEtsOiGJBzU1OgtKRJB5TVM/DP3dn2tPhiGAKgoZGx66DIhi2xTZjc7EWZgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8017 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_CH3PR12MB8658939D26F381F898E8E2FAA127ACH3PR12MB8658namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Yes, it should be as long as the patch has "Cc: stable@dpdk.org" ________________________________ From: Amiya Ranjan Mohakud Sent: Wednesday, July 30, 2025 11:23 PM To: Xueming Li Cc: Ciara Loftus ; dpdk stable Subject: Re: patch 'net/iavf: fix VLAN strip setting after enabling filter'= has been queued to stable release 23.11.5 Thanks Xueming for taking care of this. Does it mean it will automatically go to other stable branches also, like 2= 2.11.x ? Thanks Amiya On Wed, 30 Jul 2025 at 20:30, Xueming Li > wrote: 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 rebasi= ng (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=3Df2c11a141c4= 6c6a9d461493b70490940d8147680 Thanks. Xueming Li > --- >From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001 From: Amiya Ranjan Mohakud > Date: Mon, 23 Jun 2025 23:41:36 +0530 Subject: [PATCH] net/iavf: fix VLAN strip setting after enabling filter Cc: Xueming Li > [ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ] For i40e kernel drivers which support either vlan(v1) or vlan(v2) VIRTCHNL OP, it will set strip on when setting filter on. But DPDK side will not change strip flag. To be consistent with DPDL side, explicitly disable strip again. Bugzilla ID: 1725 Fixes: e25c7ed114b2 ("net/iavf: fix VLAN offload strip flag") Cc: stable@dpdk.org Signed-off-by: Amiya Ranjan Mohakud > Reviewed-by: Ciara Loftus > --- .mailmap | 1 + drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/.mailmap b/.mailmap index e17823a260..80c6f855dc 100644 --- a/.mailmap +++ b/.mailmap @@ -84,6 +84,7 @@ Amir Avivi > Amit Bernstein > Amit Gupta > Amit Prakash Shukla > +Amiya Ranjan Mohakud > Amr Mokhtar > Amruta Zende > Amrutha Sampath > diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.= c index 4472fd2c2d..391ba2c812 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint= 32_t index) vf->mac_num--; } +static int +iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) +{ + /* For i40e kernel drivers which supports both vlan(v1 & v2) VIRTCH= NL OP, + * it will set strip on when setting filter on but dpdk side will n= ot + * change strip flag. To be consistent with dpdk side, explicitly d= isable + * strip again. + * + */ + struct iavf_adapter *adapter =3D + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct rte_eth_conf *dev_conf =3D &dev->data->dev_conf; + int err; + + if (adapter->hw.mac.type =3D=3D IAVF_MAC_XL710 || + adapter->hw.mac.type =3D=3D IAVF_MAC_VF || + adapter->hw.mac.type =3D=3D IAVF_MAC_X722_VF) { + if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_= VLAN_STRIP)) { + err =3D iavf_disable_vlan_strip(adapter); + if (err) + return -EIO; + } + } + return 0; +} + static int iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on= ) { struct iavf_adapter *adapter =3D IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf =3D IAVF_DEV_PRIVATE_TO_VF(adapter); - struct rte_eth_conf *dev_conf =3D &dev->data->dev_conf; int err; if (adapter->closed) @@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uin= t16_t vlan_id, int on) err =3D iavf_add_del_vlan_v2(adapter, vlan_id, on); if (err) return -EIO; - return 0; + + return iavf_disable_vlan_strip_ex(dev, on); } if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN)) @@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on) if (err) return -EIO; - /* For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP, - * it will set strip on when setting filter on but dpdk side will n= ot - * change strip flag. To be consistent with dpdk side, disable stri= p - * again. - * - * For i40e kernel driver which supports vlan v2, dpdk will invoke = vlan v2 - * related function, so it won't go through here. - */ - if (adapter->hw.mac.type =3D=3D IAVF_MAC_XL710 || - adapter->hw.mac.type =3D=3D IAVF_MAC_X722_VF) { - if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_= VLAN_STRIP)) { - err =3D iavf_disable_vlan_strip(adapter); - if (err) - return -EIO; - } - } - return 0; + return iavf_disable_vlan_strip_ex(dev, on); } static void -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- - 2025-07-30 22:50:03.776876738 +0800 +++ 0010-net-iavf-fix-VLAN-strip-setting-after-enabling-filte.patch 202= 5-07-30 22:50:03.000752668 +0800 @@ -1 +1 @@ -From 3bfad066f9b4764981c9ad90a750fa6f1afcf15a Mon Sep 17 00:00:00 2001 +From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li > + +[ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ] @@ -18,2 +21,2 @@ - .mailmap | 1 + - drivers/net/intel/iavf/iavf_ethdev.c | 48 +++++++++++++++++----------- + .mailmap | 1 + + drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------- @@ -23 +26 @@ -index c6d72058bb..1b238970fb 100644 +index e17823a260..80c6f855dc 100644 @@ -26 +29 @@ -@@ -88,6 +88,7 @@ Amir Avivi > +@@ -84,6 +84,7 @@ Amir Avivi > @@ -34,5 +37,5 @@ -diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf= /iavf_ethdev.c -index 02649c19b2..c33fdd9069 100644 ---- a/drivers/net/intel/iavf/iavf_ethdev.c -+++ b/drivers/net/intel/iavf/iavf_ethdev.c -@@ -1377,13 +1377,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uin= t32_t index) +diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev= .c +index 4472fd2c2d..391ba2c812 100644 +--- a/drivers/net/iavf/iavf_ethdev.c ++++ b/drivers/net/iavf/iavf_ethdev.c +@@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uin= t32_t index) @@ -78 +81 @@ -@@ -1393,7 +1418,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on) +@@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on) @@ -88 +91 @@ -@@ -1403,23 +1429,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, u= int16_t vlan_id, int on) +@@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, u= int16_t vlan_id, int on) --_000_CH3PR12MB8658939D26F381F898E8E2FAA127ACH3PR12MB8658namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable
Yes, it should be as long as the patch has "Cc: stable@dpdk.org"<= /div>
From: Amiya Ranjan Mohakud = <amiyaranjan.mohakud@gmail.com>
Sent: Wednesday, July 30, 2025 11:23 PM
To: Xueming Li <xuemingl@nvidia.com>
Cc: Ciara Loftus <ciara.loftus@intel.com>; dpdk stable <sta= ble@dpdk.org>
Subject: Re: patch 'net/iavf: fix VLAN strip setting after enabling = filter' has been queued to stable release 23.11.5
 
Thanks Xueming for taking care of this.

Does it mean it will automatically go to other stable branches also, like 2= 2.11.x ?

Thanks
Amiya


On Wed, 30 Jul 2025 at 20:30, Xuemi= ng Li <xuemingl@nvidia.com>= ; wrote:
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 rebasi= ng
(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= =3Df2c11a141c46c6a9d461493b70490940d8147680

Thanks.

Xueming Li <xue= mingl@nvidia.com>

---
>From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001
From: Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>
Date: Mon, 23 Jun 2025 23:41:36 +0530
Subject: [PATCH] net/iavf: fix VLAN strip setting after enabling filter
Cc: Xueming Li <xuemingl@nvidia.com>

[ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ]

For i40e kernel drivers which support either vlan(v1) or vlan(v2)
VIRTCHNL OP, it will set strip on when setting filter on.
But DPDK side will not change strip flag.
To be consistent with DPDL side, explicitly disable strip again.

Bugzilla ID: 1725
Fixes: e25c7ed114b2 ("net/iavf: fix VLAN offload strip flag")
Cc: stable@dpdk.org

Signed-off-by: Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>
Reviewed-by: Ciara Loftus <ciara.loftus@intel.com>
---
 .mailmap                 = ;      |  1 +
 drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------= -
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/.mailmap b/.mailmap
index e17823a260..80c6f855dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -84,6 +84,7 @@ Amir Avivi <amir.avivi@intel.com>
 Amit Bernstein <amitbern@amazon.com>
 Amit Gupta <agupta3@marvell.com>
 Amit Prakash Shukla <amitprakashs@marvell.com>
+Amiya Ranjan Mohakud <amiyaranjan.mohakud@gmail.com>
 Amr Mokhtar <amr.mokhtar@intel.com>
 Amruta Zende <amruta.zende@intel.com>
 Amrutha Sampath <amrutha.sampath@intel.com>
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.= c
index 4472fd2c2d..391ba2c812 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uint= 32_t index)
        vf->mac_num--;
 }

+static int
+iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)
+{
+       /* For i40e kernel drivers which supports both = vlan(v1 & v2) VIRTCHNL OP,
+        * it will set strip on when setting filter on = but dpdk side will not
+        * change strip flag. To be consistent with dpd= k side, explicitly disable
+        * strip again.
+        *
+        */
+       struct iavf_adapter *adapter =3D
+               IAVF_DEV_PRIVATE_TO= _ADAPTER(dev->data->dev_private);
+       struct rte_eth_conf *dev_conf =3D &dev->= data->dev_conf;
+       int err;
+
+       if (adapter->hw.mac.type =3D=3D IAVF_MAC_XL7= 10 ||
+           adapter->hw.mac.type =3D=3D IA= VF_MAC_VF ||
+           adapter->hw.mac.type =3D=3D IA= VF_MAC_X722_VF) {
+               if (on && != (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
+                    &nbs= p;  err =3D iavf_disable_vlan_strip(adapter);
+                    &nbs= p;  if (err)
+                    &nbs= p;          return -EIO;
+               }
+       }
+       return 0;
+}
+
 static int
 iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, i= nt on)
 {
        struct iavf_adapter *adapter =3D
                IAVF_DEV_PRIVATE_TO= _ADAPTER(dev->data->dev_private);
        struct iavf_info *vf =3D IAVF_DEV_PRIVATE_TO_VF= (adapter);
-       struct rte_eth_conf *dev_conf =3D &dev->= data->dev_conf;
        int err;

        if (adapter->closed)
@@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uin= t16_t vlan_id, int on)
                err =3D iavf_add_de= l_vlan_v2(adapter, vlan_id, on);
                if (err)
                     = ;   return -EIO;
-               return 0;
+
+               return iavf_disable= _vlan_strip_ex(dev, on);
        }

        if (!(vf->vf_res->vf_cap_flags & VIRT= CHNL_VF_OFFLOAD_VLAN))
@@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on)
        if (err)
                return -EIO;

-       /* For i40e kernel driver which only supports v= lan(v1) VIRTCHNL OP,
-        * it will set strip on when setting filter on = but dpdk side will not
-        * change strip flag. To be consistent with dpd= k side, disable strip
-        * again.
-        *
-        * For i40e kernel driver which supports vlan v= 2, dpdk will invoke vlan v2
-        * related function, so it won't go through her= e.
-        */
-       if (adapter->hw.mac.type =3D=3D IAVF_MAC_XL7= 10 ||
-           adapter->hw.mac.type =3D=3D IA= VF_MAC_X722_VF) {
-               if (on && != (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) {
-                    &nbs= p;  err =3D iavf_disable_vlan_strip(adapter);
-                    &nbs= p;  if (err)
-                    &nbs= p;          return -EIO;
-               }
-       }
-       return 0;
+       return iavf_disable_vlan_strip_ex(dev, on);
 }

 static void
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if= non-empty:
---
--- -   2025-07-30 22:50:03.776876738 +0800
+++ 0010-net-iavf-fix-VLAN-strip-setting-after-enabling-filte.patch  &= nbsp;  2025-07-30 22:50:03.000752668 +0800
@@ -1 +1 @@
-From 3bfad066f9b4764981c9ad90a750fa6f1afcf15a Mon Sep 17 00:00:00 2001
+From f2c11a141c46c6a9d461493b70490940d8147680 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 3bfad066f9b4764981c9ad90a750fa6f1afcf15a ]
@@ -18,2 +21,2 @@
- .mailmap                  &n= bsp;          |  1 +
- drivers/net/intel/iavf/iavf_ethdev.c | 48 +++++++++++++++++----------- + .mailmap                  &n= bsp;    |  1 +
+ drivers/net/iavf/iavf_ethdev.c | 48 ++++++++++++++++++++-------------- @@ -23 +26 @@
-index c6d72058bb..1b238970fb 100644
+index e17823a260..80c6f855dc 100644
@@ -26 +29 @@
-@@ -88,6 +88,7 @@ Amir Avivi <amir.avivi@intel.com>
+@@ -84,6 +84,7 @@ Amir Avivi <amir.avivi@intel.com>
@@ -34,5 +37,5 @@
-diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf= /iavf_ethdev.c
-index 02649c19b2..c33fdd9069 100644
---- a/drivers/net/intel/iavf/iavf_ethdev.c
-+++ b/drivers/net/intel/iavf/iavf_ethdev.c
-@@ -1377,13 +1377,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uin= t32_t index)
+diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev= .c
+index 4472fd2c2d..391ba2c812 100644
+--- a/drivers/net/iavf/iavf_ethdev.c
++++ b/drivers/net/iavf/iavf_ethdev.c
+@@ -1364,13 +1364,38 @@ iavf_dev_del_mac_addr(struct rte_eth_dev *dev, uin= t32_t index)
@@ -78 +81 @@
-@@ -1393,7 +1418,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on)
+@@ -1380,7 +1405,8 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, ui= nt16_t vlan_id, int on)
@@ -88 +91 @@
-@@ -1403,23 +1429,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, u= int16_t vlan_id, int on)
+@@ -1390,23 +1416,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, u= int16_t vlan_id, int on)
--_000_CH3PR12MB8658939D26F381F898E8E2FAA127ACH3PR12MB8658namp_--