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 167FD46B72 for ; Mon, 14 Jul 2025 17:12:49 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11B1D40616; Mon, 14 Jul 2025 17:12:49 +0200 (CEST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 39DC040608 for ; Mon, 14 Jul 2025 17:12:48 +0200 (CEST) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-45348bff79fso52462215e9.2 for ; Mon, 14 Jul 2025 08:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752505968; x=1753110768; 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=HzjsJfcfz5CR5N6hNnLmnywg303kABJWyc7peveoLNQ=; b=hC/Csgq+JBMpMBi9ly5zJPm5OlWpxXT45pfp/vm+mEuG8Lj+WEcyMM3AEpXCAMhTVc HMTWLqwuf+ASC+KK5Js6vSUUXu9zt1Vc+xJIV+W8z2vvw/qI3FzKlSwJLjwUIRLEKgOg hySRCUBS1tQewkJKom+XSbSiDwiEgOJS2VpKc7Gh8rTq02SncU+e0k6+bRS+QK7MC4SU bHZdSyNfcqWxSjSl8eIJe+plZ0Yo3kQzBlEsTn095cl+Su5UxRojpY9Y/eHUdSSCobmi As58haGT/aJ71yw0H/47vco8uljDL4ulB9pyd6hk8zyD1LkWFFimW1iMAVKaCL0Ic2d0 r0ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752505968; x=1753110768; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HzjsJfcfz5CR5N6hNnLmnywg303kABJWyc7peveoLNQ=; b=U1pJmGGkb1cbvVqku3DPydaJUKhGNvXm1ewr2mdCNgRxdYxh3gXsM8K8sG4ZyEDQHo geuVAq9YOzU7JdGEukSnOh9u55yPqj7tTgMNKf5GaNnvX/JselIksvC9c6fNmCXBKGab 9tPeAsqXs6uubpPWnsBj6FgmYjXgDXZXYF0AeOWwiO5eWc4rJ3gNSZe2PwArD77fdnlE 4YNP5fPn2xFNLXbD3ssq7sjvDRWXLfow4iVF2nrHNRUx+XY2UNESs0NSB/rU/T2xDZPd qK3tJYY0hEQkjNPpilYz6/t1IwWEGAp7K4NwG/+hsDiinOH+ZXVIDa2MP/OpF64TbG2v gX8A== X-Forwarded-Encrypted: i=1; AJvYcCUHWsf141pZzJaJDjtJB6PWbVm2sf+JOcsE3vSCQnganFphkdaPlRqmTbA1eZolsnxkIIgZbbs=@dpdk.org X-Gm-Message-State: AOJu0YzntAH86FIhmSmRNeasplAar85mDVSLWix3VqfP8ETlsFhld3z5 vLzQHKgHqueTiewuJyTORAKB+YAf8YQhkO0oGVd3VHkTH5/DgBY/2aQS X-Gm-Gg: ASbGncvFN6EfB/24CGYQ75F+xyVeEbo3xrRy1h8NoERyZ+odg5M6ryXEMCorrHONXWq ehEniMLt/lBwaeo/A7asFH5v8niJQvIRSD4TMBSi9xcemdnkL4ztznn8CuyrwIvGKqUNp56TmJy W0mX3UeHe3BeMT4wGI75aQtpKdpVM/CBO2eeI8OYH/3pLQiCXjG39uqIWCOMF9sbk1XBgSN1JcP Frmwf0haVcaqZu4aLIzpiJJAiqE0PWYdhY+K8ZEexgAPgebF+ovpKGp8Hk771IytjDv6HYZ/wQ0 UHpIQHOrYtQqUrgI9rLH1CpvswbBg6mdW0jw06KRMdDZJKl0IUPiyfQNkSN2oSGvSsNuZKhJ1Z9 117yvEOTEruTrPxagwCGWncva4Cj8 X-Google-Smtp-Source: AGHT+IGAQnqF0RiLGc+j04azmL3/wjt+0dZAnsKm6M2/VDpNfXfdKj1L+vmf/QxggF2zeuJUyDu6yw== X-Received: by 2002:a05:600c:4693:b0:453:6b3a:6c06 with SMTP id 5b1f17b1804b1-454f427c32amr114705685e9.29.1752505967636; Mon, 14 Jul 2025 08:12:47 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:a923:75e5:f97f:ef33]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4560db56529sm71442965e9.26.2025.07.14.08.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Jul 2025 08:12:47 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.9 Date: Mon, 14 Jul 2025 16:11:10 +0100 Message-ID: <20250714151121.219866-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250714151121.219866-1-luca.boccassi@gmail.com> References: <20250630122556.1133654-23-luca.boccassi@gmail.com> <20250714151121.219866-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.9 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/16/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/5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4 Thanks. Luca Boccassi --- >From 5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4 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 62e75f3626..7371d2a805 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1355,6 +1355,7 @@ 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; @@ -1362,7 +1363,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) adapter->hw.mac.type == IAVF_MAC_VF || 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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-14 16:09:41.266155822 +0100 +++ 0015-net-iavf-fix-VLAN-strip-disabling-for-ADQ-v2-capabil.patch 2025-07-14 16:09:40.712448986 +0100 @@ -1 +1 @@ -From 5503bbc975b3ab46240e0ce5da1a6003c8f5dbb5 Mon Sep 17 00:00:00 2001 +From 5c6d64bdaccfdf26d9d8276dfc253ae8c1a1e1e4 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 -@@ -1388,6 +1388,7 @@ 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 62e75f3626..7371d2a805 100644 +--- a/drivers/net/iavf/iavf_ethdev.c ++++ b/drivers/net/iavf/iavf_ethdev.c +@@ -1355,6 +1355,7 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) @@ -32 +33 @@ -@@ -1395,7 +1396,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on) +@@ -1362,7 +1363,10 @@ iavf_disable_vlan_strip_ex(struct rte_eth_dev *dev, int on)