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 D88A946A63 for ; Thu, 26 Jun 2025 14:02:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2DD64028D; Thu, 26 Jun 2025 14:02:55 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2084.outbound.protection.outlook.com [40.107.237.84]) by mails.dpdk.org (Postfix) with ESMTP id 58A104026B for ; Thu, 26 Jun 2025 14:02:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZAfhKk5umMhdIdiY+RgE5l/4/72l2+tsAqv+2CtK468VnN3OGL5xsNNlvSV4FAqOzy1xSuSiAMTo8lVTnTfErDDMhuVinT8qGn9t77OZ/lN+cxDVtASVhCCqfJgxL+l6v7+IVV8FUYExQGx0Jst4ikHayXHqQnReajXC2FMC2AGSKZWdj0fCLdaprZwzXLNzz+WgPIU27/chPU/HYt+R/aaAZlaBJoPOFN5RTbddLhOZpqASLs66B61rZIsEfdl5LQaWMU32s/iEe4dnswyUQMcBOXJ4rrPNOdYcDrbVQ/tdK1YL9d3aysjkqbocd5kjMFA9ocqmfpGURfAksxZKmw== 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=TXugLNEi1HvW9pHyAI6XnxJfHHgV92PWRVxrp4HSkco=; b=xPCKTKBNxg+iiXECGcK73xnFLWFOe7AEImw3dEl/TFKZMcoe7xXDKsAs4GFaoGk5mTh+gSgXe/zkf8MBlV/QKyqWPClUhK4BGJ3Z9tBPA1h1WBRgMFBiZHuNVX0Hk06B+GoPExChj5pVD6oiTvx5RFB5iR2NPgwYkBCMvW+7sMkeqN3soTF11gethv/VO/9JbOkSywy9FTbUxCZkwSr0XC36iox3qfXqKuwkL1jEcTiHE+O7l02drIu56llj6FV/yWOcOaW26e424Oc/4U2i40BUwTT8Y39c3lfR2NrkgB9fq9GK0zYdzDsDr6TPpwhOVWe32NRHSMcoXS9swb0zHg== 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=TXugLNEi1HvW9pHyAI6XnxJfHHgV92PWRVxrp4HSkco=; b=PYvKr1VRIssTN8xIYF8T+vWQvC0+Im0ZMg6SrSUHZ7cnmWQ4yowMsM1Y6YuYappQl5eAxgkmoIf5msBWqYwPN91G48LV6Ue+nQfX7QPkiH96FU01hr63QaWDYIC5Tjox8xmDF19mdyByJX0A1JPsYcgNarUxtr8N94xoZGjrbBh5Tw2EKCEdhiA+NJv+6PEWx45LUDNVuyM8uDbMQQfiIcx8+cPO/rnmgXS+m1OPawfZo19fT3krsCPEdVU79JPfKLLH/sx/cKsW0cahn2WLsVNAN7LYZbU53/WQZFeywIp3QkfrAOhMn7bk9hU+SlOcFrEB10MByKEOWnCuZhaUGQ== Received: from BY3PR10CA0012.namprd10.prod.outlook.com (2603:10b6:a03:255::17) by DS0PR12MB9275.namprd12.prod.outlook.com (2603:10b6:8:1be::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.22; Thu, 26 Jun 2025 12:02:51 +0000 Received: from CY4PEPF0000EE3A.namprd03.prod.outlook.com (2603:10b6:a03:255:cafe::4e) by BY3PR10CA0012.outlook.office365.com (2603:10b6:a03:255::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.17 via Frontend Transport; Thu, 26 Jun 2025 12:02:51 +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 CY4PEPF0000EE3A.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.14 via Frontend Transport; Thu, 26 Jun 2025 12:02:51 +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; Thu, 26 Jun 2025 05:02:31 -0700 Received: from nvidia.com (10.126.230.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; Thu, 26 Jun 2025 05:02:30 -0700 From: Xueming Li To: Kaiwen Deng CC: Xueming Li , Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix xstats name' has been queued to stable release 23.11.5 Date: Thu, 26 Jun 2025 20:00:29 +0800 Message-ID: <20250626120145.27369-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626120145.27369-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: CY4PEPF0000EE3A:EE_|DS0PR12MB9275:EE_ X-MS-Office365-Filtering-Correlation-Id: 44704b4e-b194-46d6-ee0e-08ddb4a9601d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EGNyy/3fTfo9TpPESvUdgvKsecSxp+HVBeo6aNR+rwxnzKKEGfClSoX3Fclq?= =?us-ascii?Q?9HblwQquJmZrOutvai4trRv3+Z/46bcRAdSZuGyjLUkv+oy6/vkkNQeINC5i?= =?us-ascii?Q?xuMtwYmgv6/ubGPi8Wx4OgY+pEMu6KziJlwDbp/+x9VJOph8NKKZBQThMIGh?= =?us-ascii?Q?/caa0g9lKTKdjGfnVcXyJOpol7Y5qvV1gRmmh2+30S58kz3ilFpGBtldHUtW?= =?us-ascii?Q?ExJBqyry2XuC7MfjmZRx6a7sNA+EkmCdEm6VgdfDpGpUmq/Bs4AgAGoFAjnX?= =?us-ascii?Q?WzNJ4gNKj3NwwSiuD92+KpDruGTnpJDvc8zuX8uo8Xn3iBtDwCGwXi6jX0id?= =?us-ascii?Q?ImxkalVbt9/j6DidJA75rrn1CfHAAs1o4c/QAtOEGfDDVoPS5VdZiSabp2gb?= =?us-ascii?Q?g1OCIMnyT/eap8Ajj1qcK9cFyKeTXJP/pzaAdHvJQcOjEwm4Y6zYb8fS5SSu?= =?us-ascii?Q?/oFtPvU9PjnznkSkOY3RaARhWf9ilIJPFCh62tWN7WVWK27HPveOypWr+luQ?= =?us-ascii?Q?/bdasn8oW/X8C0LP9oc7F4hdElmSt73iLU9Q24kwtjwbiptpfBSqDN2Lfqqz?= =?us-ascii?Q?/AhrpwAtbTIVggXa65ayp+2bh83eAyDktoN0W7AEtopOy4rN6ZW/q7Kw5TC7?= =?us-ascii?Q?KPmLmJaLERtpFez8KOVF4NTqE8b5PakNSeZYJR+PKnLOACHbH0zPBrT+WiF3?= =?us-ascii?Q?cLn0mTyIz8A6x61dTx9G/eQSX7bl7KoAjYQIx16E3NznDjtPQolujBIfn82v?= =?us-ascii?Q?UYlFZ8+2HvXSu6xXy5HejklMvWo8A9c7hCpy27teM8+vwKNVJYGWFhWOsmZ9?= =?us-ascii?Q?54o/vpn55tG5wtX4KnfRq0nAT+bThQrRWYwhLSsl8ib6CTjndO2Xvi+MVfrY?= =?us-ascii?Q?niiOoE5esdUK1e3T1MxUQ8q/bEJjh/ys7d92515sQ/b0obL/jN1r9y4qV6qc?= =?us-ascii?Q?IYgfNF8NVU7z4DFkM7E7Np0l7hrAvcyVtTeewm3bMfYBa0G3E72wUoy66iTv?= =?us-ascii?Q?SDw+PK/dnYqsSfcbCKaaTUaEa/MW8jJhb+XR1KvNQwgkWZH3QKTJD9WejHg/?= =?us-ascii?Q?Ml5NHmHytxTHHW1UgpDytF3Ut/YexwTniYY70NLRrDUzMsBrhUOfnu0M+3MK?= =?us-ascii?Q?9kac6GjJSsqBHVwCiwfEUnu7/yw9WGklV1alNtPuL7s0egZt1IBcA9sVmaue?= =?us-ascii?Q?SgG0vER0zdkx+rsiaTTmdqGu7/dNrW6aEHphxSVHxK2ew+cHlxFov/xkmHPg?= =?us-ascii?Q?ekE7HM4uYmGBLfHHr2RCa4gh9ZLEt/X2yPaETFRC3yxvUlAfH9v1+o4LeWRc?= =?us-ascii?Q?UY+WbftPCVQ1LvkcrDh4RTMeLdIKKJYnCO4ALZt8a6e3iUCilIjUq+fdDyYw?= =?us-ascii?Q?lw+ASlmElfslEZZ7CvE8Fo2j+lmZdC9sBrlIFZmQIp0XXWrJ82j92KA4DP6d?= =?us-ascii?Q?/bo2ErB7i6CCzbU/jfo5y3vfk37c3/9uQ7Vw/eqGjZR9vRBBAOJtw4GdgmNU?= =?us-ascii?Q?OckvUAGb2LNXw9kRileTS1GRhJtTUIipRzHq1wxgf/kb7qJ2jZ/1QH66mQ?= =?us-ascii?Q?=3D=3D?= 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)(1800799024)(36860700013)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jun 2025 12:02:51.0908 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44704b4e-b194-46d6-ee0e-08ddb4a9601d 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: CY4PEPF0000EE3A.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9275 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 06/28/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=3f77572528306b28192cc03fbf3117f383100d2d Thanks. Xueming Li --- >From 3f77572528306b28192cc03fbf3117f383100d2d Mon Sep 17 00:00:00 2001 From: Kaiwen Deng Date: Thu, 10 Apr 2025 13:52:46 +0800 Subject: [PATCH] net/e1000: fix xstats name Cc: Xueming Li [ upstream commit 9303834c26ec7b3fb91f84d2c953ce4dae3073fb ] The igb and igc xstats names need to be corrected: tx_size_1023_to_max_packets should be tx_size_1024_to_max_packets. Fixes: 38552317dcef ("igb: add extended stats") Fixes: e6defdfddc3b ("net/igc: enable statistics") Signed-off-by: Kaiwen Deng Acked-by: Bruce Richardson --- drivers/net/e1000/igb_ethdev.c | 2 +- drivers/net/igc/igc_ethdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index c83ce5bc80..b7fdbef56e 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -479,7 +479,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = { {"tx_size_256_to_511_packets", offsetof(struct e1000_hw_stats, ptc511)}, {"tx_size_512_to_1023_packets", offsetof(struct e1000_hw_stats, ptc1023)}, - {"tx_size_1023_to_max_packets", offsetof(struct e1000_hw_stats, + {"tx_size_1024_to_max_packets", offsetof(struct e1000_hw_stats, ptc1522)}, {"tx_multicast_packets", offsetof(struct e1000_hw_stats, mptc)}, {"tx_broadcast_packets", offsetof(struct e1000_hw_stats, bptc)}, diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index bc8e0e127c..16967f2149 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -177,7 +177,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { {"tx_size_256_to_511_packets", offsetof(struct igc_hw_stats, ptc511)}, {"tx_size_512_to_1023_packets", offsetof(struct igc_hw_stats, ptc1023)}, - {"tx_size_1023_to_max_packets", offsetof(struct igc_hw_stats, + {"tx_size_1024_to_max_packets", offsetof(struct igc_hw_stats, ptc1522)}, {"tx_multicast_packets", offsetof(struct igc_hw_stats, mptc)}, {"tx_broadcast_packets", offsetof(struct igc_hw_stats, bptc)}, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-26 19:59:18.118271813 +0800 +++ 0009-net-e1000-fix-xstats-name.patch 2025-06-26 19:59:17.194418052 +0800 @@ -1 +1 @@ -From 9303834c26ec7b3fb91f84d2c953ce4dae3073fb Mon Sep 17 00:00:00 2001 +From 3f77572528306b28192cc03fbf3117f383100d2d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 9303834c26ec7b3fb91f84d2c953ce4dae3073fb ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -16,2 +18,2 @@ - drivers/net/intel/e1000/igb_ethdev.c | 2 +- - drivers/net/intel/e1000/igc_ethdev.c | 2 +- + drivers/net/e1000/igb_ethdev.c | 2 +- + drivers/net/igc/igc_ethdev.c | 2 +- @@ -20,5 +22,5 @@ -diff --git a/drivers/net/intel/e1000/igb_ethdev.c b/drivers/net/intel/e1000/igb_ethdev.c -index cbd2f15f5f..40f453c8d9 100644 ---- a/drivers/net/intel/e1000/igb_ethdev.c -+++ b/drivers/net/intel/e1000/igb_ethdev.c -@@ -486,7 +486,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = { +diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c +index c83ce5bc80..b7fdbef56e 100644 +--- a/drivers/net/e1000/igb_ethdev.c ++++ b/drivers/net/e1000/igb_ethdev.c +@@ -479,7 +479,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = { @@ -33,7 +35,7 @@ -diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c -index e712cfcf7c..68444e4fba 100644 ---- a/drivers/net/intel/e1000/igc_ethdev.c -+++ b/drivers/net/intel/e1000/igc_ethdev.c -@@ -181,7 +181,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { - {"tx_size_256_to_511_packets", offsetof(struct e1000_hw_stats, ptc511)}, - {"tx_size_512_to_1023_packets", offsetof(struct e1000_hw_stats, +diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c +index bc8e0e127c..16967f2149 100644 +--- a/drivers/net/igc/igc_ethdev.c ++++ b/drivers/net/igc/igc_ethdev.c +@@ -177,7 +177,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { + {"tx_size_256_to_511_packets", offsetof(struct igc_hw_stats, ptc511)}, + {"tx_size_512_to_1023_packets", offsetof(struct igc_hw_stats, @@ -41,2 +43,2 @@ -- {"tx_size_1023_to_max_packets", offsetof(struct e1000_hw_stats, -+ {"tx_size_1024_to_max_packets", offsetof(struct e1000_hw_stats, +- {"tx_size_1023_to_max_packets", offsetof(struct igc_hw_stats, ++ {"tx_size_1024_to_max_packets", offsetof(struct igc_hw_stats, @@ -44,2 +46,2 @@ - {"tx_multicast_packets", offsetof(struct e1000_hw_stats, mptc)}, - {"tx_broadcast_packets", offsetof(struct e1000_hw_stats, bptc)}, + {"tx_multicast_packets", offsetof(struct igc_hw_stats, mptc)}, + {"tx_broadcast_packets", offsetof(struct igc_hw_stats, bptc)},