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 325E946C4D for ; Wed, 30 Jul 2025 09:13:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C2744025E; Wed, 30 Jul 2025 09:13:35 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73]) by mails.dpdk.org (Postfix) with ESMTP id 1DBD140E26 for ; Wed, 30 Jul 2025 09:13:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r7OSlpo81FjThv4x12GLEoKvO2c9sKoCrDexco3ApfIJlGbJLG33f4fUIBdmCbxGlbKOT1v5vI0yCUKFd558vKlQH6x5Z/LdivBf4kID8wemXLKFFT6TmtQOdSLnWzVnFa6wpkYgIZVn31D8Wjrfvz5oscTt+viJQdhOx3HdrIJPbM3ThAtY55HrITLmhNZzhRn3ArsqdRL0wcCBoBEtOranJ2a5LdIir5a2LjTSPq/uZeJ3/Hn/2tUoRJrMUsisQDu3A2LtEX3cGHtHEensomW4xzjDRjnP/rQ+qHLEfzxgyZJZjMXQohwSNzlzZU2cfIIjZcQbMTUL0Wkbx7asnw== 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=uWIZb9xYcLJ0WT37mTDOiekmNffkaI2tBT51/d2jJgk=; b=pcS1SvteDy+g9pEzlPTCP5yllfwxS3q81EA/IXLISHJTOt24+7+ukfC5+3g3Ok8Cv4PcqtWSjaiVDoMLH3AO43AAQ+hwk8pd/2oXf+MBml9ABLE0HchjwR3mBgIwHBOAtTQazTPxPrPlJ0A7SVRkXWQRdPj+fcomiRbd5A0u9PrmfokE0KC8gDGM+CVwa3/KaYnxjbkMHQyIPvhVs8/w9koXnLwqxGauQ7ES29LaQBrNj3AKdRWLzBZPWcq7NrQV87yUzv2sT+TxdOZI6A3eOBR6nIeogmQj+kwNF6YuBZ1W3ZSSuVwVAxPFYw+uZqXCgw+KtlkCNE/cFDwyN8Bn+A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=uWIZb9xYcLJ0WT37mTDOiekmNffkaI2tBT51/d2jJgk=; b=HdvNlGJBo5wXcoKDaJ2m22JuJannn2tRba9LhS3TPjd6wvzuHcAgy66eeMwQ1VvJ45l/Q86uh9YxELjWxDjWMzvdxDTxicpWqwZFlnVYQNCCclwHwohuhPZK/1oraEJxV4IwnuRGIY4V3Syj3/FINMRLNQX4RciKcePe+APYHl4idhgOS/5qEH8W0xQpVqzHORJD3EhihYW/FG8quWAyTlvQE9KMq0rBSIW+qH+mrVJULJmD8p7Ppdp8fyDvXahqsH/X9nTtX1hPvXhCAp+F5vhLKk7gKSM/xolF07y0gurGpYBpWxkyGCoa71vse1jVUfootNFY48NLUGtyZcYGfQ== Received: from SJ0PR05CA0033.namprd05.prod.outlook.com (2603:10b6:a03:33f::8) by CH3PR12MB8281.namprd12.prod.outlook.com (2603:10b6:610:128::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:27 +0000 Received: from SJ1PEPF00001CE3.namprd05.prod.outlook.com (2603:10b6:a03:33f:cafe::e4) by SJ0PR05CA0033.outlook.office365.com (2603:10b6:a03:33f::8) 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:27 +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 SJ1PEPF00001CE3.mail.protection.outlook.com (10.167.242.11) 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:27 +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.14; Wed, 30 Jul 2025 00:13: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.1544.14; Wed, 30 Jul 2025 00:13:08 -0700 From: Xueming Li To: Jiawen Wu CC: Xueming Li , dpdk stable Subject: patch 'net/txgbe: fix device statistics' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:33 +0800 Message-ID: <20250730071045.136672-23-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: SJ1PEPF00001CE3:EE_|CH3PR12MB8281:EE_ X-MS-Office365-Filtering-Correlation-Id: cfce02e8-7245-4172-de19-08ddcf389472 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007|13003099007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?X3S61mFYES9fAssW31/ARRgP7qMZ6CoGKDuNbgo4+QYwPdEm2nDHevcneDno?= =?us-ascii?Q?3ULi5jPrVtWvT6vaoZcSGVc/qNiH9bY8+qYDc0xXy2wBEZdwThDCzbjSoGHp?= =?us-ascii?Q?/IkJeY5PH2beW51NGTx00rVU/r+/Qyz4ScgW1fjz4QVNHXV+hqHhOyLn3HQV?= =?us-ascii?Q?7FCDXkTQeH6umm+IWFgPwv/GD2Id/7XaNQAedn9tIjG3/m9PLR+sRbU3zX+e?= =?us-ascii?Q?ttSJ1H2186wjYSTNL9pS8qD6FqaP45r8ZfFAM4XZiTjxQsLyXikUZFeIWMlA?= =?us-ascii?Q?qZwQGNf+6BflIUpnPAuPG1Q3mcCzby/aI6sSpCLIYwShF5rdDTZ0pXe0Z+rz?= =?us-ascii?Q?4gIW6ELSWv52XTXTKOoU5ukd1+DCMWiZPtdTJMVUOOmSpYmuIDqZ/HN14w2q?= =?us-ascii?Q?q6ZPEV9O+6tY3ekXBHakwiSmebLgzoXFvvFSu5m7SDIf3W63aFHrh0n+OHhj?= =?us-ascii?Q?CJhCnaBLLLdIcX+Q9zN2zT9xF4lhrmrhl10OqyTIYLyGGgnJnGaliHZh5cDp?= =?us-ascii?Q?0UX+sSjWvOk3hfAiVODhOFyDs5zoER4LWD7cxoBbdcmrZg49Z2Jpno9cIqgB?= =?us-ascii?Q?w31mTwo+LASaS+NTYqc0sDdu+7e4SVMxTiksIRkXmaOwlLOB8YUVwVRpeLMn?= =?us-ascii?Q?MDIcL3F5VkXxZl73TeiY7sKiQqBaxPviLQn60cyAtMiGIuAEKOhHpv3M9VHk?= =?us-ascii?Q?MDxCpzbV8pk9rfRtesIXio3IdBx8JCk/2WEh+kEtc7dsKoszvy9VzpIBhO19?= =?us-ascii?Q?YE1NsbVauOe4qGHzlDGAvSLM33EW+uUUNbPaZ3v+SSC3Lmf7veJYFRhhiFR5?= =?us-ascii?Q?ntx1Y7v00j3z3hIysFUO+mwzTlk1hJvEtHgsJQBuJOaRvm8OhoYU5YYxPEfZ?= =?us-ascii?Q?FdABgggs6BykKAiQhNLwOz9Xb/gqNbQWIcITEBieaPFEij0VJOCDwSfxguyO?= =?us-ascii?Q?PgbZcyXY9O4H0vhnTajmHp0o2pgiIhl/J5qJEEFBY6ejou4Gg7D1d7nK37Xr?= =?us-ascii?Q?/Nv7UO4cAuUZuku8QK25EbC2v7Ymke1MS+l59XBMUpWb0PYTLHm27WE+sLAO?= =?us-ascii?Q?Du+GGyE7Bq8+aSyt8VxnyXUdYu0J+dbrFqeZrvX2ePVJvqxZTHlQo3FprZOF?= =?us-ascii?Q?78cuPI9f02ss+rTWzxITl6je2TSmgNU2veTWJNjNyQ1G1T3wjLGiNvIMSWTD?= =?us-ascii?Q?9++gqreitplxNHfMp8pZC/vuNS+bxSaLzQhG8+5Jhfb6Kgy14sUEFa7RkNbT?= =?us-ascii?Q?NmHQ3thoWh4SOqv/trVYSrtryJjzC9iop9ks5s8srif+IK1Jp5V79+CJmZBB?= =?us-ascii?Q?Zt3nNRMZZHV5TKmLJVloI5DFF6y2q4eedDYkClTdbRHlVn98jjqGJuTx28Ty?= =?us-ascii?Q?Gv2GT7rPnxcg6dPDtNMbc9U7tqqyC+3OQoC0U7d1AbBKRlnLFzZyG3ldhSeS?= =?us-ascii?Q?HZZm8Ov2fssSzv7lGwJC1kN86IGizIA+S2mBbijUKhwCrP33pc9pBUhTzLWh?= =?us-ascii?Q?b1MaRO0n/gfWA5y0w6O8hEMLmoEm0HhM0UUI?= 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)(376014)(82310400026)(36860700013)(1800799024)(7053199007)(13003099007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:13:27.0835 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cfce02e8-7245-4172-de19-08ddcf389472 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: SJ1PEPF00001CE3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8281 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=23cf0ce6187d17c51d0e19408028227a24345fbb Thanks. Xueming Li --- >From 23cf0ce6187d17c51d0e19408028227a24345fbb Mon Sep 17 00:00:00 2001 From: Jiawen Wu Date: Fri, 13 Jun 2025 16:41:55 +0800 Subject: [PATCH] net/txgbe: fix device statistics Cc: Xueming Li [ upstream commit d1406cf06220c78245bbb9db258f488e97f903e0 ] The extend statistic "rx_undersize_errors" is incorrectly read as the counter of frames received with a length error, which names "rx_length_error". And "rx_undersize_errors" is the counter of shorter-than-64B frames received without any errors. In addition, "tx_broadcast_packets" should use rd64() to get the full count on the low and high registers. Fixes: c9bb590d4295 ("net/txgbe: support device statistics") Signed-off-by: Jiawen Wu --- drivers/net/txgbe/txgbe_ethdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index add056125b..f990fec7f1 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -2247,7 +2247,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->rx_total_bytes += rd64(hw, TXGBE_MACRXGBOCTL); hw_stats->rx_broadcast_packets += rd64(hw, TXGBE_MACRXOCTL); - hw_stats->tx_broadcast_packets += rd32(hw, TXGBE_MACTXOCTL); + hw_stats->tx_broadcast_packets += rd64(hw, TXGBE_MACTXOCTL); hw_stats->rx_size_64_packets += rd64(hw, TXGBE_MACRX1TO64L); hw_stats->rx_size_65_to_127_packets += rd64(hw, TXGBE_MACRX65TO127L); @@ -2266,7 +2266,8 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, hw_stats->tx_size_1024_to_max_packets += rd64(hw, TXGBE_MACTX1024TOMAXL); - hw_stats->rx_undersize_errors += rd64(hw, TXGBE_MACRXERRLENL); + hw_stats->rx_length_errors += rd64(hw, TXGBE_MACRXERRLENL); + hw_stats->rx_undersize_errors += rd32(hw, TXGBE_MACRXUNDERSIZE); hw_stats->rx_oversize_cnt += rd32(hw, TXGBE_MACRXOVERSIZE); hw_stats->rx_jabber_errors += rd32(hw, TXGBE_MACRXJABBER); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.455570636 +0800 +++ 0022-net-txgbe-fix-device-statistics.patch 2025-07-30 15:02:12.823394842 +0800 @@ -1 +1 @@ -From d1406cf06220c78245bbb9db258f488e97f903e0 Mon Sep 17 00:00:00 2001 +From 23cf0ce6187d17c51d0e19408028227a24345fbb Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit d1406cf06220c78245bbb9db258f488e97f903e0 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index b68a0557be..580579094b 100644 +index add056125b..f990fec7f1 100644 @@ -26 +28 @@ -@@ -2250,7 +2250,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -2247,7 +2247,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, @@ -35 +37 @@ -@@ -2269,7 +2269,8 @@ txgbe_read_stats_registers(struct txgbe_hw *hw, +@@ -2266,7 +2266,8 @@ txgbe_read_stats_registers(struct txgbe_hw *hw,