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 477B9431D5 for ; Sun, 22 Oct 2023 16:30:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40436402C4; Sun, 22 Oct 2023 16:30:25 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2067.outbound.protection.outlook.com [40.107.94.67]) by mails.dpdk.org (Postfix) with ESMTP id 66DA9402C4 for ; Sun, 22 Oct 2023 16:30:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iZ/0smlgGOHZaT8Gkf5Vc3rSC65Tn0GqDlHyxSg3n0oZzrxv70rKWblaat382PpUH2klXlLmaMDpEePVMauIo5ZXDwNAFhVvEk++AL60VcGMsejZNK52TJkWcj/cBapzJ0Sv+LVQJaxNlYWO1FIVN/lAz+2hp7ow4TyTBs8S0lVDw+4+x/SsyeLZSOFu+TpY3tHQNT41k007TQLXf8tpl9FXoB0dbWDv4nsnky0CnwASlLD5dkcQoeV2wv8zlDD/rznxAbEy9z7BXYrP/jRVG4tk80j9vUanO+rxJqfZ6uMAtBF3XO4LhNWnYNhk1DFq0WKbmvzu5piC0zNKBu6MXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=sPsAush/DSm3iT59cf6BHhCAYpnmN0APb9szOKtZG0w=; b=ZwVrnwv3DNNmghKKrjLgEFrMKYraLpYcMBelQIDgOVf/nSPkVrKjaTw2+jmNJi5AhtAflheRpHSlwyuBuvQC//Q1L0T+Gf5OsCMLolC3JRNQkX83FBLkvC3PlWkSxt9L6tp62pXJDmDzgeSAXf1Q8HuVC3UeDmu40gJBQFtOUcfRxk97dV3veoQIBmfuPILcsewG+JWVUuiEFRsODTuatsoNcEi/s1UtqsSZEJwdIYCEOUZ4OmuSQ2zYqG0wL8ZaVR4R6v/K7tIuLxIs2MUoZ4BceHNFdzXW6CuRj0Q9CMqO4AZ1orw6vl3CMjfXInBzSlHkRuAF6SWY84c3mIVdkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); 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=sPsAush/DSm3iT59cf6BHhCAYpnmN0APb9szOKtZG0w=; b=C/OnpmAJc0HY+3rHDhXUrymuxLvgIzEI2rpTdbrv7ISTcbgVLr0H2Dgm6j6tWmTrjl0FTovngeVxZNK5eKfudXD84EiZd5VxYr9d7u14CaezwuwH4tqdpnb/vPIassF9tpY8z8gFpfD0Xy8F9Rt2sNdPxfBx8KVwhi5fj2+BSWyT5n5RckjbQi3HKT28j4W2j/TaSxfuzUsE8hwDLbRkdM6Le853ycch1BzKnC+4oun4hZNv6hb6mcWa55zAXYaQGAw5rrTbLgakV1a7J7A4YKKNkh7kCL39cYBZTNAGcUKrukKkuiwbg3v+weuV0AJtycKecCdW7hdHzvPycbSBcA== Received: from DS7PR05CA0013.namprd05.prod.outlook.com (2603:10b6:5:3b9::18) by MW4PR12MB6826.namprd12.prod.outlook.com (2603:10b6:303:20c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:30:21 +0000 Received: from CY4PEPF0000EE32.namprd05.prod.outlook.com (2603:10b6:5:3b9:cafe::15) by DS7PR05CA0013.outlook.office365.com (2603:10b6:5:3b9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.14 via Frontend Transport; Sun, 22 Oct 2023 14:30:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE32.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:30:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:09 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:07 -0700 From: Xueming Li To: Wenjing Qiao CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix VLAN offload strip flag' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:52 +0800 Message-ID: <20231022142250.10324-84-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE32:EE_|MW4PR12MB6826:EE_ X-MS-Office365-Filtering-Correlation-Id: 639f9850-7767-4b46-7953-08dbd30b6c1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LP+poa3jXXRLFMnAIM0h1518BethDgIi/O5rLHBXpnnEvZOAijv1s9geIwj8UgURduxD82KxKcLPqbNjnc6upehqdGxzP9i2Fm/2ELBpHe6no6MbmQ0Be0yrTE8a1qPacScvKlj8DtLnKSZSkB0Yii4547TVJbLt3I9lEUUdxIbetSmNImjTsgZeRtgVKbF7Pb/z4abHz8Ol8V7Lxls5Qs+jynJ1X+0vHCyxPB+TxCgOCCoB84HIx28S1571660iivI7pA81z2frzel0KbnRPvwBeMbMUdfz2Y+TKIFYaLqhzcwJ+a2AFDFC9364jQLDRQV7bACshX3UkDxOV3tznJXcXyG+5/62FWxWChuttEg0d6LcP5vmuo0kVU+61Rgj+JNmKZS4kGtssCH4o383vccWqBnNqzOcUHx6Ar+0tHUZxDvF9l9WsuqziS3GZLLNTBpPZQD1t1FMGbonfAhZsyI2/KZ6xuIhAT19UE9kQOxof9I5Bnvpuz4gOYZt5WpfAHDMyChcK0X5dgPtsYaUJEjLe4vXV+sx8SRfHzvfG27lDCMzaXf89ljViTYsp9Vt7/NGNXQP2EoC30uBbdd82zPD8ZN9+cQq+8WoW3C3hwv25WCcDWJPc5ux28xrJoHPd0k4jTQ3q2/SXrJhLPMECq/AIPSO31qhVS4iqsw/AdHzoadUzrXG2cZ2Ez8MIWAwrs9p7dCjEtDARm6b4c6zjFS7U4aYYSQ+hNvMO8flYtFhn9rc36VKmZ216XvB7fwqFbixiWOSUSKrF8EppsVw9bvnPGJWZKetP2c+BZTfWAk= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(186009)(64100799003)(82310400011)(451199024)(1800799009)(36840700001)(46966006)(40470700004)(55016003)(40460700003)(6666004)(336012)(36860700001)(8676002)(4326008)(8936002)(5660300002)(426003)(41300700001)(83380400001)(6286002)(26005)(47076005)(16526019)(2906002)(7696005)(53546011)(2616005)(1076003)(40480700001)(36756003)(86362001)(4001150100001)(316002)(54906003)(70206006)(70586007)(82740400003)(478600001)(356005)(6916009)(7636003)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:30:21.3532 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 639f9850-7767-4b46-7953-08dbd30b6c1e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE32.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6826 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.4 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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=491e9d37c14e6faefbd8fb21f9ad0252eb5857fb Thanks. Xueming Li --- >From 491e9d37c14e6faefbd8fb21f9ad0252eb5857fb 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 Cc: Xueming Li [ 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 610547502b..bca89362e1 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1353,6 +1353,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, 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; if (adapter->closed) @@ -1371,6 +1372,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) err = iavf_add_del_vlan(adapter, vlan_id, 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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.400180700 +0800 +++ 0083-net-iavf-fix-VLAN-offload-strip-flag.patch 2023-10-22 22:17:34.316723700 +0800 @@ -1 +1 @@ -From e25c7ed114b296ddaa583427824acc30bcf9c85d Mon Sep 17 00:00:00 2001 +From 491e9d37c14e6faefbd8fb21f9ad0252eb5857fb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e25c7ed114b296ddaa583427824acc30bcf9c85d ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index c0ca733c67..9591acef65 100644 +index 610547502b..bca89362e1 100644 @@ -24 +26 @@ -@@ -1369,6 +1369,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1353,6 +1353,7 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -32 +34 @@ -@@ -1387,6 +1388,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -1371,6 +1372,23 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)