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/event/octeontx/ssovf_evdev.c | 4 ++-- drivers/event/octeontx/ssovf_evdev_selftest.c | 2 +- drivers/event/octeontx/ssovf_worker.c | 2 +- drivers/event/octeontx/timvf_evdev.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c index 1e5818569b..ba9e92fd99 100644 --- a/drivers/event/octeontx/ssovf_evdev.c +++ b/drivers/event/octeontx/ssovf_evdev.c @@ -254,7 +254,7 @@ ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id, } /* Allocate event port memory */ - ws = rte_zmalloc_socket("eventdev ssows", + ws = rte_zmalloc_numa("eventdev ssows", sizeof(struct ssows), RTE_CACHE_LINE_SIZE, dev->data->numa_id); if (ws == NULL) { @@ -893,7 +893,7 @@ ssovf_vdev_probe(struct rte_vdev_device *vdev) } eventdev = rte_event_pmd_vdev_init(name, sizeof(struct ssovf_evdev), - rte_socket_id(), vdev); + rte_numa_id(), vdev); if (eventdev == NULL) { ssovf_log_err("Failed to create eventdev vdev %s", name); return -ENOMEM; diff --git a/drivers/event/octeontx/ssovf_evdev_selftest.c b/drivers/event/octeontx/ssovf_evdev_selftest.c index df8e710b57..45ff890780 100644 --- a/drivers/event/octeontx/ssovf_evdev_selftest.c +++ b/drivers/event/octeontx/ssovf_evdev_selftest.c @@ -159,7 +159,7 @@ _eventdev_setup(int mode) 0 /*MBUF_CACHE_SIZE*/, 0, 512, /* Use very small mbufs */ - rte_socket_id()); + rte_numa_id()); if (!eventdev_test_mempool) { ssovf_log_dbg("ERROR creating mempool"); return -1; diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c index f3c6a0da5c..fe7031b6c5 100644 --- a/drivers/event/octeontx/ssovf_worker.c +++ b/drivers/event/octeontx/ssovf_worker.c @@ -463,7 +463,7 @@ octeontx_fastpath_lookup_mem_get(void) /* Request for the first time */ mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ, - SOCKET_ID_ANY, 0, OCCTX_ALIGN); + RTE_NUMA_ID_ANY, 0, OCCTX_ALIGN); if (mz != NULL) { mem = mz->addr; /* Form the rx ol_flags based on errcode */ diff --git a/drivers/event/octeontx/timvf_evdev.c b/drivers/event/octeontx/timvf_evdev.c index b404b1db61..5eaf580c7f 100644 --- a/drivers/event/octeontx/timvf_evdev.c +++ b/drivers/event/octeontx/timvf_evdev.c @@ -323,7 +323,7 @@ timvf_ring_create(struct rte_event_timer_adapter *adptr) snprintf(pool_name, sizeof(pool_name), "timvf_chunk_pool%d", timr->tim_ring_id); timr->chunk_pool = (void *)rte_mempool_create_empty(pool_name, - timr->nb_chunks, TIM_CHUNK_SIZE, 0, 0, rte_socket_id(), + timr->nb_chunks, TIM_CHUNK_SIZE, 0, 0, rte_numa_id(), mp_flags); if (!timr->chunk_pool) { -- 2.55.0
