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 0FB6446C4D for ; Wed, 30 Jul 2025 09:13:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE8744025E; Wed, 30 Jul 2025 09:13:31 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2044.outbound.protection.outlook.com [40.107.236.44]) by mails.dpdk.org (Postfix) with ESMTP id 229304025E for ; Wed, 30 Jul 2025 09:13:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mB3dWpRZ3tueicvrpsS4rCN93aACwfPCifw4vCnwE7wqHjIv2UW7wTgYJXBsTraPkuT6j/8A1CAUGZ2TnD7sUTb3ofVVAug+Lcrv5ykDxumXLXIMMZouNR80hTR7Ll+b+7936bTRbWp124MPNNmeca4TtHhXLjo79qWxYj69AEoEO/5CPgH/mmv4ZZChs7vSxGRDSNC9+kLBtzlI9hZfm/ZwDaF0TiMSX8ZUYj4Wc+f6SQNVvkHlWmcpV31F5TSSsAhN2r3COKMoz1SLYtzoi/pwraYzeBblLk1CbkAjUpwuY4jBojoQ4PRMzA8QGYnwqoQFGHM8IR1p9smLHRMbBw== 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=2KivaBoGuT2HaqRmWgq+XVXCPxbUnVJTaxaTwgXMDvM=; b=yjbV+FNt1Tb603Fr4YVFa1SZestEkRsb9RVUcoSP25jpT565yz6OSsFvo//pNXrpfcT+XNmlYqQtcqjGH4fr6QEjP5eUBlP5C1Qh/TyCRiRHk4KmtzvcfXfH5rWRUpNc6Qm0jac3PeD9KiQCZgxrrziCm6Uw0a8Glzt0u4FSOX6IPsax3DXWaVrttW45Id+4Po+wV5faVe2m8GNw+l/vz5wJYCqFke+NS01YQZE+UPoD03zt1/wMziYgyGMSogmqWvxJXOFACo2M324oPTf+hWJ9W7CqpEgTFGpDc7EiM2MkIKHztTgp1MUebvfvUS+eEThl3mvvbQC1RZeNvwSP7A== 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=2KivaBoGuT2HaqRmWgq+XVXCPxbUnVJTaxaTwgXMDvM=; b=WdEcfHFV0OLV2MWkt9Y4fSbFI6V3nkj6dzNyPBbEK0f4MuqMFAa2VX/E3DlAVKa0FttxjdIJhmojbzBinCKK+hLPj1m5vhrCkHJXNBngHtgXpM0XCUF1fxHX3Q4gFp9xR3Rd5eWlK7wfSTaG+Gg1Qkcwp6qnyuImXIWe3GieW0tYzBszJkPo+1YlZWlmKooiI1DqKXQCOrKBoRb3X50EARfg9ja5FYLGbVAGghzB25t9oQBbwR4mLwDcBx+e7nV3+W2rDuY22JXKSBZqQHb4cNnDKfkBVokK62ufXcIQtTqtITNeF0hVUlQFuuBEZhG+qZBzA683/QhUj9vF1dlN2g== Received: from MW4PR04CA0343.namprd04.prod.outlook.com (2603:10b6:303:8a::18) by DS4PR12MB9795.namprd12.prod.outlook.com (2603:10b6:8:29e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 07:13:26 +0000 Received: from BY1PEPF0001AE1D.namprd04.prod.outlook.com (2603:10b6:303:8a:cafe::b7) by MW4PR04CA0343.outlook.office365.com (2603:10b6:303:8a::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8964.25 via Frontend Transport; Wed, 30 Jul 2025 07:13:26 +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 BY1PEPF0001AE1D.mail.protection.outlook.com (10.167.242.106) 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:25 +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:06 -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:04 -0700 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/txgbe: fix MAC control frame forwarding' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:31 +0800 Message-ID: <20250730071045.136672-21-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: BY1PEPF0001AE1D:EE_|DS4PR12MB9795:EE_ X-MS-Office365-Filtering-Correlation-Id: 794af73f-5bd8-4e81-03fb-08ddcf3893cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wJ26T8WhJM+GiwPfwHrCZSC+iBWH0aRVg+TipSmZmdb0nVvr23IAdDNQXRGv?= =?us-ascii?Q?T7WkvqJ2/uL2/IiOkT6Ew5Hsrc8yvcxoWpLwcfOs+UVDu3PklCewNbqcdPQc?= =?us-ascii?Q?OR/UzONZO1QYln+i1it8ueE63R2Rof5bgzrMl6npN1xL4kfjR6WkDw1Vioew?= =?us-ascii?Q?mk9MPWe8l3DEhYMYGfmy2gvnSoXVS//6jz18BOhLkjZ2K+uzqn1KBvpH8IfZ?= =?us-ascii?Q?gBqUTDYhE4ZpBzkoKPdaMy2YRFTnn2zA3S2jqc/nSu6BdbcYr+C6tCi/TxUD?= =?us-ascii?Q?e4OuS0FUJ9bN3aQ5nSBXknP5U2mj9kijfuJWeIYFEZ49jnLPqQJP5es9JjV7?= =?us-ascii?Q?NtpiH2e7izeXlnhQ1JGu3WVvoY2LI8EA8Wztt6E74qJkeclblCNv5KFNuwY0?= =?us-ascii?Q?YD2W9kpsqaEWrlZ2/kXJJRanDU9VammlMgnSeMTMbN6O1HfDrCvTkFprlvmx?= =?us-ascii?Q?ekyVHqSTmykTqmGM15G+tAXAtQ87xUlkISUOpwQbleUiU53R5rgJaryOP3j9?= =?us-ascii?Q?scLxiaGh3O8NTXjsA+s5GCK6iIsbKnD4HFFGFmBzDY2zoYVQN1vDEnyQZHLD?= =?us-ascii?Q?APbgRlB6LcHY+tRZh/R//cSz/DD+cSHyFiVRSxfJrPmHTKGCCWwzJL70tAKF?= =?us-ascii?Q?J+Os8e8GYt0yjR+ghnDzDNeWZkjMFKEDejzK4ySwfS5cZDIS44J6R5Gmf8hd?= =?us-ascii?Q?29docpHEOeNfdSBX5tAAO0CVTu2RXBqHzLs5FEzOr1XV2hnmpW+6hWWoo1/W?= =?us-ascii?Q?bFFP0Qgo9+IGXyh8kdxHUlGLH06LcRb6k+QJc82OBj8QyRShYUjHsHMIXubf?= =?us-ascii?Q?ubcYT7TDpVgj9KRB6Ys+NbFBWg17RVWkIYBSkbYrhIuq+/MsdxQsnKn7RCa/?= =?us-ascii?Q?Sn17KJ3+jJ7flBxRm0nIIOgf9P+dsMzLZZXr70jPnEqbn6qBbZwQeGBCdNj9?= =?us-ascii?Q?wDPpnnDMIFrRtUpmvZIY4NSiJGK15xrR06g4fR5ucai9rZLb2MklJ0ZyL38g?= =?us-ascii?Q?Gno9lMzwcvBjVcu26iF5YYpGfuSxQ5vm7k1R6ftz5UbHhDvIayQj9W/BwPWT?= =?us-ascii?Q?vgBuQOzPr0WM6cWmEyJSu+csBYLw3xYN+naAj2Mr01y6y0VTZ/sBZATcBJiW?= =?us-ascii?Q?U/nOKgbY/NrwNw/sQjnujI8pS5b+oCwzEQ7A3Wm2CDCNQx45dl4xn9i49IcN?= =?us-ascii?Q?ZgfeF2UWQoYXhKk9dKupSsDG+mjeRXe6gMYODJZ8X/q8xxYd/5ywvEAcCdYE?= =?us-ascii?Q?rixIFALmdlZOrH82rhFCzhqFOYVXyj5VMQfK2nCcThh5G2T3dLz+OqrtngwU?= =?us-ascii?Q?eaaA0xe4rrON4SYqNe0r+VANdffjjk8lslwUMkahtZALq0uttFt1CpN+F3bQ?= =?us-ascii?Q?TSE9kkCoWazkDUxcWSXfMNXRsK9pgwakgKRQ7PhEXGbWpPvh4N0uzP+3tYAG?= =?us-ascii?Q?sUEaShhVRRviVaOguk3A6R94zWSbikswJGu+eLzthtGWC86FInG3p0Q4Cioq?= =?us-ascii?Q?+wk+5bqJJ6voE4AIq4ucJfeiGnM9ZPFXPnQt?= 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)(36860700013)(82310400026)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:13:25.9719 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 794af73f-5bd8-4e81-03fb-08ddcf3893cb 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: BY1PEPF0001AE1D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9795 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=500e6df319140e88897c7590344611d09a578dcd Thanks. Xueming Li --- >From 500e6df319140e88897c7590344611d09a578dcd Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:53 +0800 Subject: [PATCH] net/txgbe: fix MAC control frame forwarding Cc: Xueming Li [ upstream commit b71127393a37cda0de6ca088f9945ee1a148e712 ] Test Failure on the case "test_pause_fwd_port_stop_start", which expect MAC control frame forwarding setting still working after port stop/start. Fix the bug to pass the test case. Fixes: 69ce8c8a4ce3 ("net/txgbe: support flow control") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/base/txgbe_hw.c | 9 +++++++++ drivers/net/txgbe/base/txgbe_type.h | 1 + drivers/net/txgbe/txgbe_ethdev.c | 1 + 3 files changed, 11 insertions(+) diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c index 7094551fee..64a39f46c8 100644 --- a/drivers/net/txgbe/base/txgbe_hw.c +++ b/drivers/net/txgbe/base/txgbe_hw.c @@ -176,6 +176,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) TXGBE_MD_DEV_AUTO_NEG, reg_cu); } + /* + * Reconfig mac ctrl frame fwd rule to make sure it still + * working after port stop/start. + */ + wr32m(hw, TXGBE_MACRXFLT, TXGBE_MACRXFLT_CTL_MASK, + (hw->fc.mac_ctrl_frame_fwd ? + TXGBE_MACRXFLT_CTL_NOPS : TXGBE_MACRXFLT_CTL_DROP)); + txgbe_flush(hw); + DEBUGOUT("Set up FC; reg = 0x%08X", reg); out: return err; diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h index f52736cae9..89f6017937 100644 --- a/drivers/net/txgbe/base/txgbe_type.h +++ b/drivers/net/txgbe/base/txgbe_type.h @@ -307,6 +307,7 @@ struct txgbe_fc_info { u32 high_water[TXGBE_DCB_TC_MAX]; /* Flow Ctrl High-water */ u32 low_water[TXGBE_DCB_TC_MAX]; /* Flow Ctrl Low-water */ u16 pause_time; /* Flow Control Pause timer */ + u8 mac_ctrl_frame_fwd; /* Forward MAC control frames */ bool send_xon; /* Flow control send XON */ bool strict_ieee; /* Strict IEEE mode */ bool disable_fc_autoneg; /* Do not autonegotiate FC */ diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 25b657d0ff..add056125b 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -3501,6 +3501,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) hw->fc.low_water[0] = fc_conf->low_water; hw->fc.send_xon = fc_conf->send_xon; hw->fc.disable_fc_autoneg = !fc_conf->autoneg; + hw->fc.mac_ctrl_frame_fwd = fc_conf->mac_ctrl_frame_fwd; err = txgbe_fc_enable(hw); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.398176690 +0800 +++ 0020-net-txgbe-fix-MAC-control-frame-forwarding.patch 2025-07-30 15:02:12.819665505 +0800 @@ -1 +1 @@ -From b71127393a37cda0de6ca088f9945ee1a148e712 Mon Sep 17 00:00:00 2001 +From 500e6df319140e88897c7590344611d09a578dcd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b71127393a37cda0de6ca088f9945ee1a148e712 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 76b9ee3c0a..42cd0e0e2c 100644 +index 7094551fee..64a39f46c8 100644 @@ -24 +26 @@ -@@ -226,6 +226,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) +@@ -176,6 +176,15 @@ s32 txgbe_setup_fc(struct txgbe_hw *hw) @@ -41 +43 @@ -index 383438ea3c..65527a22e7 100644 +index f52736cae9..89f6017937 100644 @@ -44 +46 @@ -@@ -299,6 +299,7 @@ struct txgbe_fc_info { +@@ -307,6 +307,7 @@ struct txgbe_fc_info { @@ -53 +55 @@ -index e5736bf387..b68a0557be 100644 +index 25b657d0ff..add056125b 100644 @@ -56 +58 @@ -@@ -3586,6 +3586,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf) +@@ -3501,6 +3501,7 @@ txgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)