patch 'app/testpmd: fix variable shadowing' has been queued to stable release 24.11.5
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Feb 20 15:55:24 CET 2026
Hi,
FYI, your patch has been queued to stable release 24.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 02/22/26. 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/79f41c1e4edfaff39759490e9a8acaa126f228d9
Thanks.
Luca Boccassi
---
>From 79f41c1e4edfaff39759490e9a8acaa126f228d9 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Wed, 14 Jan 2026 15:44:32 +0000
Subject: [PATCH] app/testpmd: fix variable shadowing
[ upstream commit e3ac7daed962aecbd5fe66de9c1be09f3c47dd2b ]
Rename or remove shadowed variables so as to build cleanly with
-Wshadow.
Fixes: 55c074f3ba1d ("app/testpmd: support GENEVE option item")
Fixes: 9213c50e36fa ("app/testpmd: support GTP PSC option in raw sets")
Fixes: 26b7259a798d ("app/testpmd: support GRE option flow item")
Fixes: d2121ceccd29 ("app/testpmd: rework display of Rx descriptors")
Fixes: 90c263867b00 ("app/testpmd: enhance command-line parsing")
Fixes: 62d3216d6194 ("app/testpmd: add latency statistics calculation")
Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
app/test-pmd/cmdline_flow.c | 42 ++++++++++++++++++-------------------
app/test-pmd/config.c | 15 +++++--------
app/test-pmd/parameters.c | 38 ++++++++++++++++-----------------
app/test-pmd/testpmd.c | 2 +-
4 files changed, 45 insertions(+), 52 deletions(-)
diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index c5ae8300d6..b7f137ae32 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -13972,7 +13972,7 @@ cmd_set_raw_parsed(const struct buffer *in)
data_tail = data + ACTION_RAW_ENCAP_MAX_DATA;
for (i = n - 1 ; i >= 0; --i) {
const struct rte_flow_item_gtp *gtp;
- const struct rte_flow_item_geneve_opt *opt;
+ const struct rte_flow_item_geneve_opt *geneve_opt;
struct rte_flow_item_ipv6_routing_ext *ext;
item = in->args.vc.pattern + i;
@@ -14044,16 +14044,16 @@ cmd_set_raw_parsed(const struct buffer *in)
size = sizeof(struct rte_geneve_hdr);
break;
case RTE_FLOW_ITEM_TYPE_GENEVE_OPT:
- opt = (const struct rte_flow_item_geneve_opt *)
+ geneve_opt = (const struct rte_flow_item_geneve_opt *)
item->spec;
size = offsetof(struct rte_flow_item_geneve_opt,
option_len) + sizeof(uint8_t);
- if (opt->option_len && opt->data) {
- *total_size += opt->option_len *
+ if (geneve_opt->option_len && geneve_opt->data) {
+ *total_size += geneve_opt->option_len *
sizeof(uint32_t);
rte_memcpy(data_tail - (*total_size),
- opt->data,
- opt->option_len * sizeof(uint32_t));
+ geneve_opt->data,
+ geneve_opt->option_len * sizeof(uint32_t));
}
break;
case RTE_FLOW_ITEM_TYPE_L2TPV3OIP:
@@ -14103,7 +14103,7 @@ cmd_set_raw_parsed(const struct buffer *in)
goto error;
} else {
const struct rte_flow_item_gtp_psc
- *opt = item->spec;
+ *gtp_opt = item->spec;
struct rte_gtp_psc_generic_hdr *hdr;
size_t hdr_size = RTE_ALIGN(sizeof(*hdr),
sizeof(int32_t));
@@ -14111,7 +14111,7 @@ cmd_set_raw_parsed(const struct buffer *in)
*total_size += hdr_size;
hdr = (typeof(hdr))(data_tail - (*total_size));
memset(hdr, 0, hdr_size);
- *hdr = opt->hdr;
+ *hdr = gtp_opt->hdr;
hdr->ext_hdr_len = 1;
gtp_psc = i;
size = 0;
@@ -14133,25 +14133,25 @@ cmd_set_raw_parsed(const struct buffer *in)
size = 0;
if (item->spec) {
const struct rte_flow_item_gre_opt
- *opt = item->spec;
- if (opt->checksum_rsvd.checksum) {
+ *gre_opt = item->spec;
+ if (gre_opt->checksum_rsvd.checksum) {
*total_size +=
- sizeof(opt->checksum_rsvd);
+ sizeof(gre_opt->checksum_rsvd);
rte_memcpy(data_tail - (*total_size),
- &opt->checksum_rsvd,
- sizeof(opt->checksum_rsvd));
+ &gre_opt->checksum_rsvd,
+ sizeof(gre_opt->checksum_rsvd));
}
- if (opt->key.key) {
- *total_size += sizeof(opt->key.key);
+ if (gre_opt->key.key) {
+ *total_size += sizeof(gre_opt->key.key);
rte_memcpy(data_tail - (*total_size),
- &opt->key.key,
- sizeof(opt->key.key));
+ &gre_opt->key.key,
+ sizeof(gre_opt->key.key));
}
- if (opt->sequence.sequence) {
- *total_size += sizeof(opt->sequence.sequence);
+ if (gre_opt->sequence.sequence) {
+ *total_size += sizeof(gre_opt->sequence.sequence);
rte_memcpy(data_tail - (*total_size),
- &opt->sequence.sequence,
- sizeof(opt->sequence.sequence));
+ &gre_opt->sequence.sequence,
+ sizeof(gre_opt->sequence.sequence));
}
}
proto = 0x2F;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 5fccb677c1..5c50301d84 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -4469,15 +4469,9 @@ ring_rxd_display_dword(union igb_ring_dword dword)
static void
ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
-#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
portid_t port_id,
-#else
- __rte_unused portid_t port_id,
-#endif
uint16_t desc_id)
{
- struct igb_ring_desc_16_bytes *ring =
- (struct igb_ring_desc_16_bytes *)ring_mz->addr;
#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
int ret;
struct rte_eth_dev_info dev_info;
@@ -4507,12 +4501,15 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
}
#endif
/* 16 bytes RX descriptor */
+ struct igb_ring_desc_16_bytes *ring =
+ (struct igb_ring_desc_16_bytes *)ring_mz->addr;
ring[desc_id].lo_dword.dword =
rte_le_to_cpu_64(ring[desc_id].lo_dword.dword);
ring_rxd_display_dword(ring[desc_id].lo_dword);
ring[desc_id].hi_dword.dword =
rte_le_to_cpu_64(ring[desc_id].hi_dword.dword);
ring_rxd_display_dword(ring[desc_id].hi_dword);
+ RTE_SET_USED(port_id);
}
static void
@@ -4721,7 +4718,6 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
{
struct rte_eth_rss_conf rss_conf = {0};
uint8_t rss_key[RSS_HASH_KEY_LENGTH];
- uint64_t rss_hf;
uint8_t i;
int diag;
struct rte_eth_dev_info dev_info;
@@ -4762,8 +4758,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
}
return;
}
- rss_hf = rss_conf.rss_hf;
- if (rss_hf == 0) {
+ if (rss_conf.rss_hf == 0) {
printf("RSS disabled\n");
return;
}
@@ -4775,7 +4770,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
}
printf("RSS functions:\n");
- rss_types_display(rss_hf, TESTPMD_RSS_TYPES_CHAR_NUM_PER_LINE);
+ rss_types_display(rss_conf.rss_hf, TESTPMD_RSS_TYPES_CHAR_NUM_PER_LINE);
if (!show_rss_key)
return;
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 7b31b94542..2cb0825b97 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -769,42 +769,42 @@ parse_ringnuma_config(const char *q_arg)
}
static int
-parse_event_printing_config(const char *optarg, int enable)
+parse_event_printing_config(const char *event_arg, int enable)
{
uint32_t mask = 0;
- if (!strcmp(optarg, "unknown"))
+ if (!strcmp(event_arg, "unknown"))
mask = UINT32_C(1) << RTE_ETH_EVENT_UNKNOWN;
- else if (!strcmp(optarg, "intr_lsc"))
+ else if (!strcmp(event_arg, "intr_lsc"))
mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_LSC;
- else if (!strcmp(optarg, "queue_state"))
+ else if (!strcmp(event_arg, "queue_state"))
mask = UINT32_C(1) << RTE_ETH_EVENT_QUEUE_STATE;
- else if (!strcmp(optarg, "intr_reset"))
+ else if (!strcmp(event_arg, "intr_reset"))
mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RESET;
- else if (!strcmp(optarg, "vf_mbox"))
+ else if (!strcmp(event_arg, "vf_mbox"))
mask = UINT32_C(1) << RTE_ETH_EVENT_VF_MBOX;
- else if (!strcmp(optarg, "ipsec"))
+ else if (!strcmp(event_arg, "ipsec"))
mask = UINT32_C(1) << RTE_ETH_EVENT_IPSEC;
- else if (!strcmp(optarg, "macsec"))
+ else if (!strcmp(event_arg, "macsec"))
mask = UINT32_C(1) << RTE_ETH_EVENT_MACSEC;
- else if (!strcmp(optarg, "intr_rmv"))
+ else if (!strcmp(event_arg, "intr_rmv"))
mask = UINT32_C(1) << RTE_ETH_EVENT_INTR_RMV;
- else if (!strcmp(optarg, "dev_probed"))
+ else if (!strcmp(event_arg, "dev_probed"))
mask = UINT32_C(1) << RTE_ETH_EVENT_NEW;
- else if (!strcmp(optarg, "dev_released"))
+ else if (!strcmp(event_arg, "dev_released"))
mask = UINT32_C(1) << RTE_ETH_EVENT_DESTROY;
- else if (!strcmp(optarg, "flow_aged"))
+ else if (!strcmp(event_arg, "flow_aged"))
mask = UINT32_C(1) << RTE_ETH_EVENT_FLOW_AGED;
- else if (!strcmp(optarg, "err_recovering"))
+ else if (!strcmp(event_arg, "err_recovering"))
mask = UINT32_C(1) << RTE_ETH_EVENT_ERR_RECOVERING;
- else if (!strcmp(optarg, "recovery_success"))
+ else if (!strcmp(event_arg, "recovery_success"))
mask = UINT32_C(1) << RTE_ETH_EVENT_RECOVERY_SUCCESS;
- else if (!strcmp(optarg, "recovery_failed"))
+ else if (!strcmp(event_arg, "recovery_failed"))
mask = UINT32_C(1) << RTE_ETH_EVENT_RECOVERY_FAILED;
- else if (!strcmp(optarg, "all"))
+ else if (!strcmp(event_arg, "all"))
mask = ~UINT32_C(0);
else {
- fprintf(stderr, "Invalid event: %s\n", optarg);
+ fprintf(stderr, "Invalid event: %s\n", event_arg);
return -1;
}
if (enable)
@@ -968,11 +968,10 @@ launch_args_parse(int argc, char** argv)
break;
case TESTPMD_OPT_STATS_PERIOD_NUM: {
char *end = NULL;
- unsigned int n;
n = strtoul(optarg, &end, 10);
if ((optarg[0] == '\0') || (end == NULL) ||
- (*end != '\0'))
+ (*end != '\0') || n <= 0 || n >= UINT16_MAX)
rte_exit(EXIT_FAILURE, "Invalid stats-period value\n");
stats_period = n;
@@ -1311,7 +1310,6 @@ launch_args_parse(int argc, char** argv)
break;
case TESTPMD_OPT_HAIRPIN_MODE_NUM: {
char *end = NULL;
- unsigned int n;
errno = 0;
n = strtoul(optarg, &end, 0);
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 0fb18abe79..9c4b8a79eb 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -4564,7 +4564,7 @@ main(int argc, char** argv)
#ifdef RTE_LIB_LATENCYSTATS
if (latencystats_enabled != 0) {
- int ret = rte_latencystats_init(1, NULL);
+ ret = rte_latencystats_init(1, NULL);
if (ret)
fprintf(stderr,
"Warning: latencystats init() returned error %d\n",
--
2.47.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2026-02-20 14:55:44.195383633 +0000
+++ 0022-app-testpmd-fix-variable-shadowing.patch 2026-02-20 14:55:43.196190939 +0000
@@ -1 +1 @@
-From e3ac7daed962aecbd5fe66de9c1be09f3c47dd2b Mon Sep 17 00:00:00 2001
+From 79f41c1e4edfaff39759490e9a8acaa126f228d9 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e3ac7daed962aecbd5fe66de9c1be09f3c47dd2b ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -27 +28 @@
-index 54b247899d..ebc036b14b 100644
+index c5ae8300d6..b7f137ae32 100644
@@ -30 +31 @@
-@@ -14064,7 +14064,7 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -13972,7 +13972,7 @@ cmd_set_raw_parsed(const struct buffer *in)
@@ -39 +40 @@
-@@ -14136,16 +14136,16 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -14044,16 +14044,16 @@ cmd_set_raw_parsed(const struct buffer *in)
@@ -61 +62 @@
-@@ -14195,7 +14195,7 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -14103,7 +14103,7 @@ cmd_set_raw_parsed(const struct buffer *in)
@@ -70 +71 @@
-@@ -14203,7 +14203,7 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -14111,7 +14111,7 @@ cmd_set_raw_parsed(const struct buffer *in)
@@ -79 +80 @@
-@@ -14225,25 +14225,25 @@ cmd_set_raw_parsed(const struct buffer *in)
+@@ -14133,25 +14133,25 @@ cmd_set_raw_parsed(const struct buffer *in)
@@ -119 +120 @@
-index 6ea506254b..b6d194340b 100644
+index 5fccb677c1..5c50301d84 100644
@@ -122 +123 @@
-@@ -4490,15 +4490,9 @@ ring_rxd_display_dword(union igb_ring_dword dword)
+@@ -4469,15 +4469,9 @@ ring_rxd_display_dword(union igb_ring_dword dword)
@@ -126 +127 @@
--#ifndef RTE_NET_INTEL_USE_16BYTE_DESC
+-#ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
@@ -135 +136 @@
- #ifndef RTE_NET_INTEL_USE_16BYTE_DESC
+ #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC
@@ -138 +139 @@
-@@ -4528,12 +4522,15 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
+@@ -4507,12 +4501,15 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
@@ -154 +155 @@
-@@ -4742,7 +4739,6 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
+@@ -4721,7 +4718,6 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
@@ -162 +163 @@
-@@ -4783,8 +4779,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
+@@ -4762,8 +4758,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
@@ -172 +173 @@
-@@ -4796,7 +4791,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
+@@ -4775,7 +4770,7 @@ port_rss_hash_conf_show(portid_t port_id, int show_rss_key, int show_rss_algo)
@@ -182 +183 @@
-index 96973906fd..f2037925c2 100644
+index 7b31b94542..2cb0825b97 100644
@@ -185 +186 @@
-@@ -777,42 +777,42 @@ parse_ringnuma_config(const char *q_arg)
+@@ -769,42 +769,42 @@ parse_ringnuma_config(const char *q_arg)
@@ -245 +246 @@
-@@ -987,11 +987,10 @@ launch_args_parse(int argc, char** argv)
+@@ -968,11 +968,10 @@ launch_args_parse(int argc, char** argv)
@@ -258 +259 @@
-@@ -1339,7 +1338,6 @@ launch_args_parse(int argc, char** argv)
+@@ -1311,7 +1310,6 @@ launch_args_parse(int argc, char** argv)
@@ -267 +268 @@
-index 1fe41d852a..41695afd42 100644
+index 0fb18abe79..9c4b8a79eb 100644
@@ -270 +271 @@
-@@ -4660,7 +4660,7 @@ main(int argc, char** argv)
+@@ -4564,7 +4564,7 @@ main(int argc, char** argv)
More information about the stable
mailing list