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 0C6164326F for ; Thu, 2 Nov 2023 14:14:28 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 064E342DF4; Thu, 2 Nov 2023 14:14:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3F3C042E06 for ; Thu, 2 Nov 2023 14:14:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930865; 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=/CSOhs0EPDlysLTW/dmk0uon0f/Mx/basv9usS1tr/Y=; b=Xnbx6vUFtAQbEX4ZtqaABl5zmIUz7H/cjN+DEOxexKm2BFIzmWF41tzaFCkSDRSqwR9MR8 tQeZKVotPINWvUylt3NBpaF4fA3PqKf1hfSroiUwW4RRyuA28CnEqlgVtXIRLkofjeTdPp itRH3ug/SutV9QVrpCrjLZAuXMtyDAw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-njErENBFOGSK7PXt4BOFAw-1; Thu, 02 Nov 2023 09:14:22 -0400 X-MC-Unique: njErENBFOGSK7PXt4BOFAw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1E3EA85A58A; Thu, 2 Nov 2023 13:14:22 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5515D492BFA; Thu, 2 Nov 2023 13:14:21 +0000 (UTC) From: Kevin Traynor To: Wenjing Qiao Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN offload strip flag' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:01 +0000 Message-ID: <20231102131254.315947-55-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 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 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/23. 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/71663e247f0090389df21a9f70cd1bba6983dbad Thanks. Kevin --- >From 71663e247f0090389df21a9f70cd1bba6983dbad Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Mon, 21 Aug 2023 09:52:12 +0000 Subject: [PATCH] net/iavf: fix VLAN offload strip flag [ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ] For i40e kernel driver which only supports vlan(v1) VIRTCHNL OP, it will set strip on when setting filter on but dpdk side will not change strip flag. To be consistent with dpdk side, disable strip again. Fixes: cb25d4323fbf ("net/avf: enable MAC VLAN and promisc ops") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index e40af1316d..476a8fd1b5 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1317,4 +1317,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) 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; @@ -1335,4 +1336,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_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 not + * change strip flag. To be consistent with dpdk side, disable strip + * 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 == IAVF_MAC_XL710 || + 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 (err) + return -EIO; + } + } return 0; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.167006403 +0000 +++ 0055-net-iavf-fix-VLAN-offload-strip-flag.patch 2023-11-02 13:09:40.863163496 +0000 @@ -1 +1 @@ -From e25c7ed114b296ddaa583427824acc30bcf9c85d Mon Sep 17 00:00:00 2001 +From 71663e247f0090389df21a9f70cd1bba6983dbad Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index c0ca733c67..9591acef65 100644 +index e40af1316d..476a8fd1b5 100644 @@ -24 +25 @@ -@@ -1370,4 +1370,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1317,4 +1317,5 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -30 +31 @@ -@@ -1388,4 +1389,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1335,4 +1336,21 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)