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 2E089457A1 for ; Mon, 12 Aug 2024 14:58:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 29F1140668; Mon, 12 Aug 2024 14:58:05 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2065.outbound.protection.outlook.com [40.107.102.65]) by mails.dpdk.org (Postfix) with ESMTP id 984534029C for ; Mon, 12 Aug 2024 14:58:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kpfSK3kHsvFbr9b8uGCGue2RNoVAAVwZhrHLhYXNL3wnY5drec4Je0nTvNDNwEh9FdO5JsL71TnaXsSGs8lyX/GI31/PZs38TCkDiU7OcX1xsotgF0c392BDRaiIy5JF3mIWKFTZ6fZIvKuaVz2agzpAEvnndEFMPRLLJKgK2x8EHa9f6nIS8VnURkUaZvnOGQIR+uNp00nVabAQD48t+utFN4oSBY+Q63taO2jhCMsEKSXiD60DmSmJMmuvOV7nHp9YQ7DdZz8q2E1S/T9Ui55CKNwUDHmpKfZT0gpsYUVfh5AfHg76avFT+fK+NMlufrSkP5uQACgVG9Adij+2gQ== 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=dVctFncRvNuxQf2v31uJ7JwnwxTOulm10O3eHeGfdRw=; b=CB1xBpzdvPgq3Bi20QiJG0XgS+Nbd7LdE2uiQY2VCduZ+tezyYe9JIU5DZ5PQ5zvHhvEYchbnmHAWg4P3eHY+DowF2Z3jTUoPJ1ffIM3gVZ0c69xwqWsXugYMg78vbUHhK980atPgF4P9Tz3vSafyAFEbUHMo9qy8yeJopmdtVKMZ1IiRywMHQZqmvyGKgAb405mghMPNAY1LoYvcvTnnB4itAC+x4WTwQih+YRVE81QRsSy9H7sUFbEnyU+YbAiIUPsm89uOvlIRh/Qjy1JDQ7EoIlHbEgfVFk+nqYXswHXx05NQ3iFXQRlF4Eoq9+nVbxODplqvXis4SnuHWuYYA== 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=dVctFncRvNuxQf2v31uJ7JwnwxTOulm10O3eHeGfdRw=; b=s3zXe/8ROXZyQ7/O85lNQqbc/qANXoKfe5HeuITsJw3c5ppKWe/6gDh6qRl0uLSJ5xLbpOykRSyJuP77CVsY9+3qrO+3F8AoZgx+mTSuPGIQZsJ8WridTCY/Q6ks+iSSWOjLg6p6dLt1sOzfMy6fWy4ekz5KwCupyUnUUE51l95U0DtpqiMEcSC/K7y11f77XhdL+DjZj27GDZum18B5Q71VjadGl17wDG471qK0igncqCZ9llo8i6b0+I33+IYts9dpAS6IESZJGvHNbI8YWH/fXhvc5BIa+w7bDLQQRBxGT19BuNH7SepZx+IeV8y70e/5FUPqJ0GBUC9J4TnaQA== Received: from BN9PR03CA0480.namprd03.prod.outlook.com (2603:10b6:408:139::35) by CH2PR12MB4216.namprd12.prod.outlook.com (2603:10b6:610:a8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:57:57 +0000 Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com (2603:10b6:408:139:cafe::be) by BN9PR03CA0480.outlook.office365.com (2603:10b6:408:139::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend Transport; Mon, 12 Aug 2024 12:57:57 +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 BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:57:57 +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.4; Mon, 12 Aug 2024 05:57:39 -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; Mon, 12 Aug 2024 05:57:37 -0700 From: Xueming Li To: Jiawen Wu CC: , dpdk stable Subject: patch 'net/txgbe: restrict configuration of VLAN strip offload' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:49:10 +0800 Message-ID: <20240812125035.389667-74-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-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: BL02EPF0001A0FD:EE_|CH2PR12MB4216:EE_ X-MS-Office365-Filtering-Correlation-Id: 6e1ce1a1-78ad-49b9-2a54-08dcbace6355 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UpUUXk7jUprGefTGCESbjqdzD9syUEC8Jd2ZEle5YIKkSzQhnGG6fm8GpiC7?= =?us-ascii?Q?bbSq8PliN/Jwj9+4ni0p5bzZfvhAPM+7sq4hw2qa2Ozm3tVXIIgG5Qax/RR1?= =?us-ascii?Q?klshRF8vEkMldaqBbl2SHNGChpnV6eP6iL2vRys4xZ/f/JTCayzDeqTdNzcL?= =?us-ascii?Q?nMisYO9jJl3KdVHrkfyqPQdkWdtKpgM6DssedYCB8H2AC7ucEeGX9TZgXAs/?= =?us-ascii?Q?NromdQVjG73FhhCBCh/MHzKe0N8h7fNqZO/XQAHj4X8EysJpc0QhEbkE9T3k?= =?us-ascii?Q?Gh1hqK9FR8syPFJQZLeT2qgu8GuXsMZZG5Xt5NcJe4wPUMR7dQPJu42lcWnL?= =?us-ascii?Q?e0vRmn5povgcle4OdbvUGdtOAzvfMhHEoLallsbCNkXElcXoU3bjiBUbgvlC?= =?us-ascii?Q?p4BsGw3+pZPn660/dYUbVkg++vHN5ZzdzcMRoRCw6l0xNqorRIKy/6q7DFoC?= =?us-ascii?Q?Ik0qt2MvHvj2qntFldDCbLx8VRXGYAQl5+v73r1rrGpIdf7D2A8dgbaNxREZ?= =?us-ascii?Q?AXbafsxiiqcUEMoTyOsFcbWHf8fJT9kUue4W98XC9Nkv86/osL7uMd958bQ0?= =?us-ascii?Q?8rxO0jN1oWGJfOKCj4QjQhjsCvfp/DLFeVRiEKMMVHjxYO1maECn7mhubtgY?= =?us-ascii?Q?mlV+DjROfGhjy4aQ3JjFPySbN43n7RCU12V0U6Y4SNhnp4WwiM19/xZBqo9v?= =?us-ascii?Q?/S9HCAJ+Rju0Jz2rluQKq1PpLmRkDKXvQsxa+aIxihrf/MoQLixkxZHa0nNz?= =?us-ascii?Q?Ki8r5v42WT/vkos5QngVv4XOyfbuooJSGdI8TGMjh9KSKWjMBGUr1GmTrYqO?= =?us-ascii?Q?/xVti4d/vUXv44Mco+BBFZM/PVsxy4gt+w0nUz1J5eo1EcVSkoK1+fPGYKbX?= =?us-ascii?Q?oy7BPFktuzoRvtQjPtKkcuZ1BWrW1Z9jo2H85R43FY1o102omnZsYEw2iSbS?= =?us-ascii?Q?9qOW6EMJvbFiScSXaezcduQnwqs4Po396ZIEwuGpSwvNH8PENdzmaiOAi59n?= =?us-ascii?Q?BXi8sbqcrs2uiVXDaHWscLZtCqgA5rc8ubFZw9yYD0HRlxjEvtsdcDQf/hoE?= =?us-ascii?Q?9nTdAvaQRyUmaEvZ7g5ezl5rEFihv+K98ZWK+rQ/yRmj+tLYjQ2W42Jfbz7J?= =?us-ascii?Q?BSf3oBGv8E25P1p/kk4v3qfZYAur28IJHbIOVFg/fdYysTE6UVnsmhTrRQ67?= =?us-ascii?Q?Rn7yoqgrE1mo3i+TbZw1ThpU9ISHNM2hfKuxFlgpYSPSf+j+sNCBbp8qxTz7?= =?us-ascii?Q?lEjsJOOZWHUyYCQ22+eUfE5ob3YOr91ZEVpUQX/WR44WvHWOgh/JX31QamLT?= =?us-ascii?Q?ziJUL+smbey5zWZ6MOQ+skKr0+8Mp9H73QGYMxIOR2yEYtWaO0cSJzwJGxi7?= =?us-ascii?Q?gtDPuJWZzPnhVf+xEUcXK63+oK0JmDlSER3E4L3kHKETFEF8gp4XfSRjUnrn?= =?us-ascii?Q?U2oxQsvTqR3XwqVwMJLeKnVw5XKAqoVW?= 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)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:57:57.0760 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6e1ce1a1-78ad-49b9-2a54-08dcbace6355 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: BL02EPF0001A0FD.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4216 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 08/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=55d8be2055f28556f418b6696fe0bd5145140289 Thanks. Xueming Li --- >From 55d8be2055f28556f418b6696fe0bd5145140289 Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Tue, 18 Jun 2024 15:11:35 +0800 Subject: [PATCH] net/txgbe: restrict configuration of VLAN strip offload Cc: Xueming Li [ upstream commit 66364efcf95884b97b71aaff697f8597a286f52e ] 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: 220b0e49bc47 ("net/txgbe: support VLAN") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 49 +++++++++++++------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index af98762680..d1305b0507 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -1000,41 +1000,25 @@ txgbe_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) } static void -txgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +txgbe_vlan_strip_q_set(struct rte_eth_dev *dev, uint16_t queue, int on) { - struct txgbe_hw *hw = TXGBE_DEV_HW(dev); - struct txgbe_rx_queue *rxq; - bool restart; - uint32_t rxcfg, rxbal, rxbah; - if (on) txgbe_vlan_hw_strip_enable(dev, queue); else txgbe_vlan_hw_strip_disable(dev, queue); +} - rxq = dev->data->rx_queues[queue]; - rxbal = rd32(hw, TXGBE_RXBAL(rxq->reg_idx)); - rxbah = rd32(hw, TXGBE_RXBAH(rxq->reg_idx)); - rxcfg = rd32(hw, TXGBE_RXCFG(rxq->reg_idx)); - if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { - restart = (rxcfg & TXGBE_RXCFG_ENA) && - !(rxcfg & TXGBE_RXCFG_VLAN); - rxcfg |= TXGBE_RXCFG_VLAN; - } else { - restart = (rxcfg & TXGBE_RXCFG_ENA) && - (rxcfg & TXGBE_RXCFG_VLAN); - rxcfg &= ~TXGBE_RXCFG_VLAN; - } - rxcfg &= ~TXGBE_RXCFG_ENA; +static void +txgbe_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on) +{ + struct txgbe_hw *hw = TXGBE_DEV_HW(dev); - if (restart) { - /* set vlan strip for ring */ - txgbe_dev_rx_queue_stop(dev, queue); - wr32(hw, TXGBE_RXBAL(rxq->reg_idx), rxbal); - wr32(hw, TXGBE_RXBAH(rxq->reg_idx), rxbah); - wr32(hw, TXGBE_RXCFG(rxq->reg_idx), rxcfg); - txgbe_dev_rx_queue_start(dev, queue); + if (!hw->adapter_stopped) { + PMD_DRV_LOG(ERR, "Please stop port first"); + return; } + + txgbe_vlan_strip_q_set(dev, queue, on); } static int @@ -1259,9 +1243,9 @@ txgbe_vlan_hw_strip_config(struct rte_eth_dev *dev) rxq = dev->data->rx_queues[i]; if (rxq->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - txgbe_vlan_strip_queue_set(dev, i, 1); + txgbe_vlan_strip_q_set(dev, i, 1); else - txgbe_vlan_strip_queue_set(dev, i, 0); + txgbe_vlan_strip_q_set(dev, i, 0); } } @@ -1323,6 +1307,13 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask) static int txgbe_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); txgbe_vlan_offload_config(dev, mask); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.928433307 +0800 +++ 0073-net-txgbe-restrict-configuration-of-VLAN-strip-offlo.patch 2024-08-12 20:44:02.225069320 +0800 @@ -1 +1 @@ -From 66364efcf95884b97b71aaff697f8597a286f52e Mon Sep 17 00:00:00 2001 +From 55d8be2055f28556f418b6696fe0bd5145140289 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 66364efcf95884b97b71aaff697f8597a286f52e ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 121dccb5eb..a59d964a5b 100644 +index af98762680..d1305b0507 100644