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 4654246BAE for ; Fri, 18 Jul 2025 21:38:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3B4A940611; Fri, 18 Jul 2025 21:38:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 79A4C40B8F for ; Fri, 18 Jul 2025 21:38:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752867509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JC8lQWP3H5sKSNGDPk6wtsLqNKe4Zw0kQiJrQfuMqAE=; b=ZyQfTyG81CX1aL2VKMFEpuYKBjyBi2cwsEGvjlZbCRiDbVjdJbpWTYxQSeW8nQoeA1F//t zG+/bMeuX8fnD0lfWQtfJNab/PTsyRp8kpJLuXZmmE7UqSWii1kvt+XMakXIMgWRhvL32A Avzoh5nT7lX1bDE9sZaLnq5MVUQhFwM= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-223-aScWn8IONEuE1a2C6wGlAA-1; Fri, 18 Jul 2025 15:38:27 -0400 X-MC-Unique: aScWn8IONEuE1a2C6wGlAA-1 X-Mimecast-MFC-AGG-ID: aScWn8IONEuE1a2C6wGlAA_1752867506 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 842291800C39; Fri, 18 Jul 2025 19:38:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.44.32.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EEB4E1800288; Fri, 18 Jul 2025 19:38:24 +0000 (UTC) From: Kevin Traynor To: Kaiwen Deng Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix xstats name' has been queued to stable release 24.11.3 Date: Fri, 18 Jul 2025 20:31:35 +0100 Message-ID: <20250718193247.1008129-161-ktraynor@redhat.com> In-Reply-To: <20250718193247.1008129-1-ktraynor@redhat.com> References: <20250718193247.1008129-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Nu1v64LP9P3UsRvNS74aTqUJ43LRv3TOf0RqaZdkJkM_1752867506 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 24.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/23/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/6d6bc1ee499253919cfc97b178c728787e01f37a Thanks. Kevin --- >From 6d6bc1ee499253919cfc97b178c728787e01f37a 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 [ 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 266d74b444..2b7a7f54d2 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -486,5 +486,5 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = { {"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)}, diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index bf9143ccd8..6bd0885a03 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -178,5 +178,5 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { {"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)}, -- 2.50.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-18 20:29:16.613660801 +0100 +++ 0161-net-e1000-fix-xstats-name.patch 2025-07-18 20:29:11.162908042 +0100 @@ -1 +1 @@ -From 9303834c26ec7b3fb91f84d2c953ce4dae3073fb Mon Sep 17 00:00:00 2001 +From 6d6bc1ee499253919cfc97b178c728787e01f37a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9303834c26ec7b3fb91f84d2c953ce4dae3073fb ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,2 +17,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 +21,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 -@@ -487,5 +487,5 @@ 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 266d74b444..2b7a7f54d2 100644 +--- a/drivers/net/e1000/igb_ethdev.c ++++ b/drivers/net/e1000/igb_ethdev.c +@@ -486,5 +486,5 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = { @@ -31,6 +32,6 @@ -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 -@@ -182,5 +182,5 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { - {"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 bf9143ccd8..6bd0885a03 100644 +--- a/drivers/net/igc/igc_ethdev.c ++++ b/drivers/net/igc/igc_ethdev.c +@@ -178,5 +178,5 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = { + {"tx_size_512_to_1023_packets", offsetof(struct igc_hw_stats, @@ -38,2 +39,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, @@ -41 +42 @@ - {"tx_multicast_packets", offsetof(struct e1000_hw_stats, mptc)}, + {"tx_multicast_packets", offsetof(struct igc_hw_stats, mptc)},