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 2CAB446BAE for ; Fri, 18 Jul 2025 21:38:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 289EE40E7C; Fri, 18 Jul 2025 21:38:12 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 2DCE040E78 for ; Fri, 18 Jul 2025 21:38:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3w3+Hax2IlM/Bl+jUxUAivLEXvL4q+/LtXusRIu6Aa4=; b=HlA2fvUhogxNnlX13bd1PuoE7lwJLYMVPQlKKWxIGZDYQkvFYvZnO3/jIiHaGySP6Oi0DO PX07n7IkXwdcUTwRWEgH9A94rQd6ZCRm+HOjUmltSN0cxuO1s/S9DnzxvTicSOWndvWNJ4 jR41K/FEsLvyeE0xy5NQKNqrFgYL91A= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-376-bA3AMn6pMmmIt36lqlg89A-1; Fri, 18 Jul 2025 15:38:09 -0400 X-MC-Unique: bA3AMn6pMmmIt36lqlg89A-1 X-Mimecast-MFC-AGG-ID: bA3AMn6pMmmIt36lqlg89A_1752867488 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 330E319560AE; Fri, 18 Jul 2025 19:38:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9E73818003FC; Fri, 18 Jul 2025 19:38:06 +0000 (UTC) From: Kevin Traynor To: Amiya Ranjan Mohakud Cc: Ciara Loftus , dpdk stable Subject: patch 'net/iavf: fix VLAN strip disabling for ADQ v2 capability' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:26 +0100 Message-ID: <20250718193247.1008129-152-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 7yerjzL_vBPFvn6KfVUtqWaZ7iBOut-OC-wusRBgyBA_1752867488 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/e8b84cfc5a78ac13072121a772e6c114e47af0b5 Thanks. Kevin --- >From e8b84cfc5a78ac13072121a772e6c114e47af0b5 Mon Sep 17 00:00:00 2001 From: Amiya Ranjan Mohakud Date: Thu, 3 Jul 2025 15:50:46 +0530 Subject: [PATCH] net/iavf: fix VLAN strip disabling for ADQ v2 capability [ upstream commit 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 ] Ensure the correct virtchnl op is called for disabling vlan stripping by checking if the device supports either v1 or v2 vlan capability and choosing the op accordingly. Bugzilla ID: 1735 Fixes: 3bfad066f9b4 ("net/iavf: fix VLAN strip setting after enabling filter") Signed-off-by: Amiya Ranjan Mohakud Acked-by: Ciara Loftus --- drivers/net/iavf/iavf_ethdev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 3dfccb9969..8dd1f4b103 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1388,4 +1388,5 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); struct rte_eth_conf *dev_conf = &dev->data->dev_conf; int err; @@ -1395,5 +1396,8 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) adapter->hw.mac.type == IAVF_MAC_X722_VF) { if (on && !(dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)) { - err = iavf_disable_vlan_strip(adapter); + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN_V2) + err = iavf_config_vlan_strip_v2(adapter, false); + else + err = iavf_disable_vlan_strip(adapter); if (err) return -EIO; -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.315479677 +0100 +++ 0152-net-iavf-fix-VLAN-strip-disabling-for-ADQ-v2-capabil.patch 2025-07-18 20:29:11.135907959 +0100 @@ -1 +1 @@ -From 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 Mon Sep 17 00:00:00 2001 +From e8b84cfc5a78ac13072121a772e6c114e47af0b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17 +18 @@ - drivers/net/intel/iavf/iavf_ethdev.c | 6 +++++- + drivers/net/iavf/iavf_ethdev.c | 6 +++++- @@ -20,5 +21,5 @@ -diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c -index c33fdd9069..335a8126c4 100644 ---- a/drivers/net/intel/iavf/iavf_ethdev.c -+++ b/drivers/net/intel/iavf/iavf_ethdev.c -@@ -1389,4 +1389,5 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) +diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c +index 3dfccb9969..8dd1f4b103 100644 +--- a/drivers/net/iavf/iavf_ethdev.c ++++ b/drivers/net/iavf/iavf_ethdev.c +@@ -1388,4 +1388,5 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) @@ -30 +31 @@ -@@ -1396,5 +1397,8 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) +@@ -1395,5 +1396,8 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)