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 7805146C4D for ; Wed, 30 Jul 2025 09:13:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71F3640E26; Wed, 30 Jul 2025 09:13:41 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) by mails.dpdk.org (Postfix) with ESMTP id 8FF694025E for ; Wed, 30 Jul 2025 09:13:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Gl6PaZ/6cu8S7kY9YIN5j5TC1aUKy6es+s9IjgHm54yYSar2CyoR7vZKILo4nKns3c6Y2xbdGp/3/fPWAxhtfEU/6E4MA9eaVy8NPT4D61hEgTWc8q19wTGQbHVmvp+Fs4eWtkyMYy/xwiVUzXUb/uLOUzqtVviwhyXb5kxmOu5HhDmJsnrZEjxRvtor95jtHHLDp0ZB2irdYkSyXYqlMF+U13ht7URc8VweJCwHKjMdzfW94jelm8pOJW4fS2qxbQ59WqjboPO6/7yHz2eCB5bEQ/2o5p+NcaHLw73VWQTfDotG6QdlocS5XTIu4MdYXL/0BcBtq+2ySFEkfTvO3Q== 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=5e/09tdfjC0vfJXp1bqmNfvqjo/Qo+cpXYKBGp+Xw3s=; b=cJKz0upiq9oOwPgOXFaCDQo7OmPYJ3O8sb/O9ZYcX3VQidIQqU/lUeGfaaSYHZX7ExqX/31qb8GXEDdoF4PdkH5uHOgaE5J+3dbfYf9wZbvY/0JFwlz+83cs06YLMvwzWFHpsA2E2xfpucRuq7Pt6mzC/cOyFD2XeAX/JA4blkNeIob3Sa37VRlYi5jyY5Uf9MOH47C061N5NruV/86d2PR+rsUm/wAC6rkaoEavKjbOmPMDMdA41FfvDjnmz+cycwdzQasbZkDd8IFAYp7DDuW9nztpNdgnMeODmog64uCwA7C857K2HwlubdcawlLcOUR3+to8gAZqQhRQICwvWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=trustnetic.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=5e/09tdfjC0vfJXp1bqmNfvqjo/Qo+cpXYKBGp+Xw3s=; b=Nou0OZTpjSlwUUGWPlcIhNU85GaxB5s1gvnx0mvCtVg3OadJcgFJAbCNteRnCwxjuN2l83vO/XLOFkwDZ4Wlv4qBtDtQh3pINQC3tYlUnzraK8UbASN9P7+EBOc1iKZ/jxwQkzzU+G3afiC30X/lNpzgsWb8n+ir2tnSahT4qYjqiRZ3cq+5s/PIGbBLVMk00rxviIfOlfHwr9FnBrI0yb5b1lU9VCkIirJQNV4/eLD8MLrP7XD3NX7H+TN19NRbXO6lL78HhhgsrDOGWW9WIj33iqB7jE+I25GFQ2F1BSPiQI8AnEqaAHEbemlPvUMCQ4LfdkViU8QgHjyWNWf8Ng== Received: from MW4PR02CA0007.namprd02.prod.outlook.com (2603:10b6:303:16d::33) by LV8PR12MB9269.namprd12.prod.outlook.com (2603:10b6:408:1fe::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.29; Wed, 30 Jul 2025 07:13:34 +0000 Received: from BY1PEPF0001AE17.namprd04.prod.outlook.com (2603:10b6:303:16d:cafe::b8) by MW4PR02CA0007.outlook.office365.com (2603:10b6:303:16d::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:13:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BY1PEPF0001AE17.mail.protection.outlook.com (10.167.242.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:13:32 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:13:13 -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.14; Wed, 30 Jul 2025 00:13:11 -0700 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/txgbe: restrict VLAN strip configuration on VF' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:35 +0800 Message-ID: <20250730071045.136672-25-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE17:EE_|LV8PR12MB9269:EE_ X-MS-Office365-Filtering-Correlation-Id: 45f2e027-25b8-4d7c-2e43-08ddcf3897dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|36860700013|82310400026|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DIVe44bUIQUjXnlVRGQQaJRhyOuNylZ+AWeIUB12rGvKJl8EnsLV9YC+uape?= =?us-ascii?Q?9pYVVcBCyTzJ3pwgY2HtpnHEMpRIVhi73cfp2h6P5GxEw6iK9y0gMepcZrxp?= =?us-ascii?Q?Z4XFpFVSoz0UwNyBivOgDb8Q8h3zHFbZNr5e1Dg6hn/LA5vTNHfH1vagw8ea?= =?us-ascii?Q?yle3eE+R4t641mNBYc1L9TWQWaZWDrRWMsa/mjVXrO+5xBMJgNXPlCXZP4M5?= =?us-ascii?Q?6Rhh84/7dxKhxJhIiIsU+qVkiDalBhhM3EY6oHdyb1fslsnLwGXq6rUC/soW?= =?us-ascii?Q?jxzeafgaHaIYIaVzXSeaZhJx8fNP78Jb7okcqFE7TPIhKcEOCdzbVw3o6Pqb?= =?us-ascii?Q?nwWir1s2UCUeXRXiTxMqkDn7/I2EMIpVYHcbqy4k7qowkp7eWbPm70d5BtUS?= =?us-ascii?Q?jDMdGBHo1bzREVg7v2Xb7D3sDBVmCbtpM1gf+HS4N/f4ieM2FzzWwran5QVB?= =?us-ascii?Q?xpJEeb85puA5W9GA5EX5cU/eNUtiZgHoSD+dNnuOMWylzkzMcdnWdtE0nMQP?= =?us-ascii?Q?mAa234EJpmNj0QAbT1bsx5GWtP6rdNJ+f1c2R9FkiaQj7RSis7WAwNUJ7gNK?= =?us-ascii?Q?tmBdAKzTptx84g7cQQqiINVshYKpXEyNc3JhT7GDWOq4TX/GTciNtrX2del7?= =?us-ascii?Q?bYkLpwePtFB1q5v7L8Im+8/LcO1nYSjfLTZ1u1ID2CkdpqLw+iTKTcv+Akzv?= =?us-ascii?Q?P4s7Q5v+iBBxAkxTRSLJIzB0gmkdFlnTbefT0G022LYesj5ENBtEgG2N1FXD?= =?us-ascii?Q?UbbsoXuwknrHQHypFo3KUGO2hf7oo0+T7bM0tJQ2vcQrkck3KHLuf5N1BeLh?= =?us-ascii?Q?Bc4Ko8LrdET4Hy3h44P/8pPr3izE3ZRkns5GVsjag7nsh8B98EMbF8jOE8Lx?= =?us-ascii?Q?W7JRrFPjZK+1NYCAF+/jUuXTHt8Qt3NYbm2KPQIt4i2IST1r/qUS9Q+iud/g?= =?us-ascii?Q?nrnDXfSYJGFE4Fjn0luC00UIWVLpUylbrjPgHmGAsIyic0PUSdXH6xUurqI9?= =?us-ascii?Q?d1T+YSLJ7CQUtCFlcl09/UmV0lQvkharBlwKBLSrfqj8iW2MjO7TKcdNjznn?= =?us-ascii?Q?2lYwBxCcFF70AvFMe0ukh5DmlJzIQOQ+NM6qsq+/YXgdbv2VCnvCdQ4uCpmL?= =?us-ascii?Q?FjFmXkzFFRR+Rgtac7euCp3WWan7BMUoN+sqVid3j0sORWhVCOvONEXqLcgr?= =?us-ascii?Q?d2/cuARiXLVfqT8XjMaBXnXkuQkxVkz8zdJPOCw2QOIvPEQcvNHjD+zA4re8?= =?us-ascii?Q?7bIHLxEV+vwC0LAfFcFiwvlCcs0OK1+lO6ANdWTT2I4a1DFPJgDE9zew/tJ2?= =?us-ascii?Q?GS04uWi7h4qxcgmtpMlKm+cI/9oNYCSEyilSj/OlAEaj7BCYEl94akoe4lD3?= =?us-ascii?Q?kJIc68HO0d6j3+qa1OpUGT1djnqtM5dfR1ycrSXj/xN9FQPxVKPWDMUR0WuB?= =?us-ascii?Q?qHI+6TTg//dZoNGID5cFw92Kbn1tnh8acHi+OGm1bZXnReb19qCD8ncn5xCu?= =?us-ascii?Q?UtWFdut5KxUCC4CcI3CL81/FVldM/nrkcqs/?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(36860700013)(82310400026)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:13:32.6310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45f2e027-25b8-4d7c-2e43-08ddcf3897dd 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0001AE17.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR12MB9269 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.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/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://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=b2a0154f8b37271a95019102118c9fc2ce72d831 Thanks. Xueming Li --- >From b2a0154f8b37271a95019102118c9fc2ce72d831 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:57 +0800 Subject: [PATCH] net/txgbe: restrict VLAN strip configuration on VF Cc: Xueming Li [ upstream commit b8c3d76e790cb06b54469b71a1af822de50c790d ] Fix the same issue as PF in commit 66364efcf958 ("net/txgbe: restrict configuration of VLAN strip offload"). There is a hardware limitation that Rx ring config register is not writable when Rx ring is enabled, i.e. the TXGBE_RXCFG_ENA bit is set. But disabling the ring when there is traffic will cause ring get stuck. So restrict the configuration of VLAN strip offload only if device is started. Fixes: aa1ae7941e71 ("net/txgbe: support VF VLAN") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev_vf.c | 31 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c index 92603fccc2..ab85cb99e1 100644 --- a/drivers/net/txgbe/txgbe_ethdev_vf.c +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -863,7 +863,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +txgbevf_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { struct txgbe_hw *hw = TXGBE_DEV_HW(dev); uint32_t ctrl; @@ -874,20 +874,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) return; ctrl = rd32(hw, TXGBE_RXCFG(queue)); - txgbe_dev_save_rx_queue(hw, queue); if (on) ctrl |= TXGBE_RXCFG_VLAN; else ctrl &= ~TXGBE_RXCFG_VLAN; - wr32(hw, TXGBE_RXCFG(queue), 0); - msec_delay(100); - txgbe_dev_store_rx_queue(hw, queue); - wr32m(hw, TXGBE_RXCFG(queue), - TXGBE_RXCFG_VLAN | TXGBE_RXCFG_ENA, ctrl); + wr32(hw, TXGBE_RXCFG(queue), ctrl); txgbe_vlan_hw_strip_bitmap_set(dev, queue, on); } +static void +txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; + } + + txgbevf_vlan_strip_q_set(dev, queue, on); +} + static int txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) { @@ -900,7 +908,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) for (i = 0; i < dev->data->nb_rx_queues; i++) { rxq = dev->data->rx_queues[i]; on = !!(rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP); - txgbevf_vlan_strip_queue_set(dev, i, on); + txgbevf_vlan_strip_q_set(dev, i, on); } } @@ -910,6 +918,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int txgbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask) { + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); + + if (!hw->adapter_stopped && (mask & RTE_ETH_VLAN_STRIP_MASK)) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return -EPERM; + } + txgbe_config_vlan_strip_on_all_queues(dev, mask); txgbevf_vlan_offload_config(dev, mask); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.505002059 +0800 +++ 0024-net-txgbe-restrict-VLAN-strip-configuration-on-VF.patch 2025-07-30 15:02:12.827124178 +0800 @@ -1 +1 @@ -From b8c3d76e790cb06b54469b71a1af822de50c790d Mon Sep 17 00:00:00 2001 +From b2a0154f8b37271a95019102118c9fc2ce72d831 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b8c3d76e790cb06b54469b71a1af822de50c790d ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index c0d8aa15b2..847febf8c3 100644 +index 92603fccc2..ab85cb99e1 100644 @@ -27 +29 @@ -@@ -935,7 +935,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) +@@ -863,7 +863,7 @@ txgbevf_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) @@ -36 +38 @@ -@@ -946,20 +946,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +@@ -874,20 +874,28 @@ txgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) @@ -71 +73 @@ -@@ -972,7 +980,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -900,7 +908,7 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) @@ -80 +82 @@ -@@ -982,6 +990,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask) +@@ -910,6 +918,13 @@ txgbevf_vlan_offload_config(struct rte_eth_dev *dev, int mask)