[PATCH v14 12/18] net/pcap: reduce scope of file-level variables

Stephen Hemminger
2026-02-11T22:22:54Z

Move errbuf from file scope to local variables in the two functions that
use it (open_iface_live and open_single_rx_pcap). This avoids potential
issues if these functions were called concurrently, since each call now
has its own error buffer. Move iface_idx to a static local variable
within pmd_init_internals(), the only function that uses it. The
variable remains static to preserve the MAC address uniqueness counter
across calls.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Marat Khalili <marat.khalili@huawei.com>
---
drivers/net/pcap/pcap_ethdev.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/pcap/pcap_ethdev.c b/drivers/net/pcap/pcap_ethdev.c
index 3522401b5e..89c1eac8d2 100644
--- a/drivers/net/pcap/pcap_ethdev.c
+++ b/drivers/net/pcap/pcap_ethdev.c
@@ -47,11 +47,9 @@

#define RTE_PMD_PCAP_MAX_QUEUES 16

-static char errbuf[PCAP_ERRBUF_SIZE];
static struct timespec start_time;
static uint64_t start_cycles;
static uint64_t hz;
-static uint8_t iface_idx;

static uint64_t timestamp_rx_dynflag;
static int timestamp_dynfield_offset = -1;
@@ -627,6 +625,7 @@ eth_pcap_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
static inline int
open_iface_live(const char *iface, pcap_t **pcap)
{
+ char errbuf[PCAP_ERRBUF_SIZE];
pcap_t *pc;
int status;

@@ -738,6 +737,8 @@ open_single_tx_pcap(const char *pcap_filename, pcap_dumper_t **dumper)
static int
open_single_rx_pcap(const char *pcap_filename, pcap_t **pcap)
{
+ char errbuf[PCAP_ERRBUF_SIZE];
+
*pcap = pcap_open_offline_with_tstamp_precision(pcap_filename,
PCAP_TSTAMP_PRECISION_NANO, errbuf);
if (*pcap == NULL) {
@@ -1541,6 +1542,7 @@ pmd_init_internals(struct rte_vdev_device *vdev,
* derived from: 'locally administered':'p':'c':'a':'p':'iface_idx'
* where the middle 4 characters are converted to hex.
*/
+ static uint8_t iface_idx;
(*internals)->eth_addr = (struct rte_ether_addr) {
.addr_bytes = { 0x02, 0x70, 0x63, 0x61, 0x70, iface_idx++ }
};
--
2.51.0