[PATCH 053/227] common/nitrox: use NUMA node terminology
Chengwen Feng
chengwen.feng at linux.dev
Tue Nov 3 15:50:11 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/common/nitrox/nitrox_device.c | 2 +-
drivers/common/nitrox/nitrox_qp.c | 16 ++++++++--------
drivers/common/nitrox/nitrox_qp.h | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/common/nitrox/nitrox_device.c b/drivers/common/nitrox/nitrox_device.c
index 74c7a859a4..27a4d69ac0 100644
--- a/drivers/common/nitrox/nitrox_device.c
+++ b/drivers/common/nitrox/nitrox_device.c
@@ -19,7 +19,7 @@ ndev_allocate(struct rte_pci_device *pdev)
{
struct nitrox_device *ndev;
- ndev = rte_zmalloc_socket("nitrox device", sizeof(*ndev),
+ ndev = rte_zmalloc_numa("nitrox device", sizeof(*ndev),
RTE_CACHE_LINE_SIZE,
pdev->device.numa_node);
if (!ndev)
diff --git a/drivers/common/nitrox/nitrox_qp.c b/drivers/common/nitrox/nitrox_qp.c
index 8f481e6876..1c0279e63f 100644
--- a/drivers/common/nitrox/nitrox_qp.c
+++ b/drivers/common/nitrox/nitrox_qp.c
@@ -15,7 +15,7 @@
static int
nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
- const char *dev_name, uint8_t instr_size, int socket_id)
+ const char *dev_name, uint8_t instr_size, int numa_id)
{
char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz;
@@ -24,7 +24,7 @@ nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
int err = 0;
snprintf(mz_name, sizeof(mz_name), "%s_cmdq_%d", dev_name, qp->qno);
- mz = rte_memzone_reserve_aligned(mz_name, cmdq_size, socket_id,
+ mz = rte_memzone_reserve_aligned(mz_name, cmdq_size, numa_id,
RTE_MEMZONE_SIZE_HINT_ONLY |
RTE_MEMZONE_256MB,
CMDQ_PKT_IN_ALIGN);
@@ -66,13 +66,13 @@ nitrox_setup_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr,
}
static int
-nitrox_setup_ridq(struct nitrox_qp *qp, int socket_id)
+nitrox_setup_ridq(struct nitrox_qp *qp, int numa_id)
{
size_t ridq_size = qp->count * sizeof(*qp->ridq);
- qp->ridq = rte_zmalloc_socket("nitrox ridq", ridq_size,
+ qp->ridq = rte_zmalloc_numa("nitrox ridq", ridq_size,
RTE_CACHE_LINE_SIZE,
- socket_id);
+ numa_id);
if (!qp->ridq) {
NITROX_LOG_LINE(ERR, "Failed to create rid queue");
return -ENOMEM;
@@ -107,7 +107,7 @@ nitrox_release_cmdq(struct nitrox_qp *qp, uint8_t *bar_addr)
RTE_EXPORT_INTERNAL_SYMBOL(nitrox_qp_setup)
int
nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr, const char *dev_name,
- uint32_t nb_descriptors, uint8_t instr_size, int socket_id)
+ uint32_t nb_descriptors, uint8_t instr_size, int numa_id)
{
int err;
uint32_t count;
@@ -126,11 +126,11 @@ nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr, const char *dev_name,
qp->head = qp->tail = 0;
rte_atomic_store_explicit(&qp->pending_count, 0,
rte_memory_order_relaxed);
- err = nitrox_setup_cmdq(qp, bar_addr, dev_name, instr_size, socket_id);
+ err = nitrox_setup_cmdq(qp, bar_addr, dev_name, instr_size, numa_id);
if (err)
return err;
- err = nitrox_setup_ridq(qp, socket_id);
+ err = nitrox_setup_ridq(qp, numa_id);
if (err)
goto ridq_err;
diff --git a/drivers/common/nitrox/nitrox_qp.h b/drivers/common/nitrox/nitrox_qp.h
index c328b88926..6aa3480cac 100644
--- a/drivers/common/nitrox/nitrox_qp.h
+++ b/drivers/common/nitrox/nitrox_qp.h
@@ -139,7 +139,7 @@ nitrox_qp_dequeue(struct nitrox_qp *qp)
__rte_internal
int nitrox_qp_setup(struct nitrox_qp *qp, uint8_t *bar_addr,
const char *dev_name, uint32_t nb_descriptors,
- uint8_t inst_size, int socket_id);
+ uint8_t inst_size, int numa_id);
__rte_internal
int nitrox_qp_release(struct nitrox_qp *qp, uint8_t *bar_addr);
--
2.55.0
More information about the dev
mailing list