* [RFC PATCH v2 01/33] eal: add more min/max helpers
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
@ 2025-11-07 15:49 ` Bruce Richardson
2025-11-07 15:49 ` [RFC PATCH v2 02/33] eal: fix variable shadowing Bruce Richardson
` (32 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:49 UTC (permalink / raw)
To: dev; +Cc: Stephen Hemminger, Bruce Richardson, Tyler Retzlaff
From: Stephen Hemminger <stephen@networkplumber.org>
Add RTE_MIN3() to handle case of RTE_MIN(RTE_MIN(...)), and similarly
add RTE_MAX3(). Change name of local temporary variables in RTE_MAX()
to allow for combinations of RTE_MIN(RTE_MAX(...)) without causing
shadow declaration warnings.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/eal/include/rte_common.h | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index 9e7d84f929..36400e8e43 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -799,6 +799,19 @@ __extension__ typedef uint64_t RTE_MARKER64[0];
_a < _b ? _a : _b; \
})
+/**
+ * Macro to return the minimum of three numbers
+ */
+#define RTE_MIN3(a, b, c) \
+ __extension__ ({ \
+ typeof (a) _a = (a); \
+ typeof (b) _b = (b); \
+ typeof (c) _c = (c); \
+ _a < _b ? (_a < _c ? _a : _c) \
+ : (_b < _c ? _b : _c); \
+ })
+
+
/**
* Macro to return the minimum of two numbers
*
@@ -814,9 +827,21 @@ __extension__ typedef uint64_t RTE_MARKER64[0];
*/
#define RTE_MAX(a, b) \
__extension__ ({ \
- typeof (a) _a = (a); \
- typeof (b) _b = (b); \
- _a > _b ? _a : _b; \
+ typeof (a) _ax = (a); \
+ typeof (b) _bx = (b); \
+ _ax > _bx ? _ax : _bx; \
+ })
+
+/**
+ * Macro to return the maximum of three numbers
+ */
+#define RTE_MAX3(a, b, c) \
+ __extension__ ({ \
+ typeof (a) _a = (a); \
+ typeof (b) _b = (b); \
+ typeof (c) _c = (c); \
+ _a > _b ? (_a > _c ? _a : _c) \
+ : (_b > _c ? _b : _c); \
})
/**
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 02/33] eal: fix variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
2025-11-07 15:49 ` [RFC PATCH v2 01/33] eal: add more min/max helpers Bruce Richardson
@ 2025-11-07 15:49 ` Bruce Richardson
2025-11-07 15:49 ` [RFC PATCH v2 03/33] ethdev: fix variable shadowing issues Bruce Richardson
` (31 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:49 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Chenbo Xia, Nipun Gupta,
Tyler Retzlaff, Jerin Jacob, Sunil Kumar Kori, Anatoly Burakov,
David Marchand, Chengwen Feng
Fix a range of variable shadowing issues flagged by -Wshadow:
* In tracing code, rename local variables to remove shadowing in the
code. The file-level variable "trace" is kept as-is, but the shorter
name "t" is used for function-local vars.
* In options code, rename the "args" variable to "out_args" in the
telemetry callback, to fix shadowing issues there.
* In malloc code, remove the redefinition of aligned_end, and just use
the already-defined local variable in the last block of code in the
function.
Bugzilla ID: 1742
Bugzilla ID: 1743
Fixes: 29d985cad8db ("trace: implement memory allocation")
Fixes: f330b01df996 ("eal: define the parameters in argparse format")
Fixes: 4d8bdd8b56a1 ("malloc: fix ASan handling for unmapped memory")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/bus/pci/windows/pci.c | 1 -
lib/eal/common/eal_common_options.c | 22 +++----
lib/eal/common/eal_common_trace.c | 89 ++++++++++++++---------------
lib/eal/common/malloc_heap.c | 2 +-
4 files changed, 56 insertions(+), 58 deletions(-)
diff --git a/drivers/bus/pci/windows/pci.c b/drivers/bus/pci/windows/pci.c
index 6f6f368cb7..a5ce3b51f7 100644
--- a/drivers/bus/pci/windows/pci.c
+++ b/drivers/bus/pci/windows/pci.c
@@ -433,7 +433,6 @@ pci_scan_one(HDEVINFO dev_info, PSP_DEVINFO_DATA device_info_data)
rte_pci_add_device(dev);
} else {
struct rte_pci_device *dev2 = NULL;
- int ret;
TAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) {
ret = rte_pci_addr_cmp(&dev->addr, &dev2->addr);
diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c
index b1fb670ea0..c53d10fd27 100644
--- a/lib/eal/common/eal_common_options.c
+++ b/lib/eal/common/eal_common_options.c
@@ -339,21 +339,21 @@ int
handle_eal_info_request(const char *cmd, const char *params __rte_unused,
struct rte_tel_data *d)
{
- char **args;
+ char **out_args;
int used = 0;
int i = 0;
if (strcmp(cmd, EAL_PARAM_REQ) == 0)
- args = eal_args;
+ out_args = eal_args;
else
- args = eal_app_args;
+ out_args = eal_app_args;
rte_tel_data_start_array(d, RTE_TEL_STRING_VAL);
- if (args == NULL || args[0] == NULL)
+ if (out_args == NULL || out_args[0] == NULL)
return 0;
- for ( ; args[i] != NULL; i++)
- used = rte_tel_data_add_array_string(d, args[i]);
+ for ( ; out_args[i] != NULL; i++)
+ used = rte_tel_data_add_array_string(d, out_args[i]);
return used;
}
@@ -429,21 +429,21 @@ eal_clean_saved_args(void)
#endif /* !RTE_EXEC_ENV_WINDOWS */
static int
-eal_option_device_add(enum rte_devtype type, const char *optarg)
+eal_option_device_add(enum rte_devtype type, const char *arg)
{
struct device_option *devopt;
- size_t optlen;
+ size_t arglen;
int ret;
- optlen = strlen(optarg) + 1;
- devopt = calloc(1, sizeof(*devopt) + optlen);
+ arglen = strlen(arg) + 1;
+ devopt = calloc(1, sizeof(*devopt) + arglen);
if (devopt == NULL) {
EAL_LOG(ERR, "Unable to allocate device option");
return -ENOMEM;
}
devopt->type = type;
- ret = strlcpy(devopt->arg, optarg, optlen);
+ ret = strlcpy(devopt->arg, arg, arglen);
if (ret < 0) {
EAL_LOG(ERR, "Unable to copy device option");
free(devopt);
diff --git a/lib/eal/common/eal_common_trace.c b/lib/eal/common/eal_common_trace.c
index be041c45bb..2ef5637cdd 100644
--- a/lib/eal/common/eal_common_trace.c
+++ b/lib/eal/common/eal_common_trace.c
@@ -270,33 +270,32 @@ trace_point_dump(FILE *f, struct trace_point *tp)
static void
trace_lcore_mem_dump(FILE *f)
{
- struct trace *trace = trace_obj_get();
+ struct trace *t = trace_obj_get();
struct __rte_trace_header *header;
uint32_t count;
- rte_spinlock_lock(&trace->lock);
- if (trace->nb_trace_mem_list == 0)
+ rte_spinlock_lock(&t->lock);
+ if (t->nb_trace_mem_list == 0)
goto out;
- fprintf(f, "nb_trace_mem_list = %d\n", trace->nb_trace_mem_list);
+ fprintf(f, "nb_trace_mem_list = %d\n", t->nb_trace_mem_list);
fprintf(f, "\nTrace mem info\n--------------\n");
- for (count = 0; count < trace->nb_trace_mem_list; count++) {
- header = trace->lcore_meta[count].mem;
+ for (count = 0; count < t->nb_trace_mem_list; count++) {
+ header = t->lcore_meta[count].mem;
fprintf(f, "\tid %d, mem=%p, area=%s, lcore_id=%d, name=%s\n",
count, header,
- trace_area_to_string(trace->lcore_meta[count].area),
+ trace_area_to_string(t->lcore_meta[count].area),
header->stream_header.lcore_id,
header->stream_header.thread_name);
}
out:
- rte_spinlock_unlock(&trace->lock);
+ rte_spinlock_unlock(&t->lock);
}
RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_trace_dump, 20.05)
void
rte_trace_dump(FILE *f)
{
- struct trace_point_head *tp_list = trace_list_head_get();
- struct trace *trace = trace_obj_get();
+ struct trace *t = trace_obj_get();
struct trace_point *tp;
fprintf(f, "\nGlobal info\n-----------\n");
@@ -304,13 +303,13 @@ rte_trace_dump(FILE *f)
rte_trace_is_enabled() ? "enabled" : "disabled");
fprintf(f, "mode = %s\n",
trace_mode_to_string(rte_trace_mode_get()));
- fprintf(f, "dir = %s\n", trace->dir);
- fprintf(f, "buffer len = %d\n", trace->buff_len);
- fprintf(f, "number of trace points = %d\n", trace->nb_trace_points);
+ fprintf(f, "dir = %s\n", t->dir);
+ fprintf(f, "buffer len = %d\n", t->buff_len);
+ fprintf(f, "number of trace points = %d\n", t->nb_trace_points);
trace_lcore_mem_dump(f);
fprintf(f, "\nTrace point info\n----------------\n");
- STAILQ_FOREACH(tp, tp_list, next)
+ STAILQ_FOREACH(tp, trace_list_head_get(), next)
trace_point_dump(f, tp);
}
@@ -331,7 +330,7 @@ RTE_EXPORT_EXPERIMENTAL_SYMBOL(__rte_trace_mem_per_thread_alloc, 20.05)
void
__rte_trace_mem_per_thread_alloc(void)
{
- struct trace *trace = trace_obj_get();
+ struct trace *t = trace_obj_get();
struct __rte_trace_header *header;
uint32_t count;
@@ -341,30 +340,30 @@ __rte_trace_mem_per_thread_alloc(void)
if (RTE_PER_LCORE(trace_mem))
return;
- rte_spinlock_lock(&trace->lock);
+ rte_spinlock_lock(&t->lock);
- count = trace->nb_trace_mem_list;
+ count = t->nb_trace_mem_list;
/* Allocate room for storing the thread trace mem meta */
- trace->lcore_meta = realloc(trace->lcore_meta,
- sizeof(trace->lcore_meta[0]) * (count + 1));
+ t->lcore_meta = realloc(t->lcore_meta,
+ sizeof(t->lcore_meta[0]) * (count + 1));
/* Provide dummy space for fast path to consume */
- if (trace->lcore_meta == NULL) {
+ if (t->lcore_meta == NULL) {
trace_crit("trace mem meta memory realloc failed");
header = NULL;
goto fail;
}
/* First attempt from huge page */
- header = eal_malloc_no_trace(NULL, trace_mem_sz(trace->buff_len), 8);
+ header = eal_malloc_no_trace(NULL, trace_mem_sz(t->buff_len), 8);
if (header) {
- trace->lcore_meta[count].area = TRACE_AREA_HUGEPAGE;
+ t->lcore_meta[count].area = TRACE_AREA_HUGEPAGE;
goto found;
}
/* Second attempt from heap with proper alignment */
- size_t mem_size = trace_mem_sz(trace->buff_len);
+ size_t mem_size = trace_mem_sz(t->buff_len);
void *aligned_ptr = NULL;
int ret = posix_memalign(&aligned_ptr, 8, mem_size);
header = (ret == 0) ? aligned_ptr : NULL;
@@ -376,14 +375,14 @@ __rte_trace_mem_per_thread_alloc(void)
}
/* Second attempt from heap is success */
- trace->lcore_meta[count].area = TRACE_AREA_HEAP;
+ t->lcore_meta[count].area = TRACE_AREA_HEAP;
/* Initialize the trace header */
found:
header->offset = 0;
- header->len = trace->buff_len;
+ header->len = t->buff_len;
header->stream_header.magic = TRACE_CTF_MAGIC;
- rte_uuid_copy(header->stream_header.uuid, trace->uuid);
+ rte_uuid_copy(header->stream_header.uuid, t->uuid);
header->stream_header.lcore_id = rte_lcore_id();
/* Store the thread name */
@@ -392,11 +391,11 @@ __rte_trace_mem_per_thread_alloc(void)
thread_get_name(rte_thread_self(), name,
__RTE_TRACE_EMIT_STRING_LEN_MAX);
- trace->lcore_meta[count].mem = header;
- trace->nb_trace_mem_list++;
+ t->lcore_meta[count].mem = header;
+ t->nb_trace_mem_list++;
fail:
RTE_PER_LCORE(trace_mem) = header;
- rte_spinlock_unlock(&trace->lock);
+ rte_spinlock_unlock(&t->lock);
}
static void
@@ -411,7 +410,7 @@ trace_mem_per_thread_free_unlocked(struct thread_mem_meta *meta)
void
trace_mem_per_thread_free(void)
{
- struct trace *trace = trace_obj_get();
+ struct trace *t = trace_obj_get();
struct __rte_trace_header *header;
uint32_t count;
@@ -419,37 +418,37 @@ trace_mem_per_thread_free(void)
if (header == NULL)
return;
- rte_spinlock_lock(&trace->lock);
- for (count = 0; count < trace->nb_trace_mem_list; count++) {
- if (trace->lcore_meta[count].mem == header)
+ rte_spinlock_lock(&t->lock);
+ for (count = 0; count < t->nb_trace_mem_list; count++) {
+ if (t->lcore_meta[count].mem == header)
break;
}
- if (count != trace->nb_trace_mem_list) {
- struct thread_mem_meta *meta = &trace->lcore_meta[count];
+ if (count != t->nb_trace_mem_list) {
+ struct thread_mem_meta *meta = &t->lcore_meta[count];
trace_mem_per_thread_free_unlocked(meta);
- if (count != trace->nb_trace_mem_list - 1) {
+ if (count != t->nb_trace_mem_list - 1) {
memmove(meta, meta + 1,
sizeof(*meta) *
- (trace->nb_trace_mem_list - count - 1));
+ (t->nb_trace_mem_list - count - 1));
}
- trace->nb_trace_mem_list--;
+ t->nb_trace_mem_list--;
}
- rte_spinlock_unlock(&trace->lock);
+ rte_spinlock_unlock(&t->lock);
}
void
trace_mem_free(void)
{
- struct trace *trace = trace_obj_get();
+ struct trace *t = trace_obj_get();
uint32_t count;
- rte_spinlock_lock(&trace->lock);
- for (count = 0; count < trace->nb_trace_mem_list; count++) {
- trace_mem_per_thread_free_unlocked(&trace->lcore_meta[count]);
+ rte_spinlock_lock(&t->lock);
+ for (count = 0; count < t->nb_trace_mem_list; count++) {
+ trace_mem_per_thread_free_unlocked(&t->lcore_meta[count]);
}
- trace->nb_trace_mem_list = 0;
- rte_spinlock_unlock(&trace->lock);
+ t->nb_trace_mem_list = 0;
+ rte_spinlock_unlock(&t->lock);
}
RTE_EXPORT_EXPERIMENTAL_SYMBOL(__rte_trace_point_emit_field, 20.05)
diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 13a56e490e..39240c261c 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -1044,9 +1044,9 @@ malloc_heap_free(struct malloc_elem *elem)
/* if we unmapped some memory, we need to do additional work for ASan */
if (unmapped) {
void *asan_end = RTE_PTR_ADD(asan_ptr, asan_data_len);
- void *aligned_end = RTE_PTR_ADD(aligned_start, aligned_len);
void *aligned_trailer = RTE_PTR_SUB(aligned_start,
MALLOC_ELEM_TRAILER_LEN);
+ aligned_end = RTE_PTR_ADD(aligned_start, aligned_len);
/*
* There was a memory area that was unmapped. This memory area
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 03/33] ethdev: fix variable shadowing issues
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
2025-11-07 15:49 ` [RFC PATCH v2 01/33] eal: add more min/max helpers Bruce Richardson
2025-11-07 15:49 ` [RFC PATCH v2 02/33] eal: fix variable shadowing Bruce Richardson
@ 2025-11-07 15:49 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 04/33] eventdev: " Bruce Richardson
` (30 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:49 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Thomas Monjalon, Andrew Rybchenko,
Ferruh Yigit, Declan Doherty, Rosen Xu, Huisong Li,
Konstantin Ananyev
Remove unneeded extra variable definitions, and rename variables as
necessary to ensure clean compile with -Wshadow warnings enabled.
Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs")
Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/ethdev/ethdev_driver.c | 6 +++---
lib/ethdev/rte_ethdev.c | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/ethdev/ethdev_driver.c b/lib/ethdev/ethdev_driver.c
index f89562b237..2ec665be0f 100644
--- a/lib/ethdev/ethdev_driver.c
+++ b/lib/ethdev/ethdev_driver.c
@@ -310,7 +310,7 @@ RTE_EXPORT_INTERNAL_SYMBOL(rte_eth_dev_create)
int
rte_eth_dev_create(struct rte_device *device, const char *name,
size_t priv_data_size,
- ethdev_bus_specific_init ethdev_bus_specific_init,
+ ethdev_bus_specific_init bus_specific_init,
void *bus_init_params,
ethdev_init_t ethdev_init, void *init_params)
{
@@ -358,8 +358,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
ethdev->device = device;
- if (ethdev_bus_specific_init) {
- retval = ethdev_bus_specific_init(ethdev, bus_init_params);
+ if (bus_specific_init) {
+ retval = bus_specific_init(ethdev, bus_init_params);
if (retval) {
RTE_ETHDEV_LOG_LINE(ERR,
"ethdev bus specific initialisation failed");
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index c6fe0d5165..2659e8d9eb 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -2471,7 +2471,6 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
if (local_conf.offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO) {
uint32_t overhead_len;
uint32_t max_rx_pktlen;
- int ret;
overhead_len = eth_dev_get_overhead_len(dev_info.max_rx_pktlen,
dev_info.max_mtu);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 04/33] eventdev: fix variable shadowing issues
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (2 preceding siblings ...)
2025-11-07 15:49 ` [RFC PATCH v2 03/33] ethdev: fix variable shadowing issues Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 05/33] net: remove shadowed variable Bruce Richardson
` (29 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Naga Harish K S V, Jerin Jacob,
Nikhil Rao, Jay Jayatheerthan, Mattias Rönnblom
Rename a macro variable to avoid shadowing conflicts, and reduce the
scope of another variable for the same reason.
Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
Fixes: 7f33abd49b26 ("eventdev/eth_rx: support appropriately report idle")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/eventdev/rte_event_eth_rx_adapter.c | 5 ++---
lib/eventdev/rte_event_eth_tx_adapter.c | 8 ++++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index 994f256322..d564e14b72 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -1191,7 +1191,6 @@ rxa_intr_thread(void *arg)
static inline bool
rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
{
- uint32_t n;
uint32_t nb_rx = 0;
int rxq_empty;
struct eth_event_enqueue_buffer *buf;
@@ -1260,9 +1259,9 @@ rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
if (rxa_shared_intr(dev_info, queue)) {
uint16_t i;
uint16_t nb_queues;
+ uint32_t n = 0;
nb_queues = dev_info->dev->data->nb_rx_queues;
- n = 0;
for (i = dev_info->next_q_idx; i < nb_queues; i++) {
uint8_t enq_buffer_full;
@@ -1289,7 +1288,7 @@ rxa_intr_ring_dequeue(struct event_eth_rx_adapter *rx_adapter)
RTE_MAX_RXTX_INTR_VEC_ID - 1 :
0;
} else {
- n = rxa_eth_rx(rx_adapter, port, queue, nb_rx,
+ uint32_t n = rxa_eth_rx(rx_adapter, port, queue, nb_rx,
rx_adapter->max_nb_rx,
&rxq_empty, buf, stats);
rx_adapter->qd_valid = !rxq_empty;
diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index 83b6af0955..91c7be55c7 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -64,11 +64,11 @@ do { \
#define TXA_CHECK_OR_ERR_RET(id) \
do {\
- int ret; \
+ int _ret; \
RTE_EVENT_ETH_TX_ADAPTER_ID_VALID_OR_ERR_RET((id), -EINVAL); \
- ret = txa_init(); \
- if (ret != 0) \
- return ret; \
+ _ret = txa_init(); \
+ if (_ret != 0) \
+ return _ret; \
if (!txa_adapter_exist((id))) \
return -EINVAL; \
} while (0)
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 05/33] net: remove shadowed variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (3 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 04/33] eventdev: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 06/33] pipeline: fix variable shadowing Bruce Richardson
` (28 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Konstantin Ananyev, Jasvinder Singh,
David Coyle, Mairtin o Loingsigh, Pablo de Lara
The "mask" local variable shadowed a global definition. The local var
was only used on two lines as a temporary value to pass the return value
of one function as a parameter to another. Therefore, we can remove the
shadowing issue by removing the variable.
Fixes: 17a937baed3e ("net: add CRC AVX512 implementation")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/net/net_crc_avx512.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/lib/net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
index d18eb96971..7cd681b1cd 100644
--- a/lib/net/net_crc_avx512.c
+++ b/lib/net/net_crc_avx512.c
@@ -180,7 +180,6 @@ crc32_eth_calc_vpclmulqdq(const uint8_t *data, uint32_t data_len, uint32_t crc,
__m512i temp, k;
__m512i qw0 = _mm512_set1_epi64(0), qw1, qw2, qw3;
__m512i fold0, fold1, fold2, fold3;
- __mmask16 mask;
uint32_t n = 0;
int reduction = 0;
@@ -260,8 +259,7 @@ crc32_eth_calc_vpclmulqdq(const uint8_t *data, uint32_t data_len, uint32_t crc,
res = _mm_xor_si128(res, d);
} else {
res = _mm_cvtsi32_si128(crc);
- mask = byte_len_to_mask_table[data_len];
- d = _mm_maskz_loadu_epi8(mask, data);
+ d = _mm_maskz_loadu_epi8(byte_len_to_mask_table[data_len], data);
res = _mm_xor_si128(res, d);
if (data_len > 3) {
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 06/33] pipeline: fix variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (4 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 05/33] net: remove shadowed variable Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 07/33] table: fix issues with " Bruce Richardson
` (27 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Cristian Dumitrescu, Kamalakannan R
Remove unnecessary inner variables and rename others in order to remove
variable shadowing warnings from the code.
Fixes: ea5ab65f5743 ("pipeline: relax table match field requirements")
Fixes: cdaa937d3eaa ("pipeline: support selector table")
Fixes: 5f3e6104227c ("pipeline: prepare for variable size headers")
Fixes: 724f3ef422e9 ("pipeline: generate custom instruction functions")
Fixes: 68b95704a6a3 ("pipeline: add API for shared library-based pipeline build")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/pipeline/rte_swx_ctl.c | 11 +++++------
lib/pipeline/rte_swx_pipeline.c | 21 ++++++++++-----------
lib/pipeline/rte_swx_pipeline_internal.h | 10 +++++-----
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/lib/pipeline/rte_swx_ctl.c b/lib/pipeline/rte_swx_ctl.c
index 4e9bb842a1..d24764cbbe 100644
--- a/lib/pipeline/rte_swx_ctl.c
+++ b/lib/pipeline/rte_swx_ctl.c
@@ -210,7 +210,7 @@ table_params_get(struct rte_swx_ctl_pipeline *ctl, uint32_t table_id)
uint32_t key_size = 0, key_offset = 0, action_data_size = 0, i;
if (table->info.n_match_fields) {
- uint32_t n_match_fields_em = 0, i;
+ uint32_t n_match_fields_em = 0;
/* Find first (smallest offset) and last (biggest offset) match fields. */
first = &table->mf[0];
@@ -855,22 +855,21 @@ selector_free(struct rte_swx_ctl_pipeline *ctl)
for (i = 0; i < ctl->info.n_selectors; i++) {
struct selector *s = &ctl->selectors[i];
- uint32_t i;
/* selector_fields. */
free(s->selector_fields);
/* groups. */
if (s->groups)
- for (i = 0; i < s->info.n_groups_max; i++)
- selector_group_members_free(s, i);
+ for (uint32_t j = 0; j < s->info.n_groups_max; j++)
+ selector_group_members_free(s, j);
free(s->groups);
/* pending_groups. */
if (s->pending_groups)
- for (i = 0; i < s->info.n_groups_max; i++)
- selector_pending_group_members_free(s, i);
+ for (uint32_t j = 0; j < s->info.n_groups_max; j++)
+ selector_pending_group_members_free(s, j);
free(s->pending_groups);
diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 2193bc4ebf..a9157815e4 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -1515,10 +1515,10 @@ static int
header_build(struct rte_swx_pipeline *p)
{
struct header *h;
- uint32_t n_bytes = 0, i;
+ uint32_t total_bytes = 0, i;
TAILQ_FOREACH(h, &p->headers, node) {
- n_bytes += h->st->n_bits / 8;
+ total_bytes += h->st->n_bits / 8;
}
for (i = 0; i < RTE_SWX_PIPELINE_THREADS_MAX; i++) {
@@ -1533,10 +1533,10 @@ header_build(struct rte_swx_pipeline *p)
sizeof(struct header_out_runtime));
CHECK(t->headers_out, ENOMEM);
- t->header_storage = calloc(1, n_bytes);
+ t->header_storage = calloc(1, total_bytes);
CHECK(t->header_storage, ENOMEM);
- t->header_out_storage = calloc(1, n_bytes);
+ t->header_out_storage = calloc(1, total_bytes);
CHECK(t->header_out_storage, ENOMEM);
TAILQ_FOREACH(h, &p->headers, node) {
@@ -14031,7 +14031,6 @@ instruction_group_list_create(struct rte_swx_pipeline *p)
for (i = 0; i < p->n_instructions; i++) {
struct instruction_data *data = &p->instruction_data[i];
- struct instruction_group *g;
uint32_t j;
/* Continue when the current instruction is not a jump destination. */
@@ -14746,11 +14745,11 @@ rte_swx_pipeline_build_from_lib(struct rte_swx_pipeline **pipeline,
/* Action instructions. */
TAILQ_FOREACH(a, &p->actions, node) {
- char name[RTE_SWX_NAME_SIZE * 2];
+ char action_name[RTE_SWX_NAME_SIZE * 2];
- snprintf(name, sizeof(name), "action_%s_run", a->name);
+ snprintf(action_name, sizeof(action_name), "action_%s_run", a->name);
- p->action_funcs[a->id] = dlsym(lib, name);
+ p->action_funcs[a->id] = dlsym(lib, action_name);
if (!p->action_funcs[a->id]) {
status = -EINVAL;
goto free;
@@ -14765,14 +14764,14 @@ rte_swx_pipeline_build_from_lib(struct rte_swx_pipeline **pipeline,
}
TAILQ_FOREACH(g, igl, node) {
- char name[RTE_SWX_NAME_SIZE * 2];
+ char pipeline_name[RTE_SWX_NAME_SIZE * 2];
if (g->first_instr_id == g->last_instr_id)
continue;
- snprintf(name, sizeof(name), "pipeline_func_%u", g->group_id);
+ snprintf(pipeline_name, sizeof(pipeline_name), "pipeline_func_%u", g->group_id);
- g->func = dlsym(lib, name);
+ g->func = dlsym(lib, pipeline_name);
if (!g->func) {
status = -EINVAL;
goto free;
diff --git a/lib/pipeline/rte_swx_pipeline_internal.h b/lib/pipeline/rte_swx_pipeline_internal.h
index df864ea066..f527857861 100644
--- a/lib/pipeline/rte_swx_pipeline_internal.h
+++ b/lib/pipeline/rte_swx_pipeline_internal.h
@@ -1772,14 +1772,14 @@ emit_handler(struct thread *t)
if ((t->n_headers_out == 2) &&
(h1->ptr + h1->n_bytes == t->ptr) &&
(h0->ptr == h0->ptr0)) {
- uint32_t offset;
+ uint32_t ofs;
TRACE("Emit handler: header encapsulation.\n");
- offset = h0->n_bytes + h1->n_bytes;
- memcpy(t->ptr - offset, h0->ptr, h0->n_bytes);
- t->pkt.offset -= offset;
- t->pkt.length += offset;
+ ofs = h0->n_bytes + h1->n_bytes;
+ memcpy(t->ptr - ofs, h0->ptr, h0->n_bytes);
+ t->pkt.offset -= ofs;
+ t->pkt.length += ofs;
return;
}
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 07/33] table: fix issues with variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (5 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 06/33] pipeline: fix variable shadowing Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 08/33] power: rename variable to eliminate shadowing Bruce Richardson
` (26 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Cristian Dumitrescu,
Wathsala Vithanage, Ashwin Sekhar T K, Pablo de Lara
Building table library with -Wshadow reveals many warnings from shadowed
variables. Fix these by removing defintions, or renaming variables as
appropriate.
Fixes: 0c06fa3bfa8c ("table: support learner tables")
Fixes: d0a00966618b ("table: add exact match SWX table")
Fixes: 1e29a162482c ("table: separate out x86-specific from LRU header")
Fixes: 8aa327214ceb ("table: hash")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/table/rte_lru.h | 38 +++++++++++++++----------------
lib/table/rte_lru_arm64.h | 14 ++++++------
lib/table/rte_lru_x86.h | 4 ++--
lib/table/rte_swx_table_em.c | 2 --
lib/table/rte_swx_table_learner.c | 4 ++--
lib/table/rte_table_hash_key16.c | 4 +---
lib/table/rte_table_hash_key32.c | 4 +---
lib/table/rte_table_hash_key8.c | 4 +---
8 files changed, 33 insertions(+), 41 deletions(-)
diff --git a/lib/table/rte_lru.h b/lib/table/rte_lru.h
index 28aab12923..1436425e16 100644
--- a/lib/table/rte_lru.h
+++ b/lib/table/rte_lru.h
@@ -41,33 +41,33 @@ while (0)
#define lru_update(bucket, mru_val) \
do { \
- uint64_t x, pos, x0, x1, x2, mask; \
+ uint64_t _x, _pos, _x0, _x1, _x2, _mask; \
\
- x = bucket->lru_list; \
+ _x = bucket->lru_list; \
\
- pos = 4; \
- if ((x >> 48) == ((uint64_t) mru_val)) \
- pos = 3; \
+ _pos = 4; \
+ if ((_x >> 48) == ((uint64_t) mru_val)) \
+ _pos = 3; \
\
- if (((x >> 32) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
- pos = 2; \
+ if (((_x >> 32) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
+ _pos = 2; \
\
- if (((x >> 16) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
- pos = 1; \
+ if (((_x >> 16) & 0xFFFFLLU) == ((uint64_t) mru_val)) \
+ _pos = 1; \
\
- if ((x & 0xFFFFLLU) == ((uint64_t) mru_val)) \
- pos = 0; \
+ if ((_x & 0xFFFFLLU) == ((uint64_t) mru_val)) \
+ _pos = 0; \
\
\
- pos <<= 4; \
- mask = (~0LLU) << pos; \
- x0 = x & (~mask); \
- x1 = (x >> 16) & mask; \
- x2 = (x << (48 - pos)) & (0xFFFFLLU << 48); \
- x = x0 | x1 | x2; \
+ _pos <<= 4; \
+ _mask = (~0LLU) << _pos; \
+ _x0 = _x & (~_mask); \
+ _x1 = (_x >> 16) & _mask; \
+ _x2 = (_x << (48 - _pos)) & (0xFFFFLLU << 48); \
+ _x = _x0 | _x1 | _x2; \
\
- if (pos != 64) \
- bucket->lru_list = x; \
+ if (_pos != 64) \
+ bucket->lru_list = _x; \
} while (0)
#elif (RTE_TABLE_HASH_LRU_STRATEGY == 2) || (RTE_TABLE_HASH_LRU_STRATEGY == 3)
diff --git a/lib/table/rte_lru_arm64.h b/lib/table/rte_lru_arm64.h
index f9a4678ee0..817b791b6e 100644
--- a/lib/table/rte_lru_arm64.h
+++ b/lib/table/rte_lru_arm64.h
@@ -40,16 +40,16 @@ f_lru_pos(uint64_t lru_list)
#define lru_update(bucket, mru_val) \
do { \
- const uint64_t orvals[] = {0xFFFFLLU, 0xFFFFLLU << 16, \
+ const uint64_t _orvals[] = {0xFFFFLLU, 0xFFFFLLU << 16, \
0xFFFFLLU << 32, 0xFFFFLLU << 48, 0LLU}; \
- const uint64_t decs[] = {0x1000100010001LLU, 0}; \
- uint64x1_t lru = vdup_n_u64(bucket->lru_list); \
- uint64x1_t vdec = vdup_n_u64(decs[mru_val>>2]); \
+ const uint64_t _decs[] = {0x1000100010001LLU, 0}; \
+ uint64x1_t _lru = vdup_n_u64(bucket->lru_list); \
+ uint64x1_t _vdec = vdup_n_u64(_decs[mru_val>>2]); \
bucket->lru_list = vget_lane_u64(vreinterpret_u64_u16( \
- vsub_u16(vreinterpret_u16_u64(lru), \
- vreinterpret_u16_u64(vdec))), \
+ vsub_u16(vreinterpret_u16_u64(_lru), \
+ vreinterpret_u16_u64(_vdec))), \
0); \
- bucket->lru_list |= orvals[mru_val]; \
+ bucket->lru_list |= _orvals[mru_val]; \
} while (0)
#endif
diff --git a/lib/table/rte_lru_x86.h b/lib/table/rte_lru_x86.h
index 93f4a136a8..de74513653 100644
--- a/lib/table/rte_lru_x86.h
+++ b/lib/table/rte_lru_x86.h
@@ -50,9 +50,9 @@ do { \
/* Find the minimum value (first zero word, if it's in there) */\
__m128i d = _mm_minpos_epu16(c); \
/* Second word is the index to found word (first word is the value) */\
- unsigned int pos = _mm_extract_epi16(d, 1); \
+ unsigned int _pos = _mm_extract_epi16(d, 1); \
/* move the recently used location to top of list */ \
- __m128i k = _mm_shuffle_epi8(b, *((__m128i *) &masks[2 * pos]));\
+ __m128i k = _mm_shuffle_epi8(b, *((__m128i *) &masks[2 * _pos]));\
/* Finally, update the original list with the reordered data */ \
bucket->lru_list = _mm_extract_epi64(k, 0); \
/* Phwew! */ \
diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
index 4ec54cb635..c408ea6fc3 100644
--- a/lib/table/rte_swx_table_em.c
+++ b/lib/table/rte_swx_table_em.c
@@ -621,8 +621,6 @@ table_create(struct rte_swx_table_params *params,
return t;
TAILQ_FOREACH(entry, entries, node) {
- int status;
-
status = table_add(t, entry);
if (status) {
table_free(t);
diff --git a/lib/table/rte_swx_table_learner.c b/lib/table/rte_swx_table_learner.c
index 2d61bceeaf..3680bf26c1 100644
--- a/lib/table/rte_swx_table_learner.c
+++ b/lib/table/rte_swx_table_learner.c
@@ -411,13 +411,13 @@ rte_swx_table_learner_lookup(void *table,
for (i = 0; i < TABLE_KEYS_PER_BUCKET; i++) {
uint64_t time = b->time[i];
uint32_t sig = b->sig[i];
- uint8_t *key = table_bucket_key_get(t, b, i);
+ uint8_t *k = table_bucket_key_get(t, b, i);
time <<= 32;
if ((time > input_time) &&
(sig == m->input_sig) &&
- t->params.keycmp_func(key, m->input_key, t->params.key_size)) {
+ t->params.keycmp_func(k, m->input_key, t->params.key_size)) {
uint64_t *data = table_bucket_data_get(t, b, i);
/* Hit. */
diff --git a/lib/table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
index da24a7985d..5b69106dd7 100644
--- a/lib/table/rte_table_hash_key16.c
+++ b/lib/table/rte_table_hash_key16.c
@@ -1133,12 +1133,10 @@ rte_table_hash_lookup_key16_ext(
uint64_t buckets_mask_next = 0;
for ( ; buckets_mask; ) {
- uint64_t pkt_mask;
uint32_t pkt_index;
pkt_index = rte_ctz64(buckets_mask);
- pkt_mask = 1LLU << pkt_index;
- buckets_mask &= ~pkt_mask;
+ buckets_mask &= ~(1LLU << pkt_index);
lookup_grinder(pkt_index, buckets, keys, pkts_mask_out,
entries, buckets_mask_next, f);
diff --git a/lib/table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
index 297931a2a5..0963f57828 100644
--- a/lib/table/rte_table_hash_key32.c
+++ b/lib/table/rte_table_hash_key32.c
@@ -1167,12 +1167,10 @@ rte_table_hash_lookup_key32_ext(
uint64_t buckets_mask_next = 0;
for ( ; buckets_mask; ) {
- uint64_t pkt_mask;
uint32_t pkt_index;
pkt_index = rte_ctz64(buckets_mask);
- pkt_mask = 1LLU << pkt_index;
- buckets_mask &= ~pkt_mask;
+ buckets_mask &= ~(1LLU << pkt_index);
lookup_grinder(pkt_index, buckets, keys, pkts_mask_out,
entries, buckets_mask_next, f);
diff --git a/lib/table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
index 746863082f..5e9dcf10ee 100644
--- a/lib/table/rte_table_hash_key8.c
+++ b/lib/table/rte_table_hash_key8.c
@@ -1101,12 +1101,10 @@ rte_table_hash_lookup_key8_ext(
uint64_t buckets_mask_next = 0;
for ( ; buckets_mask; ) {
- uint64_t pkt_mask;
uint32_t pkt_index;
pkt_index = rte_ctz64(buckets_mask);
- pkt_mask = 1LLU << pkt_index;
- buckets_mask &= ~pkt_mask;
+ buckets_mask &= ~(1LLU << pkt_index);
lookup_grinder(pkt_index, buckets, keys, pkts_mask_out,
entries, buckets_mask_next, f);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 08/33] power: rename variable to eliminate shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (6 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 07/33] table: fix issues with " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 09/33] pcapng: rename variable to fix shadowing Bruce Richardson
` (25 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Anatoly Burakov, David Hunt,
Sivaprasad Tummala, Kevin Laatz, Ray Kinsella
The "pause_duration" variable is a global and then shadowed as a local
var in clb_pause. Rename the local variable to allow building with
"-Wshadow".
Fixes: 4a8fbc28e431 ("power: add get/set pause duration API")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/power/rte_power_pmd_mgmt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/power/rte_power_pmd_mgmt.c b/lib/power/rte_power_pmd_mgmt.c
index 6cacc562c2..a4d53aac2a 100644
--- a/lib/power/rte_power_pmd_mgmt.c
+++ b/lib/power/rte_power_pmd_mgmt.c
@@ -337,7 +337,7 @@ clb_pause(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused,
struct queue_list_entry *queue_conf = arg;
struct pmd_core_cfg *lcore_conf;
const bool empty = nb_rx == 0;
- uint32_t pause_duration = rte_power_pmd_mgmt_get_pause_duration();
+ const uint32_t duration = rte_power_pmd_mgmt_get_pause_duration();
lcore_conf = RTE_LCORE_VAR(lcore_cfgs);
@@ -357,11 +357,11 @@ clb_pause(uint16_t port_id __rte_unused, uint16_t qidx __rte_unused,
if (global_data.intrinsics_support.power_pause) {
const uint64_t cur = rte_rdtsc();
const uint64_t wait_tsc =
- cur + global_data.tsc_per_us * pause_duration;
+ cur + global_data.tsc_per_us * duration;
rte_power_pause(wait_tsc);
} else {
uint64_t i;
- for (i = 0; i < global_data.pause_per_us * pause_duration; i++)
+ for (i = 0; i < global_data.pause_per_us * duration; i++)
rte_pause();
}
}
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 09/33] pcapng: rename variable to fix shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (7 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 08/33] power: rename variable to eliminate shadowing Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 10/33] telemetry: make socket handler typedef private Bruce Richardson
` (24 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Reshma Pattan, Stephen Hemminger
The "len" variable is shadowed within a function, so rename inner use to
the more descriptive "filter_len" to fix the issue.
Fixes: d1da6d0d04c7 ("pcapng: require per-interface information")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/pcapng/rte_pcapng.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index 21bc94cea1..2cc9e2040d 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -296,16 +296,15 @@ rte_pcapng_add_interface(rte_pcapng_t *self, uint16_t port, uint16_t link_type,
opt = pcapng_add_option(opt, PCAPNG_IFB_HARDWARE,
ifhw, strlen(ifhw));
if (filter) {
- size_t len;
+ const size_t filter_len = strlen(filter) + 1;
- len = strlen(filter) + 1;
opt->code = PCAPNG_IFB_FILTER;
- opt->length = len;
+ opt->length = filter_len;
/* Encoding is that the first octet indicates string vs BPF */
opt->data[0] = 0;
memcpy(opt->data + 1, filter, strlen(filter));
- opt = (struct pcapng_option *)((uint8_t *)opt + pcapng_optlen(len));
+ opt = (struct pcapng_option *)((uint8_t *)opt + pcapng_optlen(filter_len));
}
opt = pcapng_add_option(opt, PCAPNG_OPT_END, NULL, 0);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 10/33] telemetry: make socket handler typedef private
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (8 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 09/33] pcapng: rename variable to fix shadowing Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 11/33] bbdev: fix variable shadowing Bruce Richardson
` (23 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Ciara Power, Keith Wiles
The socket handler typedef, just called "handler" does not belong in the
public namespace, especially since it is unprefixed. Rename to
"telemetry_sock_handler" and move to internal header.
Doing so also clears shadowing warnings in dmadev library, when it is
built with -Wshadow.
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/telemetry/rte_telemetry.h | 11 -----------
lib/telemetry/telemetry.c | 2 +-
lib/telemetry/telemetry_internal.h | 11 +++++++++++
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/telemetry/rte_telemetry.h b/lib/telemetry/rte_telemetry.h
index b9662a5213..0a58e518f7 100644
--- a/lib/telemetry/rte_telemetry.h
+++ b/lib/telemetry/rte_telemetry.h
@@ -325,17 +325,6 @@ typedef int (*telemetry_cb)(const char *cmd, const char *params,
typedef int (*telemetry_arg_cb)(const char *cmd, const char *params, void *arg,
struct rte_tel_data *info);
-/**
- * Used for handling data received over a telemetry socket.
- *
- * @param sock_id
- * ID for the socket to be used by the handler.
- *
- * @return
- * Void.
- */
-typedef void * (*handler)(void *sock_id);
-
/**
* Used when registering a command and callback function with telemetry.
*
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 1cbbffbf3f..cf4324421d 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -47,7 +47,7 @@ struct cmd_callback {
struct socket {
int sock;
char path[sizeof(((struct sockaddr_un *)0)->sun_path)];
- handler fn;
+ telemetry_sock_handler fn;
RTE_ATOMIC(uint16_t) *num_clients;
};
static struct socket v2_socket; /* socket for v2 telemetry */
diff --git a/lib/telemetry/telemetry_internal.h b/lib/telemetry/telemetry_internal.h
index b331e9458f..2fd9fbd7c1 100644
--- a/lib/telemetry/telemetry_internal.h
+++ b/lib/telemetry/telemetry_internal.h
@@ -25,6 +25,17 @@ enum rte_telemetry_legacy_data_req {
DATA_REQ
};
+/**
+ * Used for handling data received over a telemetry socket.
+ *
+ * @param sock_id
+ * ID for the socket to be used by the handler.
+ *
+ * @return
+ * Void.
+ */
+typedef void * (*telemetry_sock_handler)(void *sock_id);
+
/**
* This telemetry callback is used when registering a legacy telemetry command.
* It handles getting and formatting stats to be returned to telemetry when
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 11/33] bbdev: fix variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (9 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 10/33] telemetry: make socket handler typedef private Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 12/33] bus/pci: remove shadowed variables Bruce Richardson
` (22 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Nicolas Chautru, Ferruh Yigit, Amr Mokhtar
The "ret" variable is declared twice in rte_bbdev_setup_queues function.
The second declaration is unneeded so remove it.
Fixes: 4935e1e9f76e ("bbdev: introduce wireless base band device lib")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/bbdev/rte_bbdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bbdev/rte_bbdev.c b/lib/bbdev/rte_bbdev.c
index 6c98296bdb..ea644c1f9b 100644
--- a/lib/bbdev/rte_bbdev.c
+++ b/lib/bbdev/rte_bbdev.c
@@ -357,7 +357,7 @@ rte_bbdev_setup_queues(uint16_t dev_id, uint16_t num_queues, int socket_id)
if (dev->data->queues != NULL) {
VALID_FUNC_OR_RET_ERR(dev->dev_ops->queue_release, dev_id);
for (i = 0; i < dev->data->num_queues; i++) {
- int ret = dev->dev_ops->queue_release(dev, i);
+ ret = dev->dev_ops->queue_release(dev, i);
if (ret < 0) {
rte_bbdev_log(ERR,
"Device %u queue %u release failed",
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 12/33] bus/pci: remove shadowed variables
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (10 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 11/33] bbdev: fix variable shadowing Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 13/33] net/intel: rename function param to avoid shadow warnings Bruce Richardson
` (21 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Chenbo Xia, Nipun Gupta,
Anatoly Burakov, Tetsuya Mukawa
Remove two instances where we had duplicate shadowed local variables
called "ret". In each case, we could just remove the inner instance,
since the outer value was not needing to be preserved.
Fixes: 03ba15ca65c1 ("vfio: allow mapping MSI-X BARs if kernel allows it")
Fixes: c0ce0577e84d ("pci: consolidate address comparisons")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/bus/pci/linux/pci.c | 1 -
drivers/bus/pci/linux/pci_vfio.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 66d7e09a6e..2ffac82e94 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -326,7 +326,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
rte_pci_add_device(dev);
} else {
struct rte_pci_device *dev2;
- int ret;
TAILQ_FOREACH(dev2, &rte_pci_bus.device_list, next) {
ret = rte_pci_addr_cmp(&dev->addr, &dev2->addr);
diff --git a/drivers/bus/pci/linux/pci_vfio.c b/drivers/bus/pci/linux/pci_vfio.c
index 8562fdcc6b..242f567ed7 100644
--- a/drivers/bus/pci/linux/pci_vfio.c
+++ b/drivers/bus/pci/linux/pci_vfio.c
@@ -797,7 +797,7 @@ pci_vfio_map_resource_primary(struct rte_pci_device *dev)
}
/* if we found our MSI-X BAR region, check if we can mmap it */
if (vfio_res->msix_table.bar_index != -1) {
- int ret = pci_vfio_msix_is_mappable(vfio_dev_fd,
+ ret = pci_vfio_msix_is_mappable(vfio_dev_fd,
vfio_res->msix_table.bar_index);
if (ret < 0) {
PCI_LOG(ERR, "Couldn't check if MSI-X BAR is mappable");
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 13/33] net/intel: rename function param to avoid shadow warnings
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (11 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 12/33] bus/pci: remove shadowed variables Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 14/33] net/e1000: fix build with shadow warnings enabled Bruce Richardson
` (20 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson
The rx_free_thresh parameter was conflicting with a global value in
testpmd when certain driver-specific files were included in the testpmd
build. Rename the parameter to just "free_thresh" - the "rx" is
unnecessary since the function itself is for Rx queues.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/common/rx.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/common/rx.h b/drivers/net/intel/common/rx.h
index 5012e4fced..80b62ce3d5 100644
--- a/drivers/net/intel/common/rx.h
+++ b/drivers/net/intel/common/rx.h
@@ -228,11 +228,11 @@ ci_rxq_mbuf_initializer(uint16_t port_id)
* Individual drivers may have other further tests beyond this.
*/
static inline bool
-ci_rxq_vec_capable(uint16_t nb_desc, uint16_t rx_free_thresh)
+ci_rxq_vec_capable(uint16_t nb_desc, uint16_t free_thresh)
{
if (!rte_is_power_of_2(nb_desc) ||
- rx_free_thresh < CI_RX_MAX_BURST ||
- (nb_desc % rx_free_thresh) != 0)
+ free_thresh < CI_RX_MAX_BURST ||
+ (nb_desc % free_thresh) != 0)
return false;
return true;
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 14/33] net/e1000: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (12 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 13/33] net/intel: rename function param to avoid shadow warnings Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 15/33] net/i40e: " Bruce Richardson
` (19 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Ivan Ilchenko, Ferruh Yigit, Andrew Rybchenko
Variable "ret" was shadowed within the close function, so rename outer
variable to "retval" to clear the warnings.
Fixes: 62024eb82756 ("ethdev: change stop operation callback to return int")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/e1000/igc_ethdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c
index b9c91d2446..47a91fe38e 100644
--- a/drivers/net/intel/e1000/igc_ethdev.c
+++ b/drivers/net/intel/e1000/igc_ethdev.c
@@ -1313,14 +1313,14 @@ eth_igc_close(struct rte_eth_dev *dev)
struct e1000_hw *hw = IGC_DEV_PRIVATE_HW(dev);
struct igc_adapter *adapter = IGC_DEV_PRIVATE(dev);
int retry = 0;
- int ret = 0;
+ int retval = 0;
PMD_INIT_FUNC_TRACE();
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
if (!adapter->stopped)
- ret = eth_igc_stop(dev);
+ retval = eth_igc_stop(dev);
igc_flow_flush(dev, NULL);
igc_clear_all_filter(dev);
@@ -1343,7 +1343,7 @@ eth_igc_close(struct rte_eth_dev *dev)
/* Reset any pending lock */
igc_reset_swfw_lock(hw);
- return ret;
+ return retval;
}
static void
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 15/33] net/i40e: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (13 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 14/33] net/e1000: fix build with shadow warnings enabled Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 16/33] net/ice: " Bruce Richardson
` (18 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Qi Zhang, Beilei Xing
The local variables defined with the I40E_WRITE_GLB_REG macro are
shadowing other variables. Rename the vars to start with "_" to avoid
this shadowing.
Fixes: 2bedd7277a10 ("net/i40e: print real global changes")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/i40e/i40e_ethdev.h | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_ethdev.h b/drivers/net/intel/i40e/i40e_ethdev.h
index 3fca089d6c..70dc506037 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.h
+++ b/drivers/net/intel/i40e/i40e_ethdev.h
@@ -92,11 +92,11 @@
#define I40E_WRITE_GLB_REG(hw, reg, value) \
do { \
uint32_t ori_val; \
- struct rte_eth_dev *dev; \
- struct rte_eth_dev_data *dev_data; \
+ struct rte_eth_dev *_dev; \
+ struct rte_eth_dev_data *_dev_data; \
ori_val = I40E_READ_REG((hw), (reg)); \
- dev_data = ((struct i40e_adapter *)hw->back)->pf.dev_data; \
- dev = &rte_eth_devices[dev_data->port_id]; \
+ _dev_data = ((struct i40e_adapter *)hw->back)->pf.dev_data; \
+ _dev = &rte_eth_devices[_dev_data->port_id]; \
I40E_PCI_REG_WRITE(I40E_PCI_REG_ADDR((hw), \
(reg)), (value)); \
if (ori_val != value) \
@@ -104,7 +104,7 @@
"i40e device %s changed global " \
"register [0x%08x]. original: 0x%08x, " \
"new: 0x%08x ", \
- (dev->device->name), (reg), \
+ (_dev->device->name), (reg), \
(ori_val), (value)); \
} while (0)
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 16/33] net/ice: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (14 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 15/33] net/i40e: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 17/33] net/cpfl: " Bruce Richardson
` (17 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, stable, Anatoly Burakov, Qi Zhang, Wenjun Wu
The RTE_MIN macro used newly-defined local variables internally, which
means that it had variable shadowing issues when one RTE_MIN call was
used inside another. Fix this for ice driver by using two separate
RTE_MIN calls to have the same effect.
Fixes: 8c03aa5e00f0 ("net/ice: optimize maximum queue number calculation")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/ice/ice_ethdev.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/intel/ice/ice_ethdev.c b/drivers/net/intel/ice/ice_ethdev.c
index 4669eba7c7..d2bd423a69 100644
--- a/drivers/net/intel/ice/ice_ethdev.c
+++ b/drivers/net/intel/ice/ice_ethdev.c
@@ -995,9 +995,9 @@ ice_vsi_config_tc_queue_mapping(struct ice_hw *hw, struct ice_vsi *vsi,
if (vsi->adapter->hw.func_caps.common_cap.num_msix_vectors < 2) {
vsi->nb_qps = 0;
} else {
- vsi->nb_qps = RTE_MIN
- ((uint16_t)vsi->adapter->hw.func_caps.common_cap.num_msix_vectors - 2,
- RTE_MIN(vsi->nb_qps, ICE_MAX_Q_PER_TC));
+ vsi->nb_qps = RTE_MIN(vsi->nb_qps, ICE_MAX_Q_PER_TC);
+ vsi->nb_qps = RTE_MIN(vsi->nb_qps,
+ (uint16_t)vsi->adapter->hw.func_caps.common_cap.num_msix_vectors - 2);
/* cap max QPs to what the HW reports as num-children for each layer.
* Multiply num_children for each layer from the entry_point layer to
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 17/33] net/cpfl: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (15 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 16/33] net/ice: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 18/33] net/ixgbe: " Bruce Richardson
` (16 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Praveen Shetty, Yuying Zhang, Qi Zhang,
Wenjing Qiao, Beilei Xing
Remove unnecessary variable definitions to ensure compiling with
-Wshadow enabled.
Fixes: db042ef09d26 ("net/cpfl: implement FXP rule creation and destroying")
Fixes: 41f20298ee8c ("net/cpfl: parse flow offloading hint from JSON")
Fixes: 3ca8f6b55435 ("net/cpfl: remove devargs from adapter structure")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c | 2 --
drivers/net/intel/cpfl/cpfl_flow_parser.c | 6 +++---
drivers/net/intel/cpfl/cpfl_fxp_rule.h | 2 --
drivers/net/intel/cpfl/cpfl_representor.h | 2 +-
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
index 689ed82f18..361827cb10 100644
--- a/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
+++ b/drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c
@@ -386,8 +386,6 @@ cpfl_fxp_parse_action(struct cpfl_itf *itf,
}
if (mr_action) {
- uint32_t i;
-
for (i = 0; i < rim->mr_num; i++)
if (cpfl_parse_mod_content(itf->adapter, rinfo,
&rim->rules[rim->pr_num + i],
diff --git a/drivers/net/intel/cpfl/cpfl_flow_parser.c b/drivers/net/intel/cpfl/cpfl_flow_parser.c
index a67c773d18..e7deb619ee 100644
--- a/drivers/net/intel/cpfl/cpfl_flow_parser.c
+++ b/drivers/net/intel/cpfl/cpfl_flow_parser.c
@@ -1098,12 +1098,12 @@ cpfl_parse_fieldvectors(struct cpfl_itf *itf, struct cpfl_flow_js_fv *js_fvs, in
fv[2 * offset] = (uint8_t)(temp_fv >> 8);
fv[2 * offset + 1] = (uint8_t)(temp_fv & 0x00ff);
} else if (type == CPFL_FV_TYPE_METADATA) {
- uint16_t type, v_offset, mask;
+ uint16_t v_offset, mask;
- type = js_fv->meta.type;
v_offset = js_fv->meta.offset;
mask = js_fv->meta.mask;
- temp_fv = cpfl_metadata_read16(&itf->adapter->meta, type, v_offset) & mask;
+ temp_fv = cpfl_metadata_read16(&itf->adapter->meta, js_fv->meta.type,
+ v_offset) & mask;
fv[2 * offset] = (uint8_t)(temp_fv & 0x00ff);
fv[2 * offset + 1] = (uint8_t)(temp_fv >> 8);
} else if (type == CPFL_FV_TYPE_PROTOCOL) {
diff --git a/drivers/net/intel/cpfl/cpfl_fxp_rule.h b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
index ed757b80b1..94eab6808c 100644
--- a/drivers/net/intel/cpfl/cpfl_fxp_rule.h
+++ b/drivers/net/intel/cpfl/cpfl_fxp_rule.h
@@ -53,8 +53,6 @@ struct cpfl_rule_info {
};
};
-extern struct cpfl_vport_ext *vport;
-
int cpfl_rule_process(struct cpfl_itf *itf,
struct idpf_ctlq_info *tx_cq,
struct idpf_ctlq_info *rx_cq,
diff --git a/drivers/net/intel/cpfl/cpfl_representor.h b/drivers/net/intel/cpfl/cpfl_representor.h
index d7f6e186f8..5c3d3aa3f6 100644
--- a/drivers/net/intel/cpfl/cpfl_representor.h
+++ b/drivers/net/intel/cpfl/cpfl_representor.h
@@ -21,7 +21,7 @@ struct cpfl_repr_param {
struct cpfl_vport_info *vport_info;
};
-extern struct cpfl_devargs *devargs;
+struct cpfl_devargs;
int cpfl_repr_devargs_process(struct cpfl_adapter_ext *adapter, struct cpfl_devargs *devargs);
int cpfl_repr_create(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 18/33] net/ixgbe: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (16 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 17/33] net/cpfl: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 19/33] app/test-pmd: " Bruce Richardson
` (15 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Anatoly Burakov, Vladimir Medvedkin,
Helin Zhang, Jingjing Wu, Kirill Rybalchenko, Ferruh Yigit
The loop counter "i" was shadowed, with it being used in a macro and
also as a local variable in the function using that macro. Fix the issue
by making "i" a loop-local variable in all contexts.
Fixes: 76c6f89e80d4 ("ixgbe: support new flow director masks")
Fixes: 2c6b19af78e3 ("ethdev: increase flow type limit from 32 to 64")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_fdir.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_fdir.c b/drivers/net/intel/ixgbe/ixgbe_fdir.c
index b6351bc2cf..97ef185583 100644
--- a/drivers/net/intel/ixgbe/ixgbe_fdir.c
+++ b/drivers/net/intel/ixgbe/ixgbe_fdir.c
@@ -67,8 +67,7 @@
#define IPV6_MASK_TO_ADDR(ipv6m, ipaddr) do { \
uint8_t ipv6_addr[16]; \
- uint8_t i; \
- for (i = 0; i < sizeof(ipv6_addr); i++) { \
+ for (uint8_t i = 0; i < sizeof(ipv6_addr); i++) { \
if ((ipv6m) & (1 << i)) \
ipv6_addr[i] = UINT8_MAX; \
else \
@@ -1282,7 +1281,7 @@ ixgbe_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir_info *fdir_info
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct ixgbe_hw_fdir_info *info =
IXGBE_DEV_PRIVATE_TO_FDIR_INFO(dev->data->dev_private);
- uint32_t fdirctrl, max_num, i;
+ uint32_t fdirctrl, max_num;
uint8_t offset;
fdirctrl = IXGBE_READ_REG(hw, IXGBE_FDIRCTRL);
@@ -1317,7 +1316,7 @@ ixgbe_fdir_info_get(struct rte_eth_dev *dev, struct rte_eth_fdir_info *fdir_info
fdir_info->flow_types_mask[0] = 0ULL;
else
fdir_info->flow_types_mask[0] = IXGBE_FDIR_FLOW_TYPES;
- for (i = 1; i < RTE_FLOW_MASK_ARRAY_SIZE; i++)
+ for (uint32_t i = 1; i < RTE_FLOW_MASK_ARRAY_SIZE; i++)
fdir_info->flow_types_mask[i] = 0ULL;
fdir_info->flex_payload_unit = sizeof(uint16_t);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 19/33] app/test-pmd: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (17 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 18/33] net/ixgbe: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 20/33] app/graph: " Bruce Richardson
` (14 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Ori Kam, Aman Singh,
Viacheslav Ovsiienko, Sean Zhang, Jing Chen, Helin Zhang,
Cunming Liang, Ferruh Yigit, David Marchand, Remy Horton,
Reshma Pattan, Harry van Haaren
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")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
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 54b247899d..ebc036b14b 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -14064,7 +14064,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;
@@ -14136,16 +14136,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:
@@ -14195,7 +14195,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));
@@ -14203,7 +14203,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;
@@ -14225,25 +14225,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 3ce2a14a1b..62d7408bc4 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -4490,15 +4490,9 @@ ring_rxd_display_dword(union igb_ring_dword dword)
static void
ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
-#ifndef RTE_NET_INTEL_USE_16BYTE_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_NET_INTEL_USE_16BYTE_DESC
int ret;
struct rte_eth_dev_info dev_info;
@@ -4528,12 +4522,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
@@ -4742,7 +4739,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;
@@ -4783,8 +4779,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;
}
@@ -4796,7 +4791,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 96973906fd..f2037925c2 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -777,42 +777,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)
@@ -987,11 +987,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;
@@ -1339,7 +1338,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 2360da3a48..af724b2ea8 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -4636,7 +4636,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.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 20/33] app/graph: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (18 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 19/33] app/test-pmd: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 21/33] app/pdump: fix warning about shadowed variable Bruce Richardson
` (13 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Sunil Kumar Kori, Rakesh Kudurumalla,
Nithin Dabilpuram, Jerin Jacob
The global variable "conn" conflicted with the local parameter to each
function in the graph conn.c file. To prevent shadowing, use "c" as the
name for the local connection variable throughout the file.
Fixes: 3f90eda5b7fb ("app/graph: add telnet connectivity")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/graph/conn.c | 134 +++++++++++++++++++++++------------------------
1 file changed, 67 insertions(+), 67 deletions(-)
diff --git a/app/graph/conn.c b/app/graph/conn.c
index 44934602c7..c5e1c1ae1b 100644
--- a/app/graph/conn.c
+++ b/app/graph/conn.c
@@ -20,12 +20,12 @@
#define MSG_CMD_TOO_LONG "Command too long."
static int
-data_event_handle(struct conn *conn, int fd_client)
+data_event_handle(struct conn *c, int fd_client)
{
ssize_t len, i, rc = 0;
/* Read input message */
- len = read(fd_client, conn->buf, conn->buf_size);
+ len = read(fd_client, c->buf, c->buf_size);
if (len == -1) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
return 0;
@@ -38,37 +38,37 @@ data_event_handle(struct conn *conn, int fd_client)
/* Handle input messages */
for (i = 0; i < len; i++) {
- if (conn->buf[i] == '\n') {
+ if (c->buf[i] == '\n') {
size_t n;
- conn->msg_in[conn->msg_in_len] = 0;
- conn->msg_out[0] = 0;
+ c->msg_in[c->msg_in_len] = 0;
+ c->msg_out[0] = 0;
- conn->msg_handle(conn->msg_in, conn->msg_out, conn->msg_out_len_max,
- conn->msg_handle_arg);
+ c->msg_handle(c->msg_in, c->msg_out, c->msg_out_len_max,
+ c->msg_handle_arg);
- n = strlen(conn->msg_out);
+ n = strlen(c->msg_out);
if (n) {
- rc = write(fd_client, conn->msg_out, n);
+ rc = write(fd_client, c->msg_out, n);
if (rc == -1)
goto exit;
}
- conn->msg_in_len = 0;
- } else if (conn->msg_in_len < conn->msg_in_len_max) {
- conn->msg_in[conn->msg_in_len] = conn->buf[i];
- conn->msg_in_len++;
+ c->msg_in_len = 0;
+ } else if (c->msg_in_len < c->msg_in_len_max) {
+ c->msg_in[c->msg_in_len] = c->buf[i];
+ c->msg_in_len++;
} else {
rc = write(fd_client, MSG_CMD_TOO_LONG, strlen(MSG_CMD_TOO_LONG));
if (rc == -1)
goto exit;
- conn->msg_in_len = 0;
+ c->msg_in_len = 0;
}
}
/* Write prompt */
- rc = write(fd_client, conn->prompt, strlen(conn->prompt));
+ rc = write(fd_client, c->prompt, strlen(c->prompt));
rc = (rc == -1) ? -1 : 0;
exit:
@@ -76,11 +76,11 @@ data_event_handle(struct conn *conn, int fd_client)
}
static int
-control_event_handle(struct conn *conn, int fd_client)
+control_event_handle(struct conn *c, int fd_client)
{
int rc;
- rc = epoll_ctl(conn->fd_client_group, EPOLL_CTL_DEL, fd_client, NULL);
+ rc = epoll_ctl(c->fd_client_group, EPOLL_CTL_DEL, fd_client, NULL);
if (rc == -1)
goto exit;
@@ -99,7 +99,7 @@ conn_init(struct conn_params *p)
{
int fd_server, fd_client_group, rc;
struct sockaddr_in server_address;
- struct conn *conn = NULL;
+ struct conn *c = NULL;
int reuse = 1;
memset(&server_address, 0, sizeof(server_address));
@@ -115,20 +115,20 @@ conn_init(struct conn_params *p)
goto exit;
/* Memory allocation */
- conn = calloc(1, sizeof(struct conn));
- if (conn == NULL)
+ c = calloc(1, sizeof(struct conn));
+ if (c == NULL)
goto exit;
- conn->welcome = calloc(1, CONN_WELCOME_LEN_MAX + 1);
- conn->prompt = calloc(1, CONN_PROMPT_LEN_MAX + 1);
- conn->buf = calloc(1, p->buf_size);
- conn->msg_in = calloc(1, p->msg_in_len_max + 1);
- conn->msg_out = calloc(1, p->msg_out_len_max + 1);
+ c->welcome = calloc(1, CONN_WELCOME_LEN_MAX + 1);
+ c->prompt = calloc(1, CONN_PROMPT_LEN_MAX + 1);
+ c->buf = calloc(1, p->buf_size);
+ c->msg_in = calloc(1, p->msg_in_len_max + 1);
+ c->msg_out = calloc(1, p->msg_out_len_max + 1);
- if ((conn->welcome == NULL) || (conn->prompt == NULL) || (conn->buf == NULL) ||
- (conn->msg_in == NULL) || (conn->msg_out == NULL)) {
- conn_free(conn);
- conn = NULL;
+ if ((c->welcome == NULL) || (c->prompt == NULL) || (c->buf == NULL) ||
+ (c->msg_in == NULL) || (c->msg_out == NULL)) {
+ conn_free(c);
+ c = NULL;
goto exit;
}
@@ -138,8 +138,8 @@ conn_init(struct conn_params *p)
fd_server = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (fd_server == -1) {
- conn_free(conn);
- conn = NULL;
+ conn_free(c);
+ c = NULL;
goto exit;
}
@@ -161,47 +161,47 @@ conn_init(struct conn_params *p)
goto free;
/* Fill in */
- rte_strscpy(conn->welcome, p->welcome, CONN_WELCOME_LEN_MAX);
- rte_strscpy(conn->prompt, p->prompt, CONN_PROMPT_LEN_MAX);
- conn->buf_size = p->buf_size;
- conn->msg_in_len_max = p->msg_in_len_max;
- conn->msg_out_len_max = p->msg_out_len_max;
- conn->msg_in_len = 0;
- conn->fd_server = fd_server;
- conn->fd_client_group = fd_client_group;
- conn->msg_handle = p->msg_handle;
- conn->msg_handle_arg = p->msg_handle_arg;
+ rte_strscpy(c->welcome, p->welcome, CONN_WELCOME_LEN_MAX);
+ rte_strscpy(c->prompt, p->prompt, CONN_PROMPT_LEN_MAX);
+ c->buf_size = p->buf_size;
+ c->msg_in_len_max = p->msg_in_len_max;
+ c->msg_out_len_max = p->msg_out_len_max;
+ c->msg_in_len = 0;
+ c->fd_server = fd_server;
+ c->fd_client_group = fd_client_group;
+ c->msg_handle = p->msg_handle;
+ c->msg_handle_arg = p->msg_handle_arg;
exit:
- return conn;
+ return c;
free:
- conn_free(conn);
+ conn_free(c);
close(fd_server);
- conn = NULL;
- return conn;
+ c = NULL;
+ return c;
}
void
-conn_free(struct conn *conn)
+conn_free(struct conn *c)
{
- if (conn == NULL)
+ if (c == NULL)
return;
- if (conn->fd_client_group)
- close(conn->fd_client_group);
+ if (c->fd_client_group)
+ close(c->fd_client_group);
- if (conn->fd_server)
- close(conn->fd_server);
+ if (c->fd_server)
+ close(c->fd_server);
- free(conn->msg_out);
- free(conn->msg_in);
- free(conn->prompt);
- free(conn->welcome);
- free(conn);
+ free(c->msg_out);
+ free(c->msg_in);
+ free(c->prompt);
+ free(c->welcome);
+ free(c);
}
int
-conn_req_poll(struct conn *conn)
+conn_req_poll(struct conn *c)
{
struct sockaddr_in client_address;
socklen_t client_address_length;
@@ -209,12 +209,12 @@ conn_req_poll(struct conn *conn)
int fd_client, rc;
/* Check input arguments */
- if (conn == NULL)
+ if (c == NULL)
return -1;
/* Server socket */
client_address_length = sizeof(client_address);
- fd_client = accept4(conn->fd_server, (struct sockaddr *)&client_address,
+ fd_client = accept4(c->fd_server, (struct sockaddr *)&client_address,
&client_address_length, SOCK_NONBLOCK);
if (fd_client == -1) {
if ((errno == EAGAIN) || (errno == EWOULDBLOCK))
@@ -227,20 +227,20 @@ conn_req_poll(struct conn *conn)
event.events = EPOLLIN | EPOLLRDHUP | EPOLLHUP;
event.data.fd = fd_client;
- rc = epoll_ctl(conn->fd_client_group, EPOLL_CTL_ADD, fd_client, &event);
+ rc = epoll_ctl(c->fd_client_group, EPOLL_CTL_ADD, fd_client, &event);
if (rc == -1) {
close(fd_client);
goto exit;
}
/* Client */
- rc = write(fd_client, conn->welcome, strlen(conn->welcome));
+ rc = write(fd_client, c->welcome, strlen(c->welcome));
if (rc == -1) {
close(fd_client);
goto exit;
}
- rc = write(fd_client, conn->prompt, strlen(conn->prompt));
+ rc = write(fd_client, c->prompt, strlen(c->prompt));
if (rc == -1) {
close(fd_client);
goto exit;
@@ -253,17 +253,17 @@ conn_req_poll(struct conn *conn)
}
int
-conn_msg_poll(struct conn *conn)
+conn_msg_poll(struct conn *c)
{
int fd_client, rc, rc_data = 0, rc_control = 0;
struct epoll_event event;
/* Check input arguments */
- if (conn == NULL)
+ if (c == NULL)
return -1;
/* Client group */
- rc = epoll_wait(conn->fd_client_group, &event, 1, 0);
+ rc = epoll_wait(c->fd_client_group, &event, 1, 0);
if ((rc == -1) || rc == 0)
return rc;
@@ -271,11 +271,11 @@ conn_msg_poll(struct conn *conn)
/* Data available */
if (event.events & EPOLLIN)
- rc_data = data_event_handle(conn, fd_client);
+ rc_data = data_event_handle(c, fd_client);
/* Control events */
if (event.events & (EPOLLRDHUP | EPOLLERR | EPOLLHUP))
- rc_control = control_event_handle(conn, fd_client);
+ rc_control = control_event_handle(c, fd_client);
if (rc_data || rc_control)
return -1;
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 21/33] app/pdump: fix warning about shadowed variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (19 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 20/33] app/graph: " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 22/33] app/test-bbdev: use RTE_MAX3 to remove variable shadowing Bruce Richardson
` (12 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, stable, Reshma Pattan, Stephen Hemminger,
Konstantin Ananyev
The variable name "optarg" is a standard global variable in getopt, so
use of that name for function parameters causes shadowing warnings.
Rename the variable to avoid these issues.
Fixes: caa7028276b8 ("app/pdump: add tool for packet capturing")
Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/pdump/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/pdump/main.c b/app/pdump/main.c
index fa85859703..5be382f8ca 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -247,7 +247,7 @@ parse_uint_value(const char *key, const char *value, void *extra_args)
}
static int
-parse_pdump(const char *optarg)
+parse_pdump(const char *arg)
{
struct rte_kvargs *kvlist;
int ret = 0, cnt1, cnt2;
@@ -257,9 +257,9 @@ parse_pdump(const char *optarg)
pt = &pdump_t[num_tuples];
/* initial check for invalid arguments */
- kvlist = rte_kvargs_parse(optarg, valid_pdump_arguments);
+ kvlist = rte_kvargs_parse(arg, valid_pdump_arguments);
if (kvlist == NULL) {
- printf("--pdump=\"%s\": invalid argument passed\n", optarg);
+ printf("--pdump=\"%s\": invalid argument passed\n", arg);
return -1;
}
@@ -268,7 +268,7 @@ parse_pdump(const char *optarg)
cnt2 = rte_kvargs_count(kvlist, PDUMP_PCI_ARG);
if (!((cnt1 == 1 && cnt2 == 0) || (cnt1 == 0 && cnt2 == 1))) {
printf("--pdump=\"%s\": must have either port or "
- "device_id argument\n", optarg);
+ "device_id argument\n", arg);
ret = -1;
goto free_kvlist;
} else if (cnt1 == 1) {
@@ -290,7 +290,7 @@ parse_pdump(const char *optarg)
/* queue parsing and validation */
cnt1 = rte_kvargs_count(kvlist, PDUMP_QUEUE_ARG);
if (cnt1 != 1) {
- printf("--pdump=\"%s\": must have queue argument\n", optarg);
+ printf("--pdump=\"%s\": must have queue argument\n", arg);
ret = -1;
goto free_kvlist;
}
@@ -303,7 +303,7 @@ parse_pdump(const char *optarg)
cnt2 = rte_kvargs_count(kvlist, PDUMP_TX_DEV_ARG);
if (cnt1 == 0 && cnt2 == 0) {
printf("--pdump=\"%s\": must have either rx-dev or "
- "tx-dev argument\n", optarg);
+ "tx-dev argument\n", arg);
ret = -1;
goto free_kvlist;
} else if (cnt1 == 1 && cnt2 == 1) {
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 22/33] app/test-bbdev: use RTE_MAX3 to remove variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (20 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 21/33] app/pdump: fix warning about shadowed variable Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 23/33] app/test-compress-perf: fix " Bruce Richardson
` (11 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Nicolas Chautru
Nested use of RTE_MAX leads to variable shadowing for the internal
variables, so use RTE_MAX3 rather than two nested calls.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-bbdev/test_bbdev_perf.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 27b0a6f523..9fb0a25948 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -552,12 +552,11 @@ create_mempools(struct active_device *ad, int socket_id,
&test_vector.entries[DATA_HARQ_OUTPUT];
/* allocate ops mempool */
- ops_pool_size = optimal_mempool_size(RTE_MAX(
+ ops_pool_size = optimal_mempool_size(RTE_MAX3(
/* Ops used plus 1 reference op */
- RTE_MAX((unsigned int)(ad->nb_queues * num_ops + 1),
+ (unsigned int)(ad->nb_queues * num_ops + 1),
/* Minimal cache size plus 1 reference op */
- (unsigned int)(1.5 * rte_lcore_count() *
- OPS_CACHE_SIZE + 1)),
+ (unsigned int)(1.5 * rte_lcore_count() * OPS_CACHE_SIZE + 1),
OPS_POOL_SIZE_MIN));
if (org_op_type == RTE_BBDEV_OP_NONE)
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 23/33] app/test-compress-perf: fix variable shadowing
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (21 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 22/33] app/test-bbdev: use RTE_MAX3 to remove variable shadowing Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 24/33] app/test-crypto-perf: fix shadowed variable Bruce Richardson
` (10 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson
Rename the parameter to 3 functions to avoid shadowing a global variable
of the same name.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-compress-perf/main.c | 122 +++++++++++++++++-----------------
1 file changed, 61 insertions(+), 61 deletions(-)
diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c
index 59af073f12..c9ead02cb4 100644
--- a/app/test-compress-perf/main.c
+++ b/app/test-compress-perf/main.c
@@ -53,33 +53,33 @@ static const struct cperf_test cperf_testmap[] = {
static struct comp_test_data *test_data;
static int
-comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id)
+comp_perf_check_capabilities(struct comp_test_data *td, uint8_t cdev_id)
{
const struct rte_compressdev_capabilities *cap;
- cap = rte_compressdev_capability_get(cdev_id, test_data->test_algo);
+ cap = rte_compressdev_capability_get(cdev_id, td->test_algo);
if (cap == NULL) {
RTE_LOG(ERR, USER1,
"Compress device does not support %u algorithm\n",
- test_data->test_algo);
+ td->test_algo);
return -1;
}
uint64_t comp_flags = cap->comp_feature_flags;
/* Algorithm type */
- switch (test_data->test_algo) {
+ switch (td->test_algo) {
case RTE_COMP_ALGO_DEFLATE:
/* Huffman encoding */
- if (test_data->huffman_enc == RTE_COMP_HUFFMAN_FIXED &&
+ if (td->huffman_enc == RTE_COMP_HUFFMAN_FIXED &&
(comp_flags & RTE_COMP_FF_HUFFMAN_FIXED) == 0) {
RTE_LOG(ERR, USER1,
"Compress device does not supported Fixed Huffman\n");
return -1;
}
- if (test_data->huffman_enc == RTE_COMP_HUFFMAN_DYNAMIC &&
+ if (td->huffman_enc == RTE_COMP_HUFFMAN_DYNAMIC &&
(comp_flags & RTE_COMP_FF_HUFFMAN_DYNAMIC) == 0) {
RTE_LOG(ERR, USER1,
"Compress device does not supported Dynamic Huffman\n");
@@ -88,14 +88,14 @@ comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id)
break;
case RTE_COMP_ALGO_LZ4:
/* LZ4 flags */
- if ((test_data->lz4_flags & RTE_COMP_LZ4_FLAG_BLOCK_CHECKSUM) &&
+ if ((td->lz4_flags & RTE_COMP_LZ4_FLAG_BLOCK_CHECKSUM) &&
(comp_flags & RTE_COMP_FF_LZ4_BLOCK_WITH_CHECKSUM) == 0) {
RTE_LOG(ERR, USER1,
"Compress device does not support LZ4 block with checksum\n");
return -1;
}
- if ((test_data->lz4_flags &
+ if ((td->lz4_flags &
RTE_COMP_LZ4_FLAG_BLOCK_INDEPENDENCE) &&
(comp_flags & RTE_COMP_FF_LZ4_BLOCK_INDEPENDENCE) == 0) {
RTE_LOG(ERR, USER1,
@@ -111,8 +111,8 @@ comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id)
}
/* Window size */
- if (test_data->window_sz != -1) {
- if (param_range_check(test_data->window_sz, &cap->window_size)
+ if (td->window_sz != -1) {
+ if (param_range_check(td->window_sz, &cap->window_size)
< 0) {
RTE_LOG(ERR, USER1,
"Compress device does not support "
@@ -121,18 +121,18 @@ comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id)
}
} else
/* Set window size to PMD maximum if none was specified */
- test_data->window_sz = cap->window_size.max;
+ td->window_sz = cap->window_size.max;
/* Check if chained mbufs is supported */
- if (test_data->max_sgl_segs > 1 &&
+ if (td->max_sgl_segs > 1 &&
(comp_flags & RTE_COMP_FF_OOP_SGL_IN_SGL_OUT) == 0) {
RTE_LOG(INFO, USER1, "Compress device does not support "
"chained mbufs. Max SGL segments set to 1\n");
- test_data->max_sgl_segs = 1;
+ td->max_sgl_segs = 1;
}
/* Level 0 support */
- if (test_data->level_lst.min == 0 &&
+ if (td->level_lst.min == 0 &&
(comp_flags & RTE_COMP_FF_NONCOMPRESSED_BLOCKS) == 0) {
RTE_LOG(ERR, USER1, "Compress device does not support "
"level 0 (no compression)\n");
@@ -143,19 +143,19 @@ comp_perf_check_capabilities(struct comp_test_data *test_data, uint8_t cdev_id)
}
static int
-comp_perf_initialize_compressdev(struct comp_test_data *test_data,
+comp_perf_initialize_compressdev(struct comp_test_data *td,
uint8_t *enabled_cdevs)
{
uint8_t enabled_cdev_count, nb_lcores, cdev_id;
unsigned int i, j;
int ret;
- enabled_cdev_count = rte_compressdev_devices_get(test_data->driver_name,
+ enabled_cdev_count = rte_compressdev_devices_get(td->driver_name,
enabled_cdevs, RTE_COMPRESS_MAX_DEVS);
if (enabled_cdev_count == 0) {
RTE_LOG(ERR, USER1, "No compress devices type %s available,"
" please check the list of specified devices in EAL section\n",
- test_data->driver_name);
+ td->driver_name);
return -EINVAL;
}
@@ -186,13 +186,13 @@ comp_perf_initialize_compressdev(struct comp_test_data *test_data,
* 2 queue pairs will be set up per device but one queue pair
* will left unused in the last one device
*/
- test_data->nb_qps = (nb_lcores % enabled_cdev_count) ?
+ td->nb_qps = (nb_lcores % enabled_cdev_count) ?
(nb_lcores / enabled_cdev_count) + 1 :
nb_lcores / enabled_cdev_count;
for (i = 0; i < enabled_cdev_count &&
i < RTE_COMPRESS_MAX_DEVS; i++,
- nb_lcores -= test_data->nb_qps) {
+ nb_lcores -= td->nb_qps) {
cdev_id = enabled_cdevs[i];
struct rte_compressdev_info cdev_info;
@@ -200,7 +200,7 @@ comp_perf_initialize_compressdev(struct comp_test_data *test_data,
rte_compressdev_info_get(cdev_id, &cdev_info);
if (cdev_info.max_nb_queue_pairs &&
- test_data->nb_qps > cdev_info.max_nb_queue_pairs) {
+ td->nb_qps > cdev_info.max_nb_queue_pairs) {
RTE_LOG(ERR, USER1,
"Number of needed queue pairs is higher "
"than the maximum number of queue pairs "
@@ -211,25 +211,25 @@ comp_perf_initialize_compressdev(struct comp_test_data *test_data,
return -EINVAL;
}
- if (comp_perf_check_capabilities(test_data, cdev_id) < 0)
+ if (comp_perf_check_capabilities(td, cdev_id) < 0)
return -EINVAL;
/* Configure compressdev */
struct rte_compressdev_config config = {
.socket_id = socket_id,
- .nb_queue_pairs = nb_lcores > test_data->nb_qps
- ? test_data->nb_qps : nb_lcores,
+ .nb_queue_pairs = nb_lcores > td->nb_qps
+ ? td->nb_qps : nb_lcores,
.max_nb_priv_xforms = NUM_MAX_XFORMS,
.max_nb_streams = 0
};
- test_data->nb_qps = config.nb_queue_pairs;
+ td->nb_qps = config.nb_queue_pairs;
if (rte_compressdev_configure(cdev_id, &config) < 0) {
RTE_LOG(ERR, USER1, "Device configuration failed\n");
return -EINVAL;
}
- for (j = 0; j < test_data->nb_qps; j++) {
+ for (j = 0; j < td->nb_qps; j++) {
ret = rte_compressdev_queue_pair_setup(cdev_id, j,
NUM_MAX_INFLIGHT_OPS, socket_id);
if (ret < 0) {
@@ -253,9 +253,9 @@ comp_perf_initialize_compressdev(struct comp_test_data *test_data,
}
static int
-comp_perf_dump_input_data(struct comp_test_data *test_data)
+comp_perf_dump_input_data(struct comp_test_data *td)
{
- FILE *f = fopen(test_data->input_file, "r");
+ FILE *f = fopen(td->input_file, "r");
int ret = -1;
size_t actual_file_sz, remaining_data;
uint8_t *data = NULL;
@@ -274,34 +274,34 @@ comp_perf_dump_input_data(struct comp_test_data *test_data)
* input data size = file size
*/
- if (test_data->input_data_sz == 0)
- test_data->input_data_sz = actual_file_sz;
+ if (td->input_data_sz == 0)
+ td->input_data_sz = actual_file_sz;
- if (test_data->input_data_sz <= 0 || actual_file_sz <= 0 ||
+ if (td->input_data_sz <= 0 || actual_file_sz <= 0 ||
fseek(f, 0, SEEK_SET) != 0) {
RTE_LOG(ERR, USER1, "Size of input could not be calculated\n");
goto end;
}
- if (!(test_data->test_op & COMPRESS) &&
- test_data->input_data_sz >
- (size_t) test_data->seg_sz * (size_t) test_data->max_sgl_segs) {
+ if (!(td->test_op & COMPRESS) &&
+ td->input_data_sz >
+ (size_t) td->seg_sz * (size_t) td->max_sgl_segs) {
RTE_LOG(ERR, USER1,
"Size of input must be less than total segments\n");
goto end;
}
- test_data->input_data = rte_zmalloc_socket(NULL,
- test_data->input_data_sz, 0, rte_socket_id());
+ td->input_data = rte_zmalloc_socket(NULL,
+ td->input_data_sz, 0, rte_socket_id());
- if (test_data->input_data == NULL) {
+ if (td->input_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the input "
"file could not be allocated\n");
goto end;
}
- remaining_data = test_data->input_data_sz;
- data = test_data->input_data;
+ remaining_data = td->input_data_sz;
+ data = td->input_data;
while (remaining_data > 0) {
size_t data_to_read = RTE_MIN(remaining_data, actual_file_sz);
@@ -320,15 +320,15 @@ comp_perf_dump_input_data(struct comp_test_data *test_data)
}
printf("\n");
- if (test_data->input_data_sz > actual_file_sz)
+ if (td->input_data_sz > actual_file_sz)
RTE_LOG(INFO, USER1,
"%zu bytes read from file %s, extending the file %.2f times\n",
- test_data->input_data_sz, test_data->input_file,
- (double)test_data->input_data_sz/actual_file_sz);
+ td->input_data_sz, td->input_file,
+ (double)td->input_data_sz/actual_file_sz);
else
RTE_LOG(INFO, USER1,
"%zu bytes read from file %s\n",
- test_data->input_data_sz, test_data->input_file);
+ td->input_data_sz, td->input_file);
ret = 0;
@@ -338,15 +338,15 @@ comp_perf_dump_input_data(struct comp_test_data *test_data)
}
static int
-comp_perf_dump_dictionary_data(struct comp_test_data *test_data)
+comp_perf_dump_dictionary_data(struct comp_test_data *td)
{
- FILE *f = fopen(test_data->dictionary_file, "r");
+ FILE *f = fopen(td->dictionary_file, "r");
int ret = -1;
if (f == NULL) {
RTE_LOG(ERR, USER1, "Dictionary file not specified\n");
- test_data->dictionary_data_sz = 0;
- test_data->dictionary_data = NULL;
+ td->dictionary_data_sz = 0;
+ td->dictionary_data = NULL;
ret = 0;
goto end;
}
@@ -367,40 +367,40 @@ comp_perf_dump_dictionary_data(struct comp_test_data *test_data)
size_t actual_file_sz = (size_t)file_sz;
- if (test_data->dictionary_data_sz == 0)
- test_data->dictionary_data_sz = actual_file_sz;
+ if (td->dictionary_data_sz == 0)
+ td->dictionary_data_sz = actual_file_sz;
if (fseek(f, 0, SEEK_SET) != 0) {
RTE_LOG(ERR, USER1, "Size of input could not be calculated\n");
goto end;
}
- test_data->dictionary_data = rte_zmalloc_socket(NULL,
- test_data->dictionary_data_sz, 0, rte_socket_id());
+ td->dictionary_data = rte_zmalloc_socket(NULL,
+ td->dictionary_data_sz, 0, rte_socket_id());
- if (test_data->dictionary_data == NULL) {
+ if (td->dictionary_data == NULL) {
RTE_LOG(ERR, USER1, "Memory to hold the data from the dictionary "
"file could not be allocated\n");
goto end;
}
- size_t remaining_data = test_data->dictionary_data_sz;
- uint8_t *data = test_data->dictionary_data;
+ size_t remaining_data = td->dictionary_data_sz;
+ uint8_t *data = td->dictionary_data;
while (remaining_data > 0) {
size_t data_to_read = RTE_MIN(remaining_data, actual_file_sz);
if (fread(data, data_to_read, 1, f) != 1) {
RTE_LOG(ERR, USER1, "Input file could not be read\n");
- if (test_data->dictionary_data)
- rte_free(test_data->dictionary_data);
+ if (td->dictionary_data)
+ rte_free(td->dictionary_data);
goto end;
}
if (fseek(f, 0, SEEK_SET) != 0) {
RTE_LOG(ERR, USER1,
"Size of input could not be calculated\n");
- if (test_data->dictionary_data)
- rte_free(test_data->dictionary_data);
+ if (td->dictionary_data)
+ rte_free(td->dictionary_data);
goto end;
}
remaining_data -= data_to_read;
@@ -408,15 +408,15 @@ comp_perf_dump_dictionary_data(struct comp_test_data *test_data)
}
printf("\n");
- if (test_data->dictionary_data_sz > actual_file_sz)
+ if (td->dictionary_data_sz > actual_file_sz)
RTE_LOG(INFO, USER1,
"%zu bytes read from file %s, extending the file %.2f times\n",
- test_data->dictionary_data_sz, test_data->dictionary_file,
- (double)test_data->dictionary_data_sz/actual_file_sz);
+ td->dictionary_data_sz, td->dictionary_file,
+ (double)td->dictionary_data_sz/actual_file_sz);
else
RTE_LOG(INFO, USER1,
"%zu bytes read from file %s\n",
- test_data->dictionary_data_sz, test_data->dictionary_file);
+ td->dictionary_data_sz, td->dictionary_file);
ret = 0;
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 24/33] app/test-crypto-perf: fix shadowed variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (22 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 23/33] app/test-compress-perf: fix " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 25/33] app/test-dma-perf: renamed " Bruce Richardson
` (9 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Kai Ji
The global variable iv_offset was shadowed by a local var. Rename the
local variable to a shorter form to solve the issue.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-crypto-perf/cperf_test_pmd_cyclecount.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
index 07a842f40a..5e3153b9dd 100644
--- a/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
+++ b/app/test-crypto-perf/cperf_test_pmd_cyclecount.c
@@ -111,15 +111,13 @@ cperf_pmd_cyclecount_test_constructor(struct rte_mempool *sess_mp,
ctx->test_vector = test_vector;
/* IV goes at the end of the crypto operation */
- uint16_t iv_offset = sizeof(struct rte_crypto_op) +
- sizeof(struct rte_crypto_sym_op);
+ uint16_t iv_ofs = sizeof(struct rte_crypto_op) + sizeof(struct rte_crypto_sym_op);
if (*sess != NULL) {
ctx->sess = *sess;
ctx->sess_owner = false;
} else {
- ctx->sess = op_fns->sess_create(sess_mp, dev_id, options, test_vector,
- iv_offset);
+ ctx->sess = op_fns->sess_create(sess_mp, dev_id, options, test_vector, iv_ofs);
if (ctx->sess == NULL)
goto err;
*sess = ctx->sess;
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 25/33] app/test-dma-perf: renamed shadowed variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (23 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 24/33] app/test-crypto-perf: fix shadowed variable Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 26/33] app/test-eventdev: fix build with shadow warnings enabled Bruce Richardson
` (8 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Cheng Jiang, Chengwen Feng
Rename second instance of variable named "i" in load_configs() to avoid
shadowing warnings.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-dma-perf/main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/test-dma-perf/main.c b/app/test-dma-perf/main.c
index 4201cc02a0..64baa255f3 100644
--- a/app/test-dma-perf/main.c
+++ b/app/test-dma-perf/main.c
@@ -436,9 +436,9 @@ load_configs(const char *path)
nb_vp++;
char lc_dma[RTE_DEV_NAME_MAX_LEN];
- int i = 0;
+ int dma_id = 0;
while (1) {
- snprintf(lc_dma, RTE_DEV_NAME_MAX_LEN, "lcore_dma%d", i);
+ snprintf(lc_dma, RTE_DEV_NAME_MAX_LEN, "lcore_dma%d", dma_id);
lcore_dma = rte_cfgfile_get_entry(cfgfile, section_name, lc_dma);
if (lcore_dma == NULL)
break;
@@ -451,13 +451,13 @@ load_configs(const char *path)
}
if (rte_kvargs_process(kvlist, NULL, populate_dma_dev_config,
- (void *)&test_case->dma_config[i]) < 0) {
+ (void *)&test_case->dma_config[dma_id]) < 0) {
printf("rte_kvargs_process() error\n");
rte_kvargs_free(kvlist);
test_case->is_valid = false;
break;
}
- i++;
+ dma_id++;
test_case->num_worker++;
rte_kvargs_free(kvlist);
}
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 26/33] app/test-eventdev: fix build with shadow warnings enabled
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (24 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 25/33] app/test-dma-perf: renamed " Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 27/33] app/test-flow-perf: remove unneeded variable Bruce Richardson
` (7 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Jerin Jacob
Rename or remove shadowed variables to give a clean build with -Wshadow.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-eventdev/evt_main.c | 6 +++---
app/test-eventdev/test_atomic_queue.c | 6 +++---
app/test-eventdev/test_perf_common.c | 4 +---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/app/test-eventdev/evt_main.c b/app/test-eventdev/evt_main.c
index 03114020f1..6f71c0a73d 100644
--- a/app/test-eventdev/evt_main.c
+++ b/app/test-eventdev/evt_main.c
@@ -30,11 +30,11 @@ signal_handler(int signum)
}
static inline void
-evt_options_dump_all(struct evt_test *test, struct evt_options *opts)
+evt_options_dump_all(struct evt_test *t, struct evt_options *opts)
{
evt_options_dump(opts);
- if (test->ops.opt_dump)
- test->ops.opt_dump(opts);
+ if (t->ops.opt_dump)
+ t->ops.opt_dump(opts);
}
int
diff --git a/app/test-eventdev/test_atomic_queue.c b/app/test-eventdev/test_atomic_queue.c
index 8ce0849664..2b7bbeb370 100644
--- a/app/test-eventdev/test_atomic_queue.c
+++ b/app/test-eventdev/test_atomic_queue.c
@@ -34,7 +34,7 @@ static inline void
atomic_queue_process_stage_1(struct test_order *const t,
struct rte_event *const ev,
uint32_t nb_flows,
- rte_spinlock_t *atomic_locks,
+ rte_spinlock_t *atomic_lks,
uint32_t *const expected_flow_seq,
RTE_ATOMIC(uint64_t) * const outstand_pkts,
uint32_t port)
@@ -42,7 +42,7 @@ atomic_queue_process_stage_1(struct test_order *const t,
const uint32_t flow = *order_mbuf_flow_id(t, ev->mbuf);
const uint32_t seq = *order_mbuf_seqn(t, ev->mbuf);
- atomic_lock_verify(atomic_locks, 1, flow, nb_flows, t, port);
+ atomic_lock_verify(atomic_lks, 1, flow, nb_flows, t, port);
/* compare the seqn against expected value */
if (seq != expected_flow_seq[flow]) {
@@ -58,7 +58,7 @@ atomic_queue_process_stage_1(struct test_order *const t,
ev->op = RTE_EVENT_OP_RELEASE;
- atomic_spinlock_unlock(atomic_locks, 1, flow, nb_flows);
+ atomic_spinlock_unlock(atomic_lks, 1, flow, nb_flows);
}
static int
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index 6b2ce61832..8201f2351a 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -2131,12 +2131,10 @@ perf_cryptodev_destroy(struct evt_test *test, struct evt_options *opt)
void *sess;
struct prod_data *p = &t->prod[port];
uint32_t flow_id;
- uint8_t cdev_id;
for (flow_id = 0; flow_id < t->nb_flows; flow_id++) {
sess = p->ca.crypto_sess[flow_id];
- cdev_id = p->ca.cdev_id;
- rte_cryptodev_sym_session_free(cdev_id, sess);
+ rte_cryptodev_sym_session_free(p->ca.cdev_id, sess);
}
rte_event_crypto_adapter_queue_pair_del(
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 27/33] app/test-flow-perf: remove unneeded variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (25 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 26/33] app/test-eventdev: fix build with shadow warnings enabled Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 28/33] app/test-security-perf: fix build with shadow warnings Bruce Richardson
` (6 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Wisam Jaddo
Remove an unnecessary second definition of a char * variable called
"token" when processing commandline args.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-flow-perf/main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/test-flow-perf/main.c b/app/test-flow-perf/main.c
index b2084b93dd..53c92c4bec 100644
--- a/app/test-flow-perf/main.c
+++ b/app/test-flow-perf/main.c
@@ -916,7 +916,6 @@ args_parse(int argc, char **argv)
if (strcmp(lgopts[opt_idx].name,
"port-id") == 0) {
uint16_t port_idx = 0;
- char *token;
token = strtok(optarg, ",");
while (token != NULL) {
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 28/33] app/test-security-perf: fix build with shadow warnings
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (26 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 27/33] app/test-flow-perf: remove unneeded variable Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 29/33] app/test-pipeline: remove unnecessary variable Bruce Richardson
` (5 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Anoob Joseph, Akhil Goyal, Fan Zhang
Rename variables to eliminate variable shadowing.
NOTE: The test-security-perf app reuses code from "dpdk-test" app, so
some changes are made there too.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-security-perf/test_security_perf.c | 42 ++++++++++-----------
app/test/test_cryptodev_security_ipsec.c | 13 +++----
2 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/app/test-security-perf/test_security_perf.c b/app/test-security-perf/test_security_perf.c
index b0d55cbab0..dd377a6027 100644
--- a/app/test-security-perf/test_security_perf.c
+++ b/app/test-security-perf/test_security_perf.c
@@ -43,7 +43,7 @@ struct test_ctx {
bool is_inbound;
};
-static struct test_ctx ctx;
+static struct test_ctx test_ctx;
static int
cryptodev_init(struct test_ctx *ctx, uint8_t nb_lcores)
@@ -355,7 +355,7 @@ test_security_session_perf(void *arg)
nb_sessions += (nb_sess_total - nb_sessions * nb_lcores);
ret = sec_conf_init(conf, &sess_conf, &ipsec_xform,
- &ctx.td[ctx.td_idx]);
+ &test_ctx.td[test_ctx.td_idx]);
if (ret) {
RTE_LOG(ERR, USER1, "Could not initialize session conf\n");
return EXIT_FAILURE;
@@ -447,14 +447,14 @@ args_parse(int argc, char **argv)
if (strcmp(lgopts[opt_idx].name, "nb-sess") == 0) {
n = atoi(optarg);
if (n >= 0)
- ctx.nb_sess = n;
+ test_ctx.nb_sess = n;
else
rte_exit(EXIT_FAILURE,
"nb-sess should be >= 0\n");
- printf("nb-sess %d / ", ctx.nb_sess);
+ printf("nb-sess %d / ", test_ctx.nb_sess);
} else if (strcmp(lgopts[opt_idx].name, "inbound") ==
0) {
- ctx.is_inbound = true;
+ test_ctx.is_inbound = true;
printf("inbound / ");
}
@@ -482,7 +482,7 @@ main(int argc, char **argv)
unsigned long i;
int ret;
- memset(&ctx, 0, sizeof(struct test_ctx));
+ memset(&test_ctx, 0, sizeof(struct test_ctx));
memset(&flags, 0, sizeof(flags));
ret = rte_eal_init(argc, argv);
@@ -498,18 +498,18 @@ main(int argc, char **argv)
return -EINVAL;
}
- ctx.nb_sess = DEF_NB_SESSIONS + RTE_MEMPOOL_CACHE_MAX_SIZE * nb_lcores;
+ test_ctx.nb_sess = DEF_NB_SESSIONS + RTE_MEMPOOL_CACHE_MAX_SIZE * nb_lcores;
if (argc > 1)
args_parse(argc, argv);
- ctx.nb_lcores = nb_lcores;
+ test_ctx.nb_lcores = nb_lcores;
- ret = cryptodev_init(&ctx, nb_lcores);
+ ret = cryptodev_init(&test_ctx, nb_lcores);
if (ret)
goto exit;
- ret = mempool_init(&ctx, nb_lcores);
+ ret = mempool_init(&test_ctx, nb_lcores);
if (ret)
goto cryptodev_fini;
@@ -521,19 +521,19 @@ main(int argc, char **argv)
&flags,
&td_outb[i],
1);
- if (ctx.is_inbound)
+ if (test_ctx.is_inbound)
test_ipsec_td_in_from_out(&td_outb[i], &td_inb[i]);
}
- ctx.td = td_outb;
- if (ctx.is_inbound)
- ctx.td = td_inb;
+ test_ctx.td = td_outb;
+ if (test_ctx.is_inbound)
+ test_ctx.td = td_inb;
- for (ctx.td_idx = 0; ctx.td_idx < RTE_DIM(sec_alg_list); ctx.td_idx++) {
+ for (test_ctx.td_idx = 0; test_ctx.td_idx < RTE_DIM(sec_alg_list); test_ctx.td_idx++) {
printf("\n\n Algorithm combination:");
- test_sec_alg_display(sec_alg_list[ctx.td_idx].param1,
- sec_alg_list[ctx.td_idx].param2);
+ test_sec_alg_display(sec_alg_list[test_ctx.td_idx].param1,
+ sec_alg_list[test_ctx.td_idx].param2);
printf(" ----------------------");
printf("\n%20s%20s%20s%20s%20s%20s\n\n",
@@ -545,7 +545,7 @@ main(int argc, char **argv)
i = 0;
RTE_LCORE_FOREACH_WORKER(lcore_id) {
rte_eal_remote_launch(test_security_session_perf,
- &ctx.lconf[i],
+ &test_ctx.lconf[i],
lcore_id);
i++;
}
@@ -556,12 +556,12 @@ main(int argc, char **argv)
}
- cryptodev_fini(&ctx);
- mempool_fini(&ctx);
+ cryptodev_fini(&test_ctx);
+ mempool_fini(&test_ctx);
return EXIT_SUCCESS;
cryptodev_fini:
- cryptodev_fini(&ctx);
+ cryptodev_fini(&test_ctx);
exit:
return EXIT_FAILURE;
diff --git a/app/test/test_cryptodev_security_ipsec.c b/app/test/test_cryptodev_security_ipsec.c
index 2576afbd99..bc1b392da7 100644
--- a/app/test/test_cryptodev_security_ipsec.c
+++ b/app/test/test_cryptodev_security_ipsec.c
@@ -264,11 +264,10 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
{
struct ipsec_test_data *td;
- int i;
memset(td_array, 0, nb_td * sizeof(*td));
- for (i = 0; i < nb_td; i++) {
+ for (int i = 0; i < nb_td; i++) {
td = &td_array[i];
/* Prepare fields based on param */
@@ -339,7 +338,6 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
struct rte_tcp_hdr *tcp;
int64_t payload_len;
uint8_t *data;
- int64_t i;
payload_len = RTE_MIN(flags->plaintext_len, IPSEC_TEXT_MAX_LEN);
payload_len -= sizeof(struct rte_ipv6_hdr);
@@ -355,8 +353,8 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
/* TCP */
tcp = (struct rte_tcp_hdr *)(ip6 + 1);
data = (uint8_t *)(tcp + 1);
- for (i = 0; i < payload_len; i++)
- data[i] = i;
+ for (int64_t j = 0; j < payload_len; j++)
+ data[j] = j;
tcp->cksum = 0;
tcp->cksum = rte_ipv6_udptcp_cksum(ip6, tcp);
td->input_text.len = payload_len + sizeof(struct rte_ipv6_hdr) +
@@ -366,7 +364,6 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
struct rte_tcp_hdr *tcp;
int64_t payload_len;
uint8_t *data;
- int64_t i;
payload_len = RTE_MIN(flags->plaintext_len, IPSEC_TEXT_MAX_LEN);
payload_len -= sizeof(struct rte_ipv4_hdr);
@@ -384,8 +381,8 @@ test_ipsec_td_prepare(const struct crypto_param *param1,
/* TCP */
tcp = (struct rte_tcp_hdr *)(ip + 1);
data = (uint8_t *)(tcp + 1);
- for (i = 0; i < payload_len; i++)
- data[i] = i;
+ for (int64_t j = 0; j < payload_len; j++)
+ data[j] = j;
tcp->cksum = 0;
tcp->cksum = rte_ipv4_udptcp_cksum(ip, tcp);
td->input_text.len = payload_len + sizeof(struct rte_ipv4_hdr) +
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 29/33] app/test-pipeline: remove unnecessary variable
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (27 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 28/33] app/test-security-perf: fix build with shadow warnings Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 30/33] drivers: disable variable shadowing warnings for drivers Bruce Richardson
` (4 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson, Cristian Dumitrescu
The second definition of a variable called "ret" in the main function is
unnecessary and causes variable shadowing warnings, so just eliminate
it.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test-pipeline/main.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/app/test-pipeline/main.c b/app/test-pipeline/main.c
index 4cc098d7ac..e5efafdf28 100644
--- a/app/test-pipeline/main.c
+++ b/app/test-pipeline/main.c
@@ -89,7 +89,6 @@ main(int argc, char **argv)
/* Close ports */
for (i = 0; i < app.n_ports; i++) {
uint16_t port;
- int ret;
port = app.ports[i];
printf("Closing port %d...", port);
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 30/33] drivers: disable variable shadowing warnings for drivers
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (28 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 29/33] app/test-pipeline: remove unnecessary variable Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 31/33] app/test: disable shadowing warnings for unit tests Bruce Richardson
` (3 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, Nicolas Chautru, Hemant Agrawal, Sachin Saxena,
Nithin Dabilpuram, Kiran Kumar K, Sunil Kumar Kori, Satha Rao,
Harman Kalra, Kai Ji, Nagadheeraj Rottela, Fan Zhang,
Ashish Gupta, Ankur Dwivedi, Anoob Joseph, Tejasree Kondoj,
Gagandeep Singh, Pavan Nikhilesh, Shijith Thotton,
Tirthendu Sarkar, Selwin Sebastian, Ajit Khaparde, Somnath Kotur,
Chas Williams, Min Hu (Connor),
Potnuri Bharat Teja, Shai Brandes, Evgeny Schemeilin, Ron Beider,
Amit Bernstein, Wajeeh Atrash, Apeksha Gupta, John Daley,
Hyong Youb Kim, Gaetan Rivet, Dariusz Sosnowski,
Viacheslav Ovsiienko, Bing Zhao, Ori Kam, Suanming Mou,
Matan Azrad, Christian Koue Muf, Serhii Iliushyk,
Devendra Singh Rawat, Alok Prasad, Jiawen Wu, Jian Wang,
Zaiyu Wang, Junlong Wang, Lijie Shan, Rosen Xu
Not all drivers build cleanly with shadow warnings enabled, so disable
them on a driver-by-driver basis for now.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/meson.build | 5 +++++
drivers/baseband/fpga_5gnr_fec/meson.build | 2 ++
drivers/bus/fslmc/meson.build | 2 ++
drivers/common/cnxk/meson.build | 1 +
drivers/common/qat/meson.build | 1 +
drivers/compress/nitrox/meson.build | 2 ++
drivers/crypto/cnxk/meson.build | 1 +
drivers/crypto/octeontx/meson.build | 1 +
drivers/crypto/openssl/meson.build | 1 +
drivers/crypto/scheduler/meson.build | 1 +
drivers/dma/dpaa2/meson.build | 2 ++
drivers/event/cnxk/meson.build | 1 +
drivers/event/dlb2/meson.build | 2 ++
drivers/event/sw/meson.build | 1 +
drivers/net/axgbe/meson.build | 2 +-
drivers/net/bnxt/meson.build | 1 +
drivers/net/bonding/meson.build | 1 +
drivers/net/cnxk/meson.build | 1 +
drivers/net/cxgbe/meson.build | 1 +
drivers/net/dpaa/meson.build | 1 +
drivers/net/dpaa2/meson.build | 1 +
drivers/net/ena/meson.build | 2 ++
drivers/net/enetfec/meson.build | 2 ++
drivers/net/enic/meson.build | 2 ++
drivers/net/failsafe/meson.build | 1 +
drivers/net/mlx5/meson.build | 1 +
drivers/net/ntnic/meson.build | 3 +++
drivers/net/pfe/meson.build | 3 +++
drivers/net/qede/meson.build | 3 +++
drivers/net/txgbe/meson.build | 1 +
drivers/net/zxdh/meson.build | 3 +++
drivers/raw/ifpga/meson.build | 2 ++
drivers/vdpa/mlx5/meson.build | 1 +
33 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/config/meson.build b/config/meson.build
index 0cb074ab95..927dc18d21 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -361,6 +361,11 @@ if cc.has_argument('-Wvla')
endif
endif
+no_shadow_cflag = []
+if cc.has_argument('-Wno-shadow')
+ no_shadow_cflag = '-Wno-shadow'
+endif
+
foreach arg: global_cflags
if cc.has_argument(arg)
add_project_arguments(arg, language: 'c')
diff --git a/drivers/baseband/fpga_5gnr_fec/meson.build b/drivers/baseband/fpga_5gnr_fec/meson.build
index c3678d23eb..d81070aecd 100644
--- a/drivers/baseband/fpga_5gnr_fec/meson.build
+++ b/drivers/baseband/fpga_5gnr_fec/meson.build
@@ -3,6 +3,8 @@
deps += ['bus_vdev', 'ring', 'pci', 'bus_pci']
+cflags += no_shadow_cflag
+
sources = files('rte_fpga_5gnr_fec.c')
headers = files('rte_pmd_fpga_5gnr_fec.h')
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 70098ad778..ceae1c6c11 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -6,6 +6,8 @@ if not is_linux
reason = 'only supported on Linux'
endif
+cflags += no_shadow_cflag
+
deps += ['common_dpaax', 'eventdev', 'kvargs']
sources = files(
'fslmc_bus.c',
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index daffc15afd..2b33022eb7 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -95,6 +95,7 @@ sources += files('cnxk_telemetry_bphy.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
if meson.is_cross_build()
soc_type = meson.get_external_property('platform', '')
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 68290ef152..31e06f4376 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -104,6 +104,7 @@ if qat_compress
endif
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
if qat_crypto
foreach f: ['qat_sym.c', 'qat_sym_session.c',
diff --git a/drivers/compress/nitrox/meson.build b/drivers/compress/nitrox/meson.build
index 5cecc2ad66..d48b19feb0 100644
--- a/drivers/compress/nitrox/meson.build
+++ b/drivers/compress/nitrox/meson.build
@@ -8,6 +8,8 @@ endif
deps += ['common_nitrox', 'bus_pci', 'compressdev']
+cflags += no_shadow_cflag
+
sources += files(
'nitrox_comp.c',
'nitrox_comp_reqmgr.c',
diff --git a/drivers/crypto/cnxk/meson.build b/drivers/crypto/cnxk/meson.build
index 912c4a0851..922c425855 100644
--- a/drivers/crypto/cnxk/meson.build
+++ b/drivers/crypto/cnxk/meson.build
@@ -34,6 +34,7 @@ deps += ['bus_pci', 'common_cnxk', 'security', 'eventdev']
includes += include_directories('../../../lib/net', '../../event/cnxk')
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
if get_option('buildtype').contains('debug')
cflags += [ '-DLA_IPSEC_DEBUG','-DCNXK_CRYPTODEV_DEBUG' ]
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index ec26aa65e7..5e5e4b7fa2 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -34,3 +34,4 @@ includes += include_directories('../../mempool/octeontx')
includes += include_directories('../../net/octeontx')
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index c56e4678bb..af469a9827 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -17,3 +17,4 @@ sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
ext_deps += dep
require_iova_in_mbuf = false
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index b7c47d18b5..68ca1fa08a 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -24,3 +24,4 @@ headers = files(
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/dma/dpaa2/meson.build b/drivers/dma/dpaa2/meson.build
index a523f5edb4..6f9b427793 100644
--- a/drivers/dma/dpaa2/meson.build
+++ b/drivers/dma/dpaa2/meson.build
@@ -14,3 +14,5 @@ sources = files('dpaa2_qdma.c')
if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
endif
+
+cflags += no_shadow_cflag
diff --git a/drivers/event/cnxk/meson.build b/drivers/event/cnxk/meson.build
index 677ebc9e28..24b48d045f 100644
--- a/drivers/event/cnxk/meson.build
+++ b/drivers/event/cnxk/meson.build
@@ -301,6 +301,7 @@ endif
endif
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
extra_flags = ['-flax-vector-conversions', '-Wno-strict-aliasing']
if cc.get_id() == 'clang'
diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build
index 19d88afb5d..894d011fea 100644
--- a/drivers/event/dlb2/meson.build
+++ b/drivers/event/dlb2/meson.build
@@ -29,6 +29,8 @@ headers = files('rte_pmd_dlb2.h')
deps += ['mbuf', 'mempool', 'ring', 'pci', 'bus_pci']
+cflags += no_shadow_cflag
+
dlb_pmd_defines = ['-DDLB2_BYPASS_FENCE_ON_PP', '-DDLB_HW_CREDITS_CHECKS', '-DDLB_SW_CREDITS_CHECKS', '-DDLB_TYPE_CHECK']
dlb_pmd_default = ['0','1','1','1']
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index c0c559ebc4..0cd324d97a 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -11,3 +11,4 @@ sources = files(
deps += ['hash', 'bus_vdev']
require_iova_in_mbuf = false
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/net/axgbe/meson.build b/drivers/net/axgbe/meson.build
index b1cbe3d810..5a14549317 100644
--- a/drivers/net/axgbe/meson.build
+++ b/drivers/net/axgbe/meson.build
@@ -15,7 +15,7 @@ sources = files(
'axgbe_rxtx.c',
)
-cflags += '-Wno-cast-qual'
+cflags += ['-Wno-cast-qual', no_shadow_cflag]
if arch_subdir == 'x86'
sources += files('axgbe_rxtx_vec_sse.c')
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 79300eb6ac..dc122fb3df 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -13,6 +13,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0
endif
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
headers = files('rte_pmd_bnxt.h')
cflags_options = [
diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build
index d87e7a2522..14304b68a8 100644
--- a/drivers/net/bonding/meson.build
+++ b/drivers/net/bonding/meson.build
@@ -26,3 +26,4 @@ headers = files('rte_eth_bond.h', 'rte_eth_bond_8023ad.h')
require_iova_in_mbuf = false
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/net/cnxk/meson.build b/drivers/net/cnxk/meson.build
index d20a8601eb..53caa6c171 100644
--- a/drivers/net/cnxk/meson.build
+++ b/drivers/net/cnxk/meson.build
@@ -328,6 +328,7 @@ deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
deps += ['common_cnxk', 'mempool_cnxk']
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
# Allow implicit vector conversions and strict aliasing warning
extra_flags = ['-flax-vector-conversions', '-Wno-strict-aliasing']
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 95cb58ab44..0d5d886ed5 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -25,3 +25,4 @@ sources = files(
includes += include_directories('base')
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index b1e4bbafb5..8d4f69c596 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -18,6 +18,7 @@ sources = files(
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index 89932b3037..4094ea02ba 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -29,3 +29,4 @@ includes += include_directories('base', 'mc')
headers = files('rte_pmd_dpaa2.h')
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
index d02ed3f64f..2b18d7add7 100644
--- a/drivers/net/ena/meson.build
+++ b/drivers/net/ena/meson.build
@@ -17,3 +17,5 @@ sources = files(
deps += ['timer']
includes += include_directories('base', 'base/ena_defs')
+
+cflags += no_shadow_cflag
diff --git a/drivers/net/enetfec/meson.build b/drivers/net/enetfec/meson.build
index 29a464424b..428133c2b6 100644
--- a/drivers/net/enetfec/meson.build
+++ b/drivers/net/enetfec/meson.build
@@ -11,3 +11,5 @@ sources = files(
'enet_uio.c',
'enet_rxtx.c',
)
+
+cflags += no_shadow_cflag
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index a48a497e46..cb853beeaa 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -29,6 +29,8 @@ sources = files(
deps += ['hash']
includes += include_directories('base')
+cflags += no_shadow_cflag
+
if dpdk_conf.has('RTE_ARCH_X86_64')
cflags += '-DENIC_RXTX_VEC'
sources_avx2 += files('enic_rxtx_vec_avx2.c')
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index 90c965b705..3c2c96b73a 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -8,6 +8,7 @@ if is_windows
endif
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
cflags += '-D_DEFAULT_SOURCE'
cflags += '-D_XOPEN_SOURCE=700'
cflags += '-pedantic'
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index d67fb0969f..28275bed21 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -90,6 +90,7 @@ if get_option('buildtype').contains('debug')
else
cflags += [ '-UPEDANTIC' ]
endif
+cflags += no_shadow_cflag
require_iova_in_mbuf = false
diff --git a/drivers/net/ntnic/meson.build b/drivers/net/ntnic/meson.build
index 1daf7881f1..60688c8aaf 100644
--- a/drivers/net/ntnic/meson.build
+++ b/drivers/net/ntnic/meson.build
@@ -128,3 +128,6 @@ sources = files(
'ntnic_ethdev.c',
'rte_pmd_ntnic.c',
)
+
+# Suppress shadow warnings for this driver due to extensive variable shadowing
+cflags += no_shadow_cflag
diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build
index 684b062090..2d7dcb154a 100644
--- a/drivers/net/pfe/meson.build
+++ b/drivers/net/pfe/meson.build
@@ -18,4 +18,7 @@ if cc.has_argument('-Wno-pointer-arith')
cflags += '-Wno-pointer-arith'
endif
+# Suppress shadow warnings for this driver
+cflags += no_shadow_cflag
+
includes += include_directories('base')
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index e1b21d6ff5..7957aae3fa 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -22,3 +22,6 @@ sources = files(
if cc.has_argument('-Wno-format-nonliteral')
cflags += '-Wno-format-nonliteral'
endif
+
+# Suppress shadow warnings for this driver
+cflags += no_shadow_cflag
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 5cdec017ed..dea50bfe14 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -24,6 +24,7 @@ sources = files(
deps += ['hash', 'security']
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
if arch_subdir == 'x86'
sources += files('txgbe_rxtx_vec_sse.c')
diff --git a/drivers/net/zxdh/meson.build b/drivers/net/zxdh/meson.build
index 0213ccb2fa..9893616b19 100644
--- a/drivers/net/zxdh/meson.build
+++ b/drivers/net/zxdh/meson.build
@@ -20,3 +20,6 @@ sources = files(
'zxdh_mtr.c',
'zxdh_flow.c',
)
+
+# Suppress shadow warnings for this driver
+cflags += no_shadow_cflag
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 395894af2a..8d5f41fd5d 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -19,6 +19,8 @@ endif
ext_deps += rtdep
+cflags += no_shadow_cflag
+
subdir('base')
deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build
index 7be11fda6d..f61adf23a4 100644
--- a/drivers/vdpa/mlx5/meson.build
+++ b/drivers/vdpa/mlx5/meson.build
@@ -24,6 +24,7 @@ sources = files(
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
cflags_options = [
'-std=c11',
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 31/33] app/test: disable shadowing warnings for unit tests
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (29 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 30/33] drivers: disable variable shadowing warnings for drivers Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 32/33] examples: ignore variable shadowing warnings Bruce Richardson
` (2 subsequent siblings)
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson
The dpdk-test binary has multiple issues with variable shadowing. For
now, explicitly ignore shadowing warnings in this app.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
app/test/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/test/meson.build b/app/test/meson.build
index 8df8d3edd1..9d4a88d976 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -256,6 +256,7 @@ foreach d:optional_deps
endforeach
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
extra_flags = [
# Strict-aliasing rules are violated by uint8_t[] to context size casts.
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 32/33] examples: ignore variable shadowing warnings
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (30 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 31/33] app/test: disable shadowing warnings for unit tests Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 15:50 ` [RFC PATCH v2 33/33] build: enable shadowed variable warnings Bruce Richardson
2025-11-07 16:02 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Stephen Hemminger
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev
Cc: Bruce Richardson, Nicolas Chautru, Chas Williams, Min Hu (Connor),
Chengwen Feng, Kevin Laatz, Ori Kam, Cristian Dumitrescu,
Radu Nicolau, Akhil Goyal, Fan Zhang, Sunil Kumar Kori,
Pavan Nikhilesh, Jerin Jacob, Kiran Kumar K, Nithin Dabilpuram,
Zhirun Yan, Anatoly Burakov, David Hunt, Sivaprasad Tummala,
Volodymyr Fialko, Kirill Rybalchenko, Byron Marohn, Yipeng Wang,
Maxime Coquelin, Chenbo Xia
For examples which don't compile with -Wshadow, explicitly disable those
warnings.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
examples/bbdev_app/meson.build | 1 +
examples/bond/meson.build | 1 +
examples/dma/meson.build | 1 +
examples/ethtool/meson.build | 1 +
examples/eventdev_pipeline/meson.build | 1 +
examples/flow_filtering/meson.build | 1 +
examples/ip_pipeline/meson.build | 1 +
examples/ipsec-secgw/meson.build | 1 +
examples/l2fwd-crypto/meson.build | 1 +
examples/l2fwd-event/meson.build | 1 +
examples/l2fwd-jobstats/meson.build | 1 +
examples/l2fwd-keepalive/meson.build | 1 +
examples/l3fwd-graph/meson.build | 1 +
examples/l3fwd-power/meson.build | 1 +
examples/l3fwd/meson.build | 1 +
examples/multi_process/client_server_mp/mp_server/meson.build | 1 +
examples/packet_ordering/meson.build | 1 +
examples/ptpclient/meson.build | 1 +
examples/qos_sched/meson.build | 1 +
examples/server_node_efd/efd_server/meson.build | 1 +
examples/vhost/meson.build | 1 +
examples/vm_power_manager/guest_cli/meson.build | 1 +
examples/vm_power_manager/meson.build | 1 +
examples/vmdq/meson.build | 1 +
24 files changed, 24 insertions(+)
diff --git a/examples/bbdev_app/meson.build b/examples/bbdev_app/meson.build
index ea588e8706..283a9551b3 100644
--- a/examples/bbdev_app/meson.build
+++ b/examples/bbdev_app/meson.build
@@ -11,3 +11,4 @@ allow_experimental_apis = true
sources = files(
'main.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/bond/meson.build b/examples/bond/meson.build
index 5a6db9a870..45389998e4 100644
--- a/examples/bond/meson.build
+++ b/examples/bond/meson.build
@@ -11,6 +11,7 @@ allow_experimental_apis = true
sources = files(
'main.c',
)
+cflags += no_shadow_cflag
cmd_h = custom_target('commands_hdr',
output: 'commands.h',
diff --git a/examples/dma/meson.build b/examples/dma/meson.build
index 124f9476fc..6a65de127e 100644
--- a/examples/dma/meson.build
+++ b/examples/dma/meson.build
@@ -13,3 +13,4 @@ deps += ['argparse', 'dmadev']
sources = files(
'dmafwd.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/ethtool/meson.build b/examples/ethtool/meson.build
index d7f63d48af..3ad948d109 100644
--- a/examples/ethtool/meson.build
+++ b/examples/ethtool/meson.build
@@ -17,6 +17,7 @@ sources = files(
'ethtool-app/main.c',
)
includes = include_directories('lib', 'ethtool-app')
+cflags += no_shadow_cflag
deps += 'bus_pci'
if dpdk_conf.has('RTE_NET_IXGBE')
diff --git a/examples/eventdev_pipeline/meson.build b/examples/eventdev_pipeline/meson.build
index b8f5cfe109..c317f4b3e2 100644
--- a/examples/eventdev_pipeline/meson.build
+++ b/examples/eventdev_pipeline/meson.build
@@ -13,3 +13,4 @@ sources = files(
'pipeline_worker_generic.c',
'pipeline_worker_tx.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/flow_filtering/meson.build b/examples/flow_filtering/meson.build
index d62d3eddc2..3e0d1627e8 100644
--- a/examples/flow_filtering/meson.build
+++ b/examples/flow_filtering/meson.build
@@ -25,3 +25,4 @@ sources = files(
# The code snippets are not utilized.
cflags += '-Wno-unused-function'
+cflags += no_shadow_cflag
diff --git a/examples/ip_pipeline/meson.build b/examples/ip_pipeline/meson.build
index 68049157e4..c5cda980f9 100644
--- a/examples/ip_pipeline/meson.build
+++ b/examples/ip_pipeline/meson.build
@@ -28,3 +28,4 @@ sources = files(
'thread.c',
'tmgr.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index e6a0e18a73..20fd7c6c5f 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -25,6 +25,7 @@ sources = files(
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
app_cflags = ['-Wno-address-of-packed-member']
foreach flag:app_cflags
diff --git a/examples/l2fwd-crypto/meson.build b/examples/l2fwd-crypto/meson.build
index c21722b85c..8c5432cb7f 100644
--- a/examples/l2fwd-crypto/meson.build
+++ b/examples/l2fwd-crypto/meson.build
@@ -15,3 +15,4 @@ sources = files(
'main.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/l2fwd-event/meson.build b/examples/l2fwd-event/meson.build
index 5bc8188086..ff171189ba 100644
--- a/examples/l2fwd-event/meson.build
+++ b/examples/l2fwd-event/meson.build
@@ -17,3 +17,4 @@ sources = files(
'l2fwd_event_internal_port.c',
'l2fwd_poll.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/l2fwd-jobstats/meson.build b/examples/l2fwd-jobstats/meson.build
index d59d3d6555..51da6e277e 100644
--- a/examples/l2fwd-jobstats/meson.build
+++ b/examples/l2fwd-jobstats/meson.build
@@ -12,3 +12,4 @@ sources = files(
'main.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index e3f72aedb8..258f3baf08 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -19,3 +19,4 @@ sources = files(
'main.c',
'shm.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/l3fwd-graph/meson.build b/examples/l3fwd-graph/meson.build
index b3ceaadb59..e3f4fa8df2 100644
--- a/examples/l3fwd-graph/meson.build
+++ b/examples/l3fwd-graph/meson.build
@@ -11,3 +11,4 @@ sources = files(
'main.c',
)
allow_experimental_apis = true
+cflags += no_shadow_cflag
diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build
index 5ff4466cac..e45cda86f9 100644
--- a/examples/l3fwd-power/meson.build
+++ b/examples/l3fwd-power/meson.build
@@ -13,3 +13,4 @@ sources = files(
'perf_core.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/l3fwd/meson.build b/examples/l3fwd/meson.build
index 74144c7979..a5c47c02b4 100644
--- a/examples/l3fwd/meson.build
+++ b/examples/l3fwd/meson.build
@@ -22,3 +22,4 @@ if dpdk_conf.has('RTE_LIB_EVENTDEV')
deps += 'eventdev'
endif
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/multi_process/client_server_mp/mp_server/meson.build b/examples/multi_process/client_server_mp/mp_server/meson.build
index 9e585e80b9..a31eea764e 100644
--- a/examples/multi_process/client_server_mp/mp_server/meson.build
+++ b/examples/multi_process/client_server_mp/mp_server/meson.build
@@ -14,3 +14,4 @@ sources = files(
'init.c',
'main.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/packet_ordering/meson.build b/examples/packet_ordering/meson.build
index f8be053fb0..092a5258ef 100644
--- a/examples/packet_ordering/meson.build
+++ b/examples/packet_ordering/meson.build
@@ -11,3 +11,4 @@ deps += 'reorder'
sources = files(
'main.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/ptpclient/meson.build b/examples/ptpclient/meson.build
index 47d091ea21..2e9b7625fc 100644
--- a/examples/ptpclient/meson.build
+++ b/examples/ptpclient/meson.build
@@ -10,3 +10,4 @@ allow_experimental_apis = true
sources = files(
'ptpclient.c',
)
+cflags += no_shadow_cflag
diff --git a/examples/qos_sched/meson.build b/examples/qos_sched/meson.build
index 92657ce8a5..4657c756a1 100644
--- a/examples/qos_sched/meson.build
+++ b/examples/qos_sched/meson.build
@@ -18,3 +18,4 @@ sources = files(
'stats.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/server_node_efd/efd_server/meson.build b/examples/server_node_efd/efd_server/meson.build
index f1a6616738..fa0e15d73a 100644
--- a/examples/server_node_efd/efd_server/meson.build
+++ b/examples/server_node_efd/efd_server/meson.build
@@ -10,3 +10,4 @@ allow_experimental_apis = true
deps += 'efd'
sources += files('args.c', 'init.c', 'main.c')
includes += include_directories('../shared')
+cflags += no_shadow_cflag
diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build
index e938be8f45..af5049c7ef 100644
--- a/examples/vhost/meson.build
+++ b/examples/vhost/meson.build
@@ -19,3 +19,4 @@ sources = files(
'virtio_net.c',
)
cflags += no_wvla_cflag
+cflags += no_shadow_cflag
diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build
index 6a6809240e..45f2edab22 100644
--- a/examples/vm_power_manager/guest_cli/meson.build
+++ b/examples/vm_power_manager/guest_cli/meson.build
@@ -13,6 +13,7 @@ sources = files(
'parse.c',
'vm_power_cli_guest.c',
)
+cflags += no_shadow_cflag
allow_experimental_apis = true
diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 53949ce6d8..6bc84d752d 100644
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -29,6 +29,7 @@ sources = files(
'power_manager.c',
'vm_power_cli.c',
)
+cflags += no_shadow_cflag
# If we're on X86, pull in the x86 code for the branch monitor algo.
if dpdk_conf.has('RTE_ARCH_X86_64')
diff --git a/examples/vmdq/meson.build b/examples/vmdq/meson.build
index 441678bbe5..6fcde9815c 100644
--- a/examples/vmdq/meson.build
+++ b/examples/vmdq/meson.build
@@ -10,3 +10,4 @@ allow_experimental_apis = true
sources = files(
'main.c',
)
+cflags += no_shadow_cflag
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* [RFC PATCH v2 33/33] build: enable shadowed variable warnings
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (31 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 32/33] examples: ignore variable shadowing warnings Bruce Richardson
@ 2025-11-07 15:50 ` Bruce Richardson
2025-11-07 16:02 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Stephen Hemminger
33 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 15:50 UTC (permalink / raw)
To: dev; +Cc: Bruce Richardson
Enable -Wshadow globally for DPDK builds.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
config/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/config/meson.build b/config/meson.build
index 927dc18d21..dff4c44fad 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -329,6 +329,7 @@ global_cflags = [
'-Wnested-externs',
'-Wold-style-definition',
'-Wpointer-arith',
+ '-Wshadow',
'-Wsign-compare',
'-Wstrict-prototypes',
'-Wundef',
--
2.48.1
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [RFC PATCH v2 00/33] build DPDK with -Wshadow
2025-11-07 15:49 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Bruce Richardson
` (32 preceding siblings ...)
2025-11-07 15:50 ` [RFC PATCH v2 33/33] build: enable shadowed variable warnings Bruce Richardson
@ 2025-11-07 16:02 ` Stephen Hemminger
2025-11-07 16:13 ` Bruce Richardson
33 siblings, 1 reply; 62+ messages in thread
From: Stephen Hemminger @ 2025-11-07 16:02 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev
On Fri, 7 Nov 2025 15:49:56 +0000
Bruce Richardson <bruce.richardson@intel.com> wrote:
> As flagged in bugs #1742, #1743 and others, much of DPDK fails to build
> when -Wshadow flag is passed to the build. This patchset fixes many issues
> of this nature, but not all, in the hopes we can move towards enabling that
> warning flag for all components for DPDK in future. This patchset fixes the
> following components in DPDK:
>
> * all libraries
> * Intel net drivers
> * all apps in the "app" folder
>
> For the rest of the drivers and example applications, any component which
> does not build successfully with the shadow warning enabled has it
> explicitly disabled via cflags. Then the last patch adds -Wshadow to the
> global DPDK build, which should prevent any regressions in components which
> are already working.
>
> At that point, we should not have any regressions and we can, over time,
> reduce the number of components needing the -Wno-shadow flag.
>
> RFC v2:
> * take patch from Stephen for RTE_MIN/MAX fixes
> * add additional fixes to clear clang warnings - it's a lot stricter than
> gcc in this regard, and flags more issues.
> * extend app cleanup to all apps, not just testpmd
> * add per-component disabling, and add global enable flag at the end.
>
>
> Bruce Richardson (32):
> eal: fix variable shadowing
> ethdev: fix variable shadowing issues
> eventdev: fix variable shadowing issues
> net: remove shadowed variable
> pipeline: fix variable shadowing
> table: fix issues with variable shadowing
> power: rename variable to eliminate shadowing
> pcapng: rename variable to fix shadowing
> telemetry: make socket handler typedef private
> bbdev: fix variable shadowing
> bus/pci: remove shadowed variables
> net/intel: rename function param to avoid shadow warnings
> net/e1000: fix build with shadow warnings enabled
> net/i40e: fix build with shadow warnings enabled
> net/ice: fix build with shadow warnings enabled
> net/cpfl: fix build with shadow warnings enabled
> net/ixgbe: fix build with shadow warnings enabled
> app/test-pmd: fix build with shadow warnings enabled
> app/graph: fix build with shadow warnings enabled
> app/pdump: fix warning about shadowed variable
> app/test-bbdev: use RTE_MAX3 to remove variable shadowing
> app/test-compress-perf: fix variable shadowing
> app/test-crypto-perf: fix shadowed variable
> app/test-dma-perf: renamed shadowed variable
> app/test-eventdev: fix build with shadow warnings enabled
> app/test-flow-perf: remove unneeded variable
> app/test-security-perf: fix build with shadow warnings
> app/test-pipeline: remove unnecessary variable
> drivers: disable variable shadowing warnings for drivers
> app/test: disable shadowing warnings for unit tests
> examples: ignore variable shadowing warnings
> build: enable shadowed variable warnings
>
> Stephen Hemminger (1):
> eal: add more min/max helpers
>
> app/graph/conn.c | 134 +++++++++---------
> app/pdump/main.c | 12 +-
> app/test-bbdev/test_bbdev_perf.c | 7 +-
> app/test-compress-perf/main.c | 122 ++++++++--------
> .../cperf_test_pmd_cyclecount.c | 6 +-
> app/test-dma-perf/main.c | 8 +-
> app/test-eventdev/evt_main.c | 6 +-
> app/test-eventdev/test_atomic_queue.c | 6 +-
> app/test-eventdev/test_perf_common.c | 4 +-
> app/test-flow-perf/main.c | 1 -
> app/test-pipeline/main.c | 1 -
> 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 +-
> app/test-security-perf/test_security_perf.c | 42 +++---
> app/test/meson.build | 1 +
> app/test/test_cryptodev_security_ipsec.c | 13 +-
> config/meson.build | 6 +
> drivers/baseband/fpga_5gnr_fec/meson.build | 2 +
> drivers/bus/fslmc/meson.build | 2 +
> drivers/bus/pci/linux/pci.c | 1 -
> drivers/bus/pci/linux/pci_vfio.c | 2 +-
> drivers/bus/pci/windows/pci.c | 1 -
> drivers/common/cnxk/meson.build | 1 +
> drivers/common/qat/meson.build | 1 +
> drivers/compress/nitrox/meson.build | 2 +
> drivers/crypto/cnxk/meson.build | 1 +
> drivers/crypto/octeontx/meson.build | 1 +
> drivers/crypto/openssl/meson.build | 1 +
> drivers/crypto/scheduler/meson.build | 1 +
> drivers/dma/dpaa2/meson.build | 2 +
> drivers/event/cnxk/meson.build | 1 +
> drivers/event/dlb2/meson.build | 2 +
> drivers/event/sw/meson.build | 1 +
> drivers/net/axgbe/meson.build | 2 +-
> drivers/net/bnxt/meson.build | 1 +
> drivers/net/bonding/meson.build | 1 +
> drivers/net/cnxk/meson.build | 1 +
> drivers/net/cxgbe/meson.build | 1 +
> drivers/net/dpaa/meson.build | 1 +
> drivers/net/dpaa2/meson.build | 1 +
> drivers/net/ena/meson.build | 2 +
> drivers/net/enetfec/meson.build | 2 +
> drivers/net/enic/meson.build | 2 +
> drivers/net/failsafe/meson.build | 1 +
> drivers/net/intel/common/rx.h | 6 +-
> drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c | 2 -
> drivers/net/intel/cpfl/cpfl_flow_parser.c | 6 +-
> drivers/net/intel/cpfl/cpfl_fxp_rule.h | 2 -
> drivers/net/intel/cpfl/cpfl_representor.h | 2 +-
> drivers/net/intel/e1000/igc_ethdev.c | 6 +-
> drivers/net/intel/i40e/i40e_ethdev.h | 10 +-
> drivers/net/intel/ice/ice_ethdev.c | 6 +-
> drivers/net/intel/ixgbe/ixgbe_fdir.c | 7 +-
> drivers/net/mlx5/meson.build | 1 +
> drivers/net/ntnic/meson.build | 3 +
> drivers/net/pfe/meson.build | 3 +
> drivers/net/qede/meson.build | 3 +
> drivers/net/txgbe/meson.build | 1 +
> drivers/net/zxdh/meson.build | 3 +
> drivers/raw/ifpga/meson.build | 2 +
> drivers/vdpa/mlx5/meson.build | 1 +
> examples/bbdev_app/meson.build | 1 +
> examples/bond/meson.build | 1 +
> examples/dma/meson.build | 1 +
> examples/ethtool/meson.build | 1 +
> examples/eventdev_pipeline/meson.build | 1 +
> examples/flow_filtering/meson.build | 1 +
> examples/ip_pipeline/meson.build | 1 +
> examples/ipsec-secgw/meson.build | 1 +
> examples/l2fwd-crypto/meson.build | 1 +
> examples/l2fwd-event/meson.build | 1 +
> examples/l2fwd-jobstats/meson.build | 1 +
> examples/l2fwd-keepalive/meson.build | 1 +
> examples/l3fwd-graph/meson.build | 1 +
> examples/l3fwd-power/meson.build | 1 +
> examples/l3fwd/meson.build | 1 +
> .../client_server_mp/mp_server/meson.build | 1 +
> examples/packet_ordering/meson.build | 1 +
> examples/ptpclient/meson.build | 1 +
> examples/qos_sched/meson.build | 1 +
> .../server_node_efd/efd_server/meson.build | 1 +
> examples/vhost/meson.build | 1 +
> .../vm_power_manager/guest_cli/meson.build | 1 +
> examples/vm_power_manager/meson.build | 1 +
> examples/vmdq/meson.build | 1 +
> lib/bbdev/rte_bbdev.c | 2 +-
> lib/eal/common/eal_common_options.c | 22 +--
> lib/eal/common/eal_common_trace.c | 89 ++++++------
> lib/eal/common/malloc_heap.c | 2 +-
> lib/eal/include/rte_common.h | 31 +++-
> lib/ethdev/ethdev_driver.c | 6 +-
> lib/ethdev/rte_ethdev.c | 1 -
> lib/eventdev/rte_event_eth_rx_adapter.c | 5 +-
> lib/eventdev/rte_event_eth_tx_adapter.c | 8 +-
> lib/net/net_crc_avx512.c | 4 +-
> lib/pcapng/rte_pcapng.c | 7 +-
> lib/pipeline/rte_swx_ctl.c | 11 +-
> lib/pipeline/rte_swx_pipeline.c | 21 ++-
> lib/pipeline/rte_swx_pipeline_internal.h | 10 +-
> lib/power/rte_power_pmd_mgmt.c | 6 +-
> lib/table/rte_lru.h | 38 ++---
> lib/table/rte_lru_arm64.h | 14 +-
> lib/table/rte_lru_x86.h | 4 +-
> lib/table/rte_swx_table_em.c | 2 -
> lib/table/rte_swx_table_learner.c | 4 +-
> lib/table/rte_table_hash_key16.c | 4 +-
> lib/table/rte_table_hash_key32.c | 4 +-
> lib/table/rte_table_hash_key8.c | 4 +-
> lib/telemetry/rte_telemetry.h | 11 --
> lib/telemetry/telemetry.c | 2 +-
> lib/telemetry/telemetry_internal.h | 11 ++
> 113 files changed, 489 insertions(+), 425 deletions(-)
>
> --
> 2.48.1
>
Thanks we may want to wait this series until 26.03 release
Series-Acked-by: Stephen Hemminger <stephen@networkplumber.org>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [RFC PATCH v2 00/33] build DPDK with -Wshadow
2025-11-07 16:02 ` [RFC PATCH v2 00/33] build DPDK with -Wshadow Stephen Hemminger
@ 2025-11-07 16:13 ` Bruce Richardson
0 siblings, 0 replies; 62+ messages in thread
From: Bruce Richardson @ 2025-11-07 16:13 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: dev
On Fri, Nov 07, 2025 at 08:02:50AM -0800, Stephen Hemminger wrote:
> On Fri, 7 Nov 2025 15:49:56 +0000
> Bruce Richardson <bruce.richardson@intel.com> wrote:
>
> > As flagged in bugs #1742, #1743 and others, much of DPDK fails to build
> > when -Wshadow flag is passed to the build. This patchset fixes many issues
> > of this nature, but not all, in the hopes we can move towards enabling that
> > warning flag for all components for DPDK in future. This patchset fixes the
> > following components in DPDK:
> >
> > * all libraries
> > * Intel net drivers
> > * all apps in the "app" folder
> >
> > For the rest of the drivers and example applications, any component which
> > does not build successfully with the shadow warning enabled has it
> > explicitly disabled via cflags. Then the last patch adds -Wshadow to the
> > global DPDK build, which should prevent any regressions in components which
> > are already working.
> >
> > At that point, we should not have any regressions and we can, over time,
> > reduce the number of components needing the -Wno-shadow flag.
> >
> > RFC v2:
> > * take patch from Stephen for RTE_MIN/MAX fixes
> > * add additional fixes to clear clang warnings - it's a lot stricter than
> > gcc in this regard, and flags more issues.
> > * extend app cleanup to all apps, not just testpmd
> > * add per-component disabling, and add global enable flag at the end.
> >
> >
> > Bruce Richardson (32):
> > eal: fix variable shadowing
> > ethdev: fix variable shadowing issues
> > eventdev: fix variable shadowing issues
> > net: remove shadowed variable
> > pipeline: fix variable shadowing
> > table: fix issues with variable shadowing
> > power: rename variable to eliminate shadowing
> > pcapng: rename variable to fix shadowing
> > telemetry: make socket handler typedef private
> > bbdev: fix variable shadowing
> > bus/pci: remove shadowed variables
> > net/intel: rename function param to avoid shadow warnings
> > net/e1000: fix build with shadow warnings enabled
> > net/i40e: fix build with shadow warnings enabled
> > net/ice: fix build with shadow warnings enabled
> > net/cpfl: fix build with shadow warnings enabled
> > net/ixgbe: fix build with shadow warnings enabled
> > app/test-pmd: fix build with shadow warnings enabled
> > app/graph: fix build with shadow warnings enabled
> > app/pdump: fix warning about shadowed variable
> > app/test-bbdev: use RTE_MAX3 to remove variable shadowing
> > app/test-compress-perf: fix variable shadowing
> > app/test-crypto-perf: fix shadowed variable
> > app/test-dma-perf: renamed shadowed variable
> > app/test-eventdev: fix build with shadow warnings enabled
> > app/test-flow-perf: remove unneeded variable
> > app/test-security-perf: fix build with shadow warnings
> > app/test-pipeline: remove unnecessary variable
> > drivers: disable variable shadowing warnings for drivers
> > app/test: disable shadowing warnings for unit tests
> > examples: ignore variable shadowing warnings
> > build: enable shadowed variable warnings
> >
> > Stephen Hemminger (1):
> > eal: add more min/max helpers
> >
> > app/graph/conn.c | 134 +++++++++---------
> > app/pdump/main.c | 12 +-
> > app/test-bbdev/test_bbdev_perf.c | 7 +-
> > app/test-compress-perf/main.c | 122 ++++++++--------
> > .../cperf_test_pmd_cyclecount.c | 6 +-
> > app/test-dma-perf/main.c | 8 +-
> > app/test-eventdev/evt_main.c | 6 +-
> > app/test-eventdev/test_atomic_queue.c | 6 +-
> > app/test-eventdev/test_perf_common.c | 4 +-
> > app/test-flow-perf/main.c | 1 -
> > app/test-pipeline/main.c | 1 -
> > 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 +-
> > app/test-security-perf/test_security_perf.c | 42 +++---
> > app/test/meson.build | 1 +
> > app/test/test_cryptodev_security_ipsec.c | 13 +-
> > config/meson.build | 6 +
> > drivers/baseband/fpga_5gnr_fec/meson.build | 2 +
> > drivers/bus/fslmc/meson.build | 2 +
> > drivers/bus/pci/linux/pci.c | 1 -
> > drivers/bus/pci/linux/pci_vfio.c | 2 +-
> > drivers/bus/pci/windows/pci.c | 1 -
> > drivers/common/cnxk/meson.build | 1 +
> > drivers/common/qat/meson.build | 1 +
> > drivers/compress/nitrox/meson.build | 2 +
> > drivers/crypto/cnxk/meson.build | 1 +
> > drivers/crypto/octeontx/meson.build | 1 +
> > drivers/crypto/openssl/meson.build | 1 +
> > drivers/crypto/scheduler/meson.build | 1 +
> > drivers/dma/dpaa2/meson.build | 2 +
> > drivers/event/cnxk/meson.build | 1 +
> > drivers/event/dlb2/meson.build | 2 +
> > drivers/event/sw/meson.build | 1 +
> > drivers/net/axgbe/meson.build | 2 +-
> > drivers/net/bnxt/meson.build | 1 +
> > drivers/net/bonding/meson.build | 1 +
> > drivers/net/cnxk/meson.build | 1 +
> > drivers/net/cxgbe/meson.build | 1 +
> > drivers/net/dpaa/meson.build | 1 +
> > drivers/net/dpaa2/meson.build | 1 +
> > drivers/net/ena/meson.build | 2 +
> > drivers/net/enetfec/meson.build | 2 +
> > drivers/net/enic/meson.build | 2 +
> > drivers/net/failsafe/meson.build | 1 +
> > drivers/net/intel/common/rx.h | 6 +-
> > drivers/net/intel/cpfl/cpfl_flow_engine_fxp.c | 2 -
> > drivers/net/intel/cpfl/cpfl_flow_parser.c | 6 +-
> > drivers/net/intel/cpfl/cpfl_fxp_rule.h | 2 -
> > drivers/net/intel/cpfl/cpfl_representor.h | 2 +-
> > drivers/net/intel/e1000/igc_ethdev.c | 6 +-
> > drivers/net/intel/i40e/i40e_ethdev.h | 10 +-
> > drivers/net/intel/ice/ice_ethdev.c | 6 +-
> > drivers/net/intel/ixgbe/ixgbe_fdir.c | 7 +-
> > drivers/net/mlx5/meson.build | 1 +
> > drivers/net/ntnic/meson.build | 3 +
> > drivers/net/pfe/meson.build | 3 +
> > drivers/net/qede/meson.build | 3 +
> > drivers/net/txgbe/meson.build | 1 +
> > drivers/net/zxdh/meson.build | 3 +
> > drivers/raw/ifpga/meson.build | 2 +
> > drivers/vdpa/mlx5/meson.build | 1 +
> > examples/bbdev_app/meson.build | 1 +
> > examples/bond/meson.build | 1 +
> > examples/dma/meson.build | 1 +
> > examples/ethtool/meson.build | 1 +
> > examples/eventdev_pipeline/meson.build | 1 +
> > examples/flow_filtering/meson.build | 1 +
> > examples/ip_pipeline/meson.build | 1 +
> > examples/ipsec-secgw/meson.build | 1 +
> > examples/l2fwd-crypto/meson.build | 1 +
> > examples/l2fwd-event/meson.build | 1 +
> > examples/l2fwd-jobstats/meson.build | 1 +
> > examples/l2fwd-keepalive/meson.build | 1 +
> > examples/l3fwd-graph/meson.build | 1 +
> > examples/l3fwd-power/meson.build | 1 +
> > examples/l3fwd/meson.build | 1 +
> > .../client_server_mp/mp_server/meson.build | 1 +
> > examples/packet_ordering/meson.build | 1 +
> > examples/ptpclient/meson.build | 1 +
> > examples/qos_sched/meson.build | 1 +
> > .../server_node_efd/efd_server/meson.build | 1 +
> > examples/vhost/meson.build | 1 +
> > .../vm_power_manager/guest_cli/meson.build | 1 +
> > examples/vm_power_manager/meson.build | 1 +
> > examples/vmdq/meson.build | 1 +
> > lib/bbdev/rte_bbdev.c | 2 +-
> > lib/eal/common/eal_common_options.c | 22 +--
> > lib/eal/common/eal_common_trace.c | 89 ++++++------
> > lib/eal/common/malloc_heap.c | 2 +-
> > lib/eal/include/rte_common.h | 31 +++-
> > lib/ethdev/ethdev_driver.c | 6 +-
> > lib/ethdev/rte_ethdev.c | 1 -
> > lib/eventdev/rte_event_eth_rx_adapter.c | 5 +-
> > lib/eventdev/rte_event_eth_tx_adapter.c | 8 +-
> > lib/net/net_crc_avx512.c | 4 +-
> > lib/pcapng/rte_pcapng.c | 7 +-
> > lib/pipeline/rte_swx_ctl.c | 11 +-
> > lib/pipeline/rte_swx_pipeline.c | 21 ++-
> > lib/pipeline/rte_swx_pipeline_internal.h | 10 +-
> > lib/power/rte_power_pmd_mgmt.c | 6 +-
> > lib/table/rte_lru.h | 38 ++---
> > lib/table/rte_lru_arm64.h | 14 +-
> > lib/table/rte_lru_x86.h | 4 +-
> > lib/table/rte_swx_table_em.c | 2 -
> > lib/table/rte_swx_table_learner.c | 4 +-
> > lib/table/rte_table_hash_key16.c | 4 +-
> > lib/table/rte_table_hash_key32.c | 4 +-
> > lib/table/rte_table_hash_key8.c | 4 +-
> > lib/telemetry/rte_telemetry.h | 11 --
> > lib/telemetry/telemetry.c | 2 +-
> > lib/telemetry/telemetry_internal.h | 11 ++
> > 113 files changed, 489 insertions(+), 425 deletions(-)
> >
> > --
> > 2.48.1
> >
>
> Thanks we may want to wait this series until 26.03 release
> Series-Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Yes, absolutely, which is why it's still down as an RFC. I've also already
marked it as deferred in patchwork.
However, I also wanted to get it out early so that it can be considered for
early merge in 26.03 to avoid later problems with new shadowing issues being
introduced in 26.03, and also to get build checks from the CI, since I
can't test the build of every single driver on my system (thankfully there
are only about a half a dozen which I can't build).
/Bruce
^ permalink raw reply [flat|nested] 62+ messages in thread