From: Chengwen Feng <[email protected]> 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 <[email protected]> --- drivers/dma/skeleton/skeleton_dmadev.c | 26 +++++++++++++------------- drivers/dma/skeleton/skeleton_dmadev.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/dma/skeleton/skeleton_dmadev.c b/drivers/dma/skeleton/skeleton_dmadev.c index e287802eb9..05f07fe80a 100644 --- a/drivers/dma/skeleton/skeleton_dmadev.c +++ b/drivers/dma/skeleton/skeleton_dmadev.c @@ -235,24 +235,24 @@ vchan_setup(struct skeldma_hw *hw, int16_t dev_id, uint16_t nb_desc) struct rte_ring *completed; uint16_t i; - desc = rte_zmalloc_socket(NULL, nb_desc * sizeof(struct skeldma_desc), - RTE_CACHE_LINE_SIZE, hw->socket_id); + desc = rte_zmalloc_numa(NULL, nb_desc * sizeof(struct skeldma_desc), + RTE_CACHE_LINE_SIZE, hw->numa_id); if (desc == NULL) { SKELDMA_LOG(ERR, "Malloc dma skeleton desc fail!"); return -ENOMEM; } snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_empty_%d", dev_id); - empty = rte_ring_create(name, nb_desc, hw->socket_id, + empty = rte_ring_create(name, nb_desc, hw->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ); snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_pend_%d", dev_id); - pending = rte_ring_create(name, nb_desc, hw->socket_id, + pending = rte_ring_create(name, nb_desc, hw->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ); snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_run_%d", dev_id); - running = rte_ring_create(name, nb_desc, hw->socket_id, + running = rte_ring_create(name, nb_desc, hw->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ); snprintf(name, RTE_RING_NAMESIZE, "dma_skel_desc_comp_%d", dev_id); - completed = rte_ring_create(name, nb_desc, hw->socket_id, + completed = rte_ring_create(name, nb_desc, hw->numa_id, RING_F_SP_ENQ | RING_F_SC_DEQ); if (empty == NULL || pending == NULL || running == NULL || completed == NULL) { @@ -380,12 +380,12 @@ skeldma_dump(const struct rte_dma_dev *dev, FILE *f) (void)fprintf(f, " lcore_id: %d\n" - " socket_id: %d\n" + " numa_id: %d\n" " desc_empty_ring_count: %u\n" " desc_pending_ring_count: %u\n" " desc_running_ring_count: %u\n" " desc_completed_ring_count: %u\n", - hw->lcore_id, hw->socket_id, + hw->lcore_id, hw->numa_id, GET_RING_COUNT(hw->desc_empty), GET_RING_COUNT(hw->desc_pending), GET_RING_COUNT(hw->desc_running), @@ -601,11 +601,11 @@ skeldma_create(const char *name, struct rte_vdev_device *vdev, int lcore_id) { struct rte_dma_dev *dev; struct skeldma_hw *hw; - int socket_id; + int numa_id; - socket_id = (lcore_id < 0) ? rte_socket_id() : - rte_lcore_to_socket_id(lcore_id); - dev = rte_dma_pmd_allocate(name, socket_id, sizeof(struct skeldma_hw)); + numa_id = (lcore_id < 0) ? rte_numa_id() : + rte_lcore_to_numa_id(lcore_id); + dev = rte_dma_pmd_allocate(name, numa_id, sizeof(struct skeldma_hw)); if (dev == NULL) { SKELDMA_LOG(ERR, "Unable to allocate dmadev: %s", name); return -EINVAL; @@ -624,7 +624,7 @@ skeldma_create(const char *name, struct rte_vdev_device *vdev, int lcore_id) hw = dev->data->dev_private; hw->lcore_id = lcore_id; - hw->socket_id = socket_id; + hw->numa_id = numa_id; dev->state = RTE_DMA_DEV_READY; diff --git a/drivers/dma/skeleton/skeleton_dmadev.h b/drivers/dma/skeleton/skeleton_dmadev.h index 0365f64589..2fe0547acb 100644 --- a/drivers/dma/skeleton/skeleton_dmadev.h +++ b/drivers/dma/skeleton/skeleton_dmadev.h @@ -45,7 +45,7 @@ struct skeldma_desc { struct skeldma_hw { int lcore_id; /* cpuwork task affinity core */ - int socket_id; + int numa_id; rte_thread_t thread; /* cpuwork task thread */ volatile int exit_flag; /* cpuwork task exit flag */ -- 2.55.0
