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 6A1B545610 for ; Fri, 12 Jul 2024 12:52:17 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 61E4F402E5; Fri, 12 Jul 2024 12:52:17 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2065.outbound.protection.outlook.com [40.107.244.65]) by mails.dpdk.org (Postfix) with ESMTP id E430040261 for ; Fri, 12 Jul 2024 12:52:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CnlSkO0hpRAV2xxK+v5TpyHWpuCQnMS8BNJIwuvnEuo4g75JV/w/5I5zjSQzp5EqbM0qLhOS5cark6dymdigLME+0s6v4AuGV+cltm8rTCSZzxLED1siaZkbXbUw5vljJGgHbaaJILDordLfNPA3CB2+2HjNKOtYTEKnTvOeLUTJBrD445doxsYPNSW7S7ZHaoAg6bomTyPKskHXjj1wOntnycFZJK2RkcTnvZTfzQjc9DEUJTRyN/Lh2oCo2wxChFvGXCAgwFiP5bv/9BIsmuO6GmN6WFTYcli8HTTIEvm7pUeVcea8/5XvuLcrRCkedoQ90Whnuhw7K1TEgKnE/A== 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=uvWVqnjOe+AOD7iWuy0VLftCl4hoKrQ3mUl7ZUwN6mE=; b=m7pCOaN5TB8dqPqrAOtYvPqB4SFlBxb7RokskCppkloZdXVhcGwD1x9dOnpLPF2sBUIbEoxhXpMFhayW/lqGw1hX1XlYJtJdo4tmN4C309+jSPvjRfbw5R+g+jVcXtnbuYQCB2ibC+DM1uvcdyTvE8KtzrioohWAvueCWd0BV3mXnllcXhAac6Dhq/boQ+7zOFGoq0JCo0FGdgzmQyqtL9+ft7YRHUm6Hx7wkZz5OnDjNVGPN7l9C0WJzYQ//rlytq0JvsB2pDTJrRqwYuYi3J/o2GeG2Izj4pqFk5ZR0wiB5OA8KQox4w/OwDC3mJhvz+an/BznxmCdgqVXwQ+oJA== 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 (0) 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=uvWVqnjOe+AOD7iWuy0VLftCl4hoKrQ3mUl7ZUwN6mE=; b=HZ8VrnE1e01B6YK0ICR8OGAHyR4RoPW2a1jkmsny+I2X5XDunSKlu6kGVChq12XN5oMpPuGcCo6msnwxjXu8bqJ69g6reK7FY0DhdAkhb41cqxmhiGXcMcAdhy+ER7PlisJYu4LUCfGuJFOgVU/dEhFHidmVuAltU4NevHsrp435EUibEuDXDe7XRvpRTFwd0Y/qRRtYCFR6EE87ljbXuqa7uWlBYhKIbucrOPZQWe/suZwXxUA0X67lCvqmbkk56xEK/RsBGmgIKj9JbFiKF8BBlFESOgvwfEpd1re2352P3tgMiKfwKSFwW+NMzVxepbTia4mlZP/k4lVSJd+ZhQ== Received: from BN0PR03CA0013.namprd03.prod.outlook.com (2603:10b6:408:e6::18) by LV2PR12MB5870.namprd12.prod.outlook.com (2603:10b6:408:175::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.38; Fri, 12 Jul 2024 10:52:13 +0000 Received: from BN2PEPF000055DE.namprd21.prod.outlook.com (2603:10b6:408:e6:cafe::dc) by BN0PR03CA0013.outlook.office365.com (2603:10b6:408:e6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22 via Frontend Transport; Fri, 12 Jul 2024 10:52:12 +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 BN2PEPF000055DE.mail.protection.outlook.com (10.167.245.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:52:12 +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.1544.4; Fri, 12 Jul 2024 03:51:57 -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.1544.4; Fri, 12 Jul 2024 03:51:55 -0700 From: Xueming Li To: Vladimir Medvedkin CC: Bruce Richardson , dpdk stable Subject: patch 'net/ice: fix VLAN stripping in double VLAN mode' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:44:48 +0800 Message-ID: <20240712104528.308638-63-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN2PEPF000055DE:EE_|LV2PR12MB5870:EE_ X-MS-Office365-Filtering-Correlation-Id: 751b5e9d-6a32-4579-075f-08dca260afa4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?P6fjBPBnp7P3MWTDQ1qeCcj1kdmbPFRLv4AZKqMY9mIdodt2bcpdp+Lw1Ghe?= =?us-ascii?Q?repBr40rL1J/xe7az0QBMfJDI/wmfQqbpl2GX015z9UA87N2RNwrtynyrap2?= =?us-ascii?Q?wZKlwiVNcqGDUzlwauoKbTfIuymhpLgC6aVivx/xUiRnMovQqEI3BM2rtcTA?= =?us-ascii?Q?BT3cDmKTeyqLUVKAbz8SpcBiGWUmxYy6txlmdJnwNFg2KF5wBsUR/fRNzcET?= =?us-ascii?Q?928hnnx754JfXUh87yJjhQpCL5LsXdJIbn7FF7g979MYpwi62uhdRJFeflAT?= =?us-ascii?Q?N6en5I4OIKHV7HpcHbM6M7bLNtNrniWFqnrgwS2L8L+IVi7JMikGgY8fLI0z?= =?us-ascii?Q?EyvwQAXjsHx012eDKcqrvkg8XE86H43z6e7IHBFZp2PrmmCO/mqddkfcOgcM?= =?us-ascii?Q?1y7pzKcnA7kpIgWwNdWEB6Zm0lGh/VDXGtoUxejv8zpRD+NYZ/Y5uI4ZU/2b?= =?us-ascii?Q?lcHw1T5WdTjyti4Bn6S+lg5G85m2XQVz3v8xXbn4bMlrLnJjSAwuZ9faTOdf?= =?us-ascii?Q?4E2LvhYx5AFTWr7JUecZVM9hiZ8Ru6V6qaMdAar48l0UTDV5yAUjBB0ngCW7?= =?us-ascii?Q?ZYGuZMRd+zig0h1eXwrYYbVCobIpXGwiAch+phHFflBe7uLXigbC9XO7rcuF?= =?us-ascii?Q?IxoyMdNzIr6lSTFcz9OY6eOPEULKBKLuSoFVhgBQd92wVkV3ekGY5IePk2Qv?= =?us-ascii?Q?vLR/BPDdpP3P5rFOu+1ILuqB1Xo9BgerstCWhQ6MDc+VlBKnkcjv+pFU3M1E?= =?us-ascii?Q?HDaTOat/Zn8Pv1gYWfaBNDUD4Zn3mroL5wCaxqlPR4Mj7xvOh3W2kT3UjGSy?= =?us-ascii?Q?/5wr4hZba4M2bOZt0Oo7zc2e4OATuw1YH3u0rHPpT5oteh7YzgzaHPLmoNXq?= =?us-ascii?Q?kmAsXcvflpf5AD35gL9Mr6nFYXdlTGJhFqlEgPBp+dSP3dXhbigbRFjVKVo9?= =?us-ascii?Q?PTlw4Fu2lY+Ahhum/+ylSG8REwVSnv5OX+bgMH/d3JOG3rtWAzrxXlh5sfKO?= =?us-ascii?Q?iGE4YsgfWgOF8NAtZdCQejy4/4F761TWFD1D6ennpix81WjowH5W+tLP91wq?= =?us-ascii?Q?qn8J65CqEbFS/r0AD2ZVt+OHnO+epbuXQGD0yYr9hOZUyRyV2X3x48ovLs4E?= =?us-ascii?Q?WtOqIwTxvGmLAJy9W9NxyFOWKuwMBc6sehuQpBOZO0Ix5Ko1s/D5Mv6lL0zb?= =?us-ascii?Q?VmqutfejSGoIKXdEnVV6kU4TxJaoghwnmjrnie5WI1kqMXjPgVYKrwa/oGHz?= =?us-ascii?Q?kFqI1lNo0Q7bhLW3nuGvBRxnNEQuvKO1yUio+qQ5mv81tHGqpeY5Hw2IhZDO?= =?us-ascii?Q?Q1b7ySqkQUYd/ixihg3iUEb0zkWtn/09ZmTM23YOWZFtZLpXyfvIHXgEuISD?= =?us-ascii?Q?abcz+sLn4FMQkD9z+8Dsa79JNC8Dxjk1ppegahMT339JvrjdkDq7Tq28xuFJ?= =?us-ascii?Q?PiCrjvcoUUJlr/DdQpzpAnb7Glq4WFz2?= 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:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:52:12.4903 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 751b5e9d-6a32-4579-075f-08dca260afa4 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: BN2PEPF000055DE.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5870 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 23.11.2 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/14/24. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=91eca591037cf382acca55cbaec9d26d6ea12b76 Thanks. Xueming Li --- >From 91eca591037cf382acca55cbaec9d26d6ea12b76 Mon Sep 17 00:00:00 2001 From: Vladimir Medvedkin Date: Wed, 27 Mar 2024 18:44:13 +0000 Subject: [PATCH] net/ice: fix VLAN stripping in double VLAN mode Cc: Xueming Li [ upstream commit 882ed13a2a8c3b5cba48c15af710bf09d445094a ] The ICE hardware can operate in two modes - single VLAN mode or double VLAN mode. Depending on the operating mode the hardware handles VLAN header with single VLAN tag differently. When double VLAN enabled, a packet with a single VLAN is treated as a packet with outer VLAN only. Otherwise, a single VLAN in a packet is treated as inner VLAN. This patch fixes the logic of how VLAN stripping is programmed. Bugzilla ID: 1402 Fixes: de5da9d16430 ("net/ice: support double VLAN") Signed-off-by: Vladimir Medvedkin Acked-by: Bruce Richardson --- drivers/net/ice/ice_ethdev.c | 45 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 3c3bc49dc2..c1d2b91ad7 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3750,7 +3750,10 @@ ice_dev_start(struct rte_eth_dev *dev) ice_set_tx_function(dev); mask = RTE_ETH_VLAN_STRIP_MASK | RTE_ETH_VLAN_FILTER_MASK | - RTE_ETH_VLAN_EXTEND_MASK | RTE_ETH_QINQ_STRIP_MASK; + RTE_ETH_VLAN_EXTEND_MASK; + if (ice_is_dvm_ena(hw)) + mask |= RTE_ETH_QINQ_STRIP_MASK; + ret = ice_vlan_offload_set(dev, mask); if (ret) { PMD_INIT_LOG(ERR, "Unable to set VLAN offload"); @@ -4820,19 +4823,35 @@ ice_vlan_offload_set(struct rte_eth_dev *dev, int mask) ice_vsi_config_vlan_filter(vsi, false); } - if (mask & RTE_ETH_VLAN_STRIP_MASK) { - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - ice_vsi_config_vlan_stripping(vsi, true); - else - ice_vsi_config_vlan_stripping(vsi, false); - } + struct ice_hw *hw = ICE_VSI_TO_HW(vsi); + if (!ice_is_dvm_ena(hw)) { + if (mask & RTE_ETH_VLAN_STRIP_MASK) { + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) + ice_vsi_config_vlan_stripping(vsi, true); + else + ice_vsi_config_vlan_stripping(vsi, false); + } - if (mask & RTE_ETH_QINQ_STRIP_MASK) { - /* Enable or disable outer VLAN stripping */ - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) - ice_vsi_config_outer_vlan_stripping(vsi, true); - else - ice_vsi_config_outer_vlan_stripping(vsi, false); + if (mask & RTE_ETH_QINQ_STRIP_MASK) { + PMD_DRV_LOG(ERR, "Single VLAN mode (SVM) does not support qinq"); + return -ENOTSUP; + } + } else { + if ((mask & RTE_ETH_VLAN_STRIP_MASK) | + (mask & RTE_ETH_QINQ_STRIP_MASK)) { + if (rxmode->offloads & (RTE_ETH_RX_OFFLOAD_VLAN_STRIP | + RTE_ETH_RX_OFFLOAD_QINQ_STRIP)) + ice_vsi_config_outer_vlan_stripping(vsi, true); + else + ice_vsi_config_outer_vlan_stripping(vsi, false); + } + + if (mask & RTE_ETH_QINQ_STRIP_MASK) { + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) + ice_vsi_config_vlan_stripping(vsi, true); + else + ice_vsi_config_vlan_stripping(vsi, false); + } } return 0; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:16.985708781 +0800 +++ 0062-net-ice-fix-VLAN-stripping-in-double-VLAN-mode.patch 2024-07-12 18:40:14.146594222 +0800 @@ -1 +1 @@ -From 882ed13a2a8c3b5cba48c15af710bf09d445094a Mon Sep 17 00:00:00 2001 +From 91eca591037cf382acca55cbaec9d26d6ea12b76 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 882ed13a2a8c3b5cba48c15af710bf09d445094a ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 53a323ab14..194109b0f6 100644 +index 3c3bc49dc2..c1d2b91ad7 100644 @@ -28 +30 @@ -@@ -3840,7 +3840,10 @@ ice_dev_start(struct rte_eth_dev *dev) +@@ -3750,7 +3750,10 @@ ice_dev_start(struct rte_eth_dev *dev) @@ -40 +42 @@ -@@ -4910,19 +4913,35 @@ ice_vlan_offload_set(struct rte_eth_dev *dev, int mask) +@@ -4820,19 +4823,35 @@ ice_vlan_offload_set(struct rte_eth_dev *dev, int mask)