[PATCH 154/227] net/vmxnet3: use NUMA node terminology
Chengwen Feng
chengwen.feng at linux.dev
Tue Nov 3 15:51:52 CET 2026
From: Chengwen Feng <fengchengwen at huawei.com>
Rename socket_id parameters, internal structure fields, variables
and comments to the NUMA node terminology, and switch calls to
the NUMA-named APIs.
Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
---
drivers/net/vmxnet3/vmxnet3_ethdev.c | 14 +++++++-------
drivers/net/vmxnet3/vmxnet3_ethdev.h | 4 ++--
drivers/net/vmxnet3/vmxnet3_rxtx.c | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 4a7c76cfef..5f18e26c4c 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -179,7 +179,7 @@ static const struct vmxnet3_xstats_name_off vmxnet3_rxq_stat_strings[] = {
static const struct rte_memzone *
gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size,
- const char *post_string, int socket_id,
+ const char *post_string, int numa_id,
uint16_t align, bool reuse)
{
char z_name[RTE_MEMZONE_NAMESIZE];
@@ -191,14 +191,14 @@ gpa_zone_reserve(struct rte_eth_dev *dev, uint32_t size,
mz = rte_memzone_lookup(z_name);
if (!reuse) {
rte_memzone_free(mz);
- return rte_memzone_reserve_aligned(z_name, size, socket_id,
+ return rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
if (mz)
return mz;
- return rte_memzone_reserve_aligned(z_name, size, socket_id,
+ return rte_memzone_reserve_aligned(z_name, size, numa_id,
RTE_MEMZONE_IOVA_CONTIG, align);
}
@@ -653,7 +653,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
* on current socket
*/
mz = gpa_zone_reserve(dev, sizeof(struct Vmxnet3_DriverShared),
- "shared", rte_socket_id(), 8, 1);
+ "shared", rte_numa_id(), 8, 1);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating shared zone");
@@ -672,7 +672,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
* depends on the number of tx and rx queues, which could be different
* from one config to another.
*/
- mz = gpa_zone_reserve(dev, size, "queuedesc", rte_socket_id(),
+ mz = gpa_zone_reserve(dev, size, "queuedesc", rte_numa_id(),
VMXNET3_QUEUE_DESC_ALIGN, 0);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
@@ -689,7 +689,7 @@ vmxnet3_dev_configure(struct rte_eth_dev *dev)
if (dev->data->dev_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_RSS) {
/* Allocate memory structure for UPT1_RSSConf and configure */
mz = gpa_zone_reserve(dev, sizeof(struct VMXNET3_RSSConf),
- "rss_conf", rte_socket_id(),
+ "rss_conf", rte_numa_id(),
RTE_CACHE_LINE_SIZE, 1);
if (mz == NULL) {
PMD_INIT_LOG(ERR,
@@ -820,7 +820,7 @@ vmxnet3_dev_setup_memreg(struct rte_eth_dev *dev)
(2 * VMXNET3_MAX_MEMREG_QUEUES) *
sizeof(Vmxnet3_MemoryRegion);
- mz = gpa_zone_reserve(dev, size, "memRegs", rte_socket_id(), 8,
+ mz = gpa_zone_reserve(dev, size, "memRegs", rte_numa_id(), 8,
1);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating memRegs zone");
diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index 75dafa664f..a7830bba40 100644
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -208,14 +208,14 @@ void vmxnet3_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid);
int vmxnet3_v4_rss_configure(struct rte_eth_dev *dev);
int vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id,
- uint16_t nb_rx_desc, unsigned int socket_id,
+ uint16_t nb_rx_desc, unsigned int numa_id,
const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mb_pool);
int vmxnet3_dev_rx_queue_count(void *rx_queue);
int vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id,
- uint16_t nb_tx_desc, unsigned int socket_id,
+ uint16_t nb_tx_desc, unsigned int numa_id,
const struct rte_eth_txconf *tx_conf);
int vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev);
diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c
index aaebfc8675..b9b3de90f9 100644
--- a/drivers/net/vmxnet3/vmxnet3_rxtx.c
+++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c
@@ -1031,7 +1031,7 @@ int
vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
const struct rte_eth_txconf *tx_conf __rte_unused)
{
struct vmxnet3_hw *hw = dev->data->dev_private;
@@ -1092,7 +1092,7 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev,
size += txq->txdata_desc_size * data_ring->size;
mz = rte_eth_dma_zone_reserve(dev, "txdesc", queue_idx, size,
- VMXNET3_RING_BA_ALIGN, socket_id);
+ VMXNET3_RING_BA_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
@@ -1132,7 +1132,7 @@ int
vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
uint16_t nb_desc,
- unsigned int socket_id,
+ unsigned int numa_id,
__rte_unused const struct rte_eth_rxconf *rx_conf,
struct rte_mempool *mp)
{
@@ -1208,7 +1208,7 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev,
size += rxq->data_desc_size * data_ring->size;
mz = rte_eth_dma_zone_reserve(dev, "rxdesc", queue_idx, size,
- VMXNET3_RING_BA_ALIGN, socket_id);
+ VMXNET3_RING_BA_ALIGN, numa_id);
if (mz == NULL) {
PMD_INIT_LOG(ERR, "ERROR: Creating queue descriptors zone");
return -ENOMEM;
--
2.55.0
More information about the dev
mailing list