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 A8448468E4 for ; Thu, 12 Jun 2025 23:08:04 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A401542E02; Thu, 12 Jun 2025 23:08:04 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 950BA42E0C for ; Thu, 12 Jun 2025 23:08:03 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3a528243636so967568f8f.3 for ; Thu, 12 Jun 2025 14:08:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749762483; x=1750367283; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u8iNNkfZrgahC+NVhyvX2+VKq7LpwAmitfBQd4LSlpU=; b=FCy8IJR39jFCTZANd1wLRAIO8mZabqZpFf1+dSzMsh/aQIi5WwpzdIKQslhwTPkxWO 1HsmpLJrjuZzjHo5SFSDdXlrks702/piFGnprNp3kAOP/N8HAIiUj3woElZgMDBTCDEf 2cK+kgoMnNK77tOMt6PIVnSgRAlLddCqrnxGTdyD7/PlSi9fJomoCqBF9wbE7JfxoxxH lXQOjoiA2PDeOZF31BEP6/XiHjPkU427R+sKryXXZAdiJyyilcqZmPdiba7o+iCugnP0 hwHkCOC8d8JZleV8Lpkd3MZG3ScniO36kvv1m/MOv2cDANMrahvf5vmwXTNowSLu8S8Z WdWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749762483; x=1750367283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u8iNNkfZrgahC+NVhyvX2+VKq7LpwAmitfBQd4LSlpU=; b=iGEVVEvfoYlJ2b+02dRMnpYmQ24INAZzAxAeFwJF3VxYOIs+obSNIiHrEXi1SsTjY4 md5gf1d9rfhGAKkFhSiSwBtyK5H1rx8ywvSdB6DzfPrTo8NDiSRsOqYnyVWmqN1l0Qxt 53BsHdfPQmZeXDqTo7qsDapXD3FhdOq1lMqwJUbbT2YL9pnm+/mnXl+1XAdz0BI47Gye NtuwXAqjYh/0rqoYVcbztR0eUzdvlKZDugq3ijCiy2ccCdO447r6TeY4FtiEUUT1XOO0 GPGXm8QVpW/faZSTlIlZqyLVr876JMI2O6AVi9xZh8DLmyH3ctzxSWLWI/eyCGADGTJc 2AVQ== X-Forwarded-Encrypted: i=1; AJvYcCWctMigStm+eUXJ+JWMzMhhMxIXt6PBJdpNnRlttvW6tZaawItjBw3XtleKt2kpMfi5T+ws4qw=@dpdk.org X-Gm-Message-State: AOJu0YxON2VhamIYLRzOMhnMreiCR+ZeQDE/hty8S2WZaRNA8MYolRex 2bNZLVVnFa+YY16bNC//yNrniUMOO1rgmdUEzf9m4N/Yr2wnihZWR+JLy32ZR5Mr X-Gm-Gg: ASbGnctyFFvqKGbHntP+dtJK32XduW+neMqFAxTKwyfUKA2MmU3H2DCdIGnc37928Eo hUCVupI0J11DEtN4bT3U+xcTaUnit3h8MrQWY8B2OpwmaXpLJQ3mSDtLeM9o3dwsnXQD+XdRc89 9EbKR6BaCI4EmXlEYuWiMUsS6swzdHW85O4mwKSO9RRFZXcB8Orvib9793fIJJFjIKdF8fvhfWv gqqErpOxNSHlUEwe49CjIw3Xes1owLYHIzCClKHweq7XjOJmp5aSV2sVnsiB+/b7NtxfZgiHlJv G/u3ysKbiUsEDSS2IrsiciLnYYlngzlSm4T+tK7YiWbSPvvaGY6yw+iZlzoDl9BmBp+x X-Google-Smtp-Source: AGHT+IESOKC1e3I8PjbWbDQCcnCxZaVA/dyG27BXxlmgvsE3Jog+Iq9AgWTuQIA044PKkMe9BUnmxA== X-Received: by 2002:a05:6000:402b:b0:3a5:2208:41d9 with SMTP id ffacd0b85a97d-3a56877ee33mr568537f8f.40.1749762483043; Thu, 12 Jun 2025 14:08:03 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:f2df:571a:ae4c:bef2]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a568b6debasm369642f8f.93.2025.06.12.14.08.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jun 2025 14:08:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Kaiwen Deng Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix xstats name' has been queued to stable release 22.11.9 Date: Thu, 12 Jun 2025 22:06:27 +0100 Message-ID: <20250612210733.2506558-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250612210733.2506558-1-luca.boccassi@gmail.com> References: <20250612210733.2506558-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.9 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/1a540ead0c9131b2412369634bb4c9b5b2203ee5 Thanks. Luca Boccassi --- >From 1a540ead0c9131b2412369634bb4c9b5b2203ee5 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 79d001e69a..b5df7473cd 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 ce1f425eaf..9c00f8a5f6 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -163,7 +163,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.47.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-06-12 22:06:24.269753345 +0100 +++ 0010-net-e1000-fix-xstats-name.patch 2025-06-12 22:06:23.798043117 +0100 @@ -1 +1 @@ -From 9303834c26ec7b3fb91f84d2c953ce4dae3073fb Mon Sep 17 00:00:00 2001 +From 1a540ead0c9131b2412369634bb4c9b5b2203ee5 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 -@@ -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 79d001e69a..b5df7473cd 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 +34,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 ce1f425eaf..9c00f8a5f6 100644 +--- a/drivers/net/igc/igc_ethdev.c ++++ b/drivers/net/igc/igc_ethdev.c +@@ -163,7 +163,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 +42,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 +45,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)},