use NUMA node terminology across the tree

index 6636d1517f..db7269315c 100644
@@ -1006,7 +1006,7 @@ args_parse(int argc, char **argv)
 static size_t
 dump_socket_mem(FILE *f)
 {
-	struct rte_malloc_socket_stats socket_stats;
+	struct rte_malloc_numa_stats socket_stats;
 	unsigned int i = 0;
 	size_t total = 0;
 	size_t alloc = 0;

@@ -1017,7 +1017,7 @@ dump_socket_mem(FILE *f)
 
 
 	for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
-		if (rte_malloc_get_socket_stats(i, &socket_stats) ||
+		if (rte_malloc_get_numa_stats(i, &socket_stats) ||
 		    !socket_stats.heap_totalsz_bytes)
 			continue;
 		active_nodes = true;

index 51078a2a73..cdf73540ec 100644
@@ -9367,7 +9367,7 @@ dump_struct_sizes(void)
 static void
 dump_socket_mem(FILE *f)
 {
-	struct rte_malloc_socket_stats socket_stats;
+	struct rte_malloc_numa_stats socket_stats;
 	unsigned int i;
 	size_t total = 0;
 	size_t alloc = 0;

@@ -9378,7 +9378,7 @@ dump_socket_mem(FILE *f)
 	static size_t last_total;
 
 	for (i = 0; i < RTE_MAX_NUMA_NODES; i++) {
-		if (rte_malloc_get_socket_stats(i, &socket_stats) ||
+		if (rte_malloc_get_numa_stats(i, &socket_stats) ||
 		    !socket_stats.heap_totalsz_bytes)
 			continue;
 		total += socket_stats.heap_totalsz_bytes;

index d6211a9a8a..c99b54a003 100644
@@ -1086,7 +1086,7 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
 	memset(&param, 0, sizeof(param));
 
 	/* check if our heap exists */
-	socket_id = rte_malloc_heap_get_socket(EXTMEM_HEAP_NAME);
+	socket_id = rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
 	if (socket_id < 0) {
 		/* create our heap */
 		ret = rte_malloc_heap_create(EXTMEM_HEAP_NAME);

@@ -1327,7 +1327,7 @@ mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
 				rte_exit(EXIT_FAILURE, "Could not create external memory\n");
 
 			heap_socket =
-				rte_malloc_heap_get_socket(EXTMEM_HEAP_NAME);
+				rte_malloc_heap_get_numa_id(EXTMEM_HEAP_NAME);
 			if (heap_socket < 0)
 				rte_exit(EXIT_FAILURE, "Could not get external memory socket ID\n");
 

index 2c8d0d8e00..8e6313f4e9 100644
@@ -103,7 +103,7 @@ test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
 			goto fail;
 		}
 
-		if (rte_malloc_heap_get_socket(name) >= 0 ||
+		if (rte_malloc_heap_get_numa_id(name) >= 0 ||
 				rte_errno != EINVAL) {
 			printf("%s():%i: Found socket for heap with invalid name\n",
 					__func__, __LINE__);

@@ -145,7 +145,7 @@ test_malloc_invalid_param(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
 			__func__, __LINE__);
 		goto fail;
 	}
-	if (rte_malloc_heap_get_socket(valid_name) >= 0 ||
+	if (rte_malloc_heap_get_numa_id(valid_name) >= 0 ||
 			rte_errno != ENOENT) {
 		printf("%s():%i: Found socket for heap with invalid name\n",
 				__func__, __LINE__);

@@ -296,7 +296,7 @@ test_malloc_basic(void *addr, size_t len, size_t pgsz, rte_iova_t *iova,
 	}
 
 	/* get socket ID corresponding to this heap */
-	socket_id = rte_malloc_heap_get_socket(heap_name);
+	socket_id = rte_malloc_heap_get_numa_id(heap_name);
 	if (socket_id < 0) {
 		printf("%s():%i: cannot find socket for external heap\n",
 			__func__, __LINE__);

index 151d1a3f2c..3674dc3f7f 100644
@@ -278,7 +278,7 @@ test_multi_alloc_statistics(void)
 {
 	int ret = -1;  /* default return is error, cleared at end on success */
 	int socket = 0;
-	struct rte_malloc_socket_stats pre_stats, post_stats ,first_stats, second_stats;
+	struct rte_malloc_numa_stats pre_stats, post_stats, first_stats, second_stats;
 	size_t size = 2048;
 	int align = 1024;
 	int overhead = 0;

@@ -313,7 +313,7 @@ test_multi_alloc_statistics(void)
 		printf("Failed to add memory to heap\n");
 		goto cleanup_allocated_memory;
 	}
-	socket = rte_malloc_heap_get_socket(__func__);
+	socket = rte_malloc_heap_get_numa_id(__func__);
 	if (socket < 0) {
 		printf("Failed to get socket for test malloc heap.\n");
 		goto cleanup_all;

@@ -322,13 +322,13 @@ test_multi_alloc_statistics(void)
 	/* Dynamically calculate the overhead by allocating one cacheline and
 	 * then comparing what was allocated from the heap.
 	 */
-	rte_malloc_get_socket_stats(socket, &pre_stats);
+	rte_malloc_get_numa_stats(socket, &pre_stats);
 
 	void *dummy = rte_malloc_socket(NULL, RTE_CACHE_LINE_SIZE, 0, socket);
 	if (dummy == NULL)
 		goto cleanup_all;
 
-	rte_malloc_get_socket_stats(socket, &post_stats);
+	rte_malloc_get_numa_stats(socket, &post_stats);
 
 	/* after subtracting cache line, remainder is overhead */
 	overhead = post_stats.heap_allocsz_bytes - pre_stats.heap_allocsz_bytes;

@@ -337,7 +337,7 @@ test_multi_alloc_statistics(void)
 	rte_free(dummy);
 
 	/* Now start the real tests */
-	rte_malloc_get_socket_stats(socket, &pre_stats);
+	rte_malloc_get_numa_stats(socket, &pre_stats);
 
 	void *p1 = rte_malloc_socket("stats", size , align, socket);
 	if (!p1)

@@ -346,7 +346,7 @@ test_multi_alloc_statistics(void)
 	rte_free(p1);
 	rte_malloc_dump_stats(stdout, "stats");
 
-	rte_malloc_get_socket_stats(socket,&post_stats);
+	rte_malloc_get_numa_stats(socket, &post_stats);
 	/* Check statistics reported are correct */
 	/* All post stats should be equal to pre stats after alloc freed */
 	if ((post_stats.heap_totalsz_bytes != pre_stats.heap_totalsz_bytes) ||

@@ -360,23 +360,23 @@ test_multi_alloc_statistics(void)
 	/* Check two consecutive allocations */
 	size = 1024;
 	align = 0;
-	rte_malloc_get_socket_stats(socket,&pre_stats);
+	rte_malloc_get_numa_stats(socket, &pre_stats);
 	void *p2 = rte_malloc_socket("add", size ,align, socket);
 	if (!p2)
 		goto cleanup_all;
-	rte_malloc_get_socket_stats(socket,&first_stats);
+	rte_malloc_get_numa_stats(socket, &first_stats);
 
 	void *p3 = rte_malloc_socket("add2", size,align, socket);
 	if (!p3)
 		goto cleanup_all;
 
-	rte_malloc_get_socket_stats(socket,&second_stats);
+	rte_malloc_get_numa_stats(socket, &second_stats);
 
 	rte_free(p2);
 	rte_free(p3);
 
 	/* After freeing both allocations check stats return to original */
-	rte_malloc_get_socket_stats(socket, &post_stats);
+	rte_malloc_get_numa_stats(socket, &post_stats);
 
 	if(second_stats.heap_totalsz_bytes != first_stats.heap_totalsz_bytes) {
 		printf("Incorrect heap statistics: Total size \n");

@@ -704,7 +704,7 @@ test_realloc(void)
 		ret = -1;
 		goto end;
 	}
-	realloc_heap_socket = rte_malloc_heap_get_socket(heap_name);
+	realloc_heap_socket = rte_malloc_heap_get_numa_id(heap_name);
 
 	mem = mmap(NULL, mem_sz, PROT_READ | PROT_WRITE,
 			MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);

index 8712690561..1b6555df55 100644
@@ -493,10 +493,10 @@ test_memzone_reserve_flags(void)
 static size_t
 find_max_block_free_size(unsigned int align, unsigned int socket_id)
 {
-	struct rte_malloc_socket_stats stats;
+	struct rte_malloc_numa_stats stats;
 	size_t len, overhead;
 
-	if (rte_malloc_get_socket_stats(socket_id, &stats) < 0)
+	if (rte_malloc_get_numa_stats(socket_id, &stats) < 0)
 		return 0;
 
 	len = stats.greatest_free_size;

382 lines not on this page · raw message

171 lines not on this page · raw message

index 47e782f395..42f90148e5 100644
@@ -25,7 +25,7 @@ struct mem_alloc_validator_entry {
 	TAILQ_ENTRY(mem_alloc_validator_entry) next;
 	char name[RTE_MEM_ALLOC_VALIDATOR_NAME_LEN];
 	rte_mem_alloc_validator_t clb;
-	int socket_id;
+	int numa_id;
 	size_t limit;
 };
 

@@ -54,12 +54,12 @@ find_mem_event_callback(const char *name, void *arg)
 }
 
 static struct mem_alloc_validator_entry *
-find_mem_alloc_validator(const char *name, int socket_id)
+find_mem_alloc_validator(const char *name, int numa_id)
 {
 	struct mem_alloc_validator_entry *r;
 
 	TAILQ_FOREACH(r, &mem_alloc_validator_list, next) {
-		if (!strcmp(r->name, name) && r->socket_id == socket_id)
+		if (!strcmp(r->name, name) && r->numa_id == numa_id)
 			break;
 	}
 	return r;

@@ -252,11 +252,11 @@ eal_memalloc_mem_event_notify(enum rte_mem_event event, const void *start,
 
 int
 eal_memalloc_mem_alloc_validator_register(const char *name,
-		rte_mem_alloc_validator_t clb, int socket_id, size_t limit)
+		rte_mem_alloc_validator_t clb, int numa_id, size_t limit)
 {
 	struct mem_alloc_validator_entry *entry;
 	int ret, len;
-	if (name == NULL || clb == NULL || socket_id < 0) {
+	if (name == NULL || clb == NULL || numa_id < 0) {
 		rte_errno = EINVAL;
 		return -1;
 	}

@@ -270,7 +270,7 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
 	}
 	rte_rwlock_write_lock(&mem_alloc_validator_rwlock);
 
-	entry = find_mem_alloc_validator(name, socket_id);
+	entry = find_mem_alloc_validator(name, numa_id);
 	if (entry != NULL) {
 		rte_errno = EEXIST;
 		ret = -1;

@@ -286,15 +286,15 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
 
 	/* callback successfully created and is valid, add it to the list */
 	entry->clb = clb;
-	entry->socket_id = socket_id;
+	entry->numa_id = numa_id;
 	entry->limit = limit;
 	strlcpy(entry->name, name, RTE_MEM_ALLOC_VALIDATOR_NAME_LEN);
 	TAILQ_INSERT_TAIL(&mem_alloc_validator_list, entry, next);
 
 	ret = 0;
 
-	EAL_LOG(DEBUG, "Mem alloc validator '%s' on socket %i with limit %zu registered",
-		name, socket_id, limit);
+	EAL_LOG(DEBUG, "Mem alloc validator '%s' on NUMA node %i with limit %zu registered",
+		name, numa_id, limit);
 
 unlock:
 	rte_rwlock_write_unlock(&mem_alloc_validator_rwlock);

@@ -302,12 +302,12 @@ eal_memalloc_mem_alloc_validator_register(const char *name,
 }
 
 int
-eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
+eal_memalloc_mem_alloc_validator_unregister(const char *name, int numa_id)
 {
 	struct mem_alloc_validator_entry *entry;
 	int ret, len;
 
-	if (name == NULL || socket_id < 0) {
+	if (name == NULL || numa_id < 0) {
 		rte_errno = EINVAL;
 		return -1;
 	}

@@ -321,7 +321,7 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
 	}
 	rte_rwlock_write_lock(&mem_alloc_validator_rwlock);
 
-	entry = find_mem_alloc_validator(name, socket_id);
+	entry = find_mem_alloc_validator(name, numa_id);
 	if (entry == NULL) {
 		rte_errno = ENOENT;
 		ret = -1;

@@ -332,8 +332,8 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
 
 	ret = 0;
 
-	EAL_LOG(DEBUG, "Mem alloc validator '%s' on socket %i unregistered",
-		name, socket_id);
+	EAL_LOG(DEBUG, "Mem alloc validator '%s' on NUMA node %i unregistered",
+		name, numa_id);
 
 unlock:
 	rte_rwlock_write_unlock(&mem_alloc_validator_rwlock);

@@ -341,7 +341,7 @@ eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id)
 }
 
 int
-eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len)
+eal_memalloc_mem_alloc_validate(int numa_id, size_t new_len)
 {
 	struct mem_alloc_validator_entry *entry;
 	int ret = 0;

@@ -349,11 +349,11 @@ eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len)
 	rte_rwlock_read_lock(&mem_alloc_validator_rwlock);
 
 	TAILQ_FOREACH(entry, &mem_alloc_validator_list, next) {
-		if (entry->socket_id != socket_id || entry->limit > new_len)
+		if (entry->numa_id != numa_id || entry->limit > new_len)
 			continue;
-		EAL_LOG(DEBUG, "Calling mem alloc validator '%s' on socket %i",
-			entry->name, entry->socket_id);
-		if (entry->clb(socket_id, entry->limit, new_len) < 0)
+		EAL_LOG(DEBUG, "Calling mem alloc validator '%s' on NUMA node %i",
+			entry->name, entry->numa_id);
+		if (entry->clb(numa_id, entry->limit, new_len) < 0)
 			ret = -1;
 	}
 

133 lines not on this page · raw message

index db43af13a8..d325193b9d 100644
@@ -102,7 +102,7 @@ memzone_lookup_thread_unsafe(const char *name)
 
 static const struct rte_memzone *
 memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
-		int socket_id, unsigned int flags, unsigned int align,
+		int numa_id, unsigned int flags, unsigned int align,
 		unsigned int bound)
 {
 	struct rte_memzone *mz;

@@ -171,7 +171,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
 		return NULL;
 	}
 
-	if ((socket_id != SOCKET_ID_ANY) && socket_id < 0) {
+	if ((numa_id != RTE_NUMA_ID_ANY) && numa_id < 0) {
 		rte_errno = EINVAL;
 		return NULL;
 	}

@@ -181,11 +181,11 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
 		return NULL;
 	}
 
-	/* only set socket to SOCKET_ID_ANY if we aren't allocating for an
+	/* only set NUMA node to RTE_NUMA_ID_ANY if we are not allocating for an
 	 * external heap.
 	 */
-	if (!rte_eal_has_hugepages() && socket_id < RTE_MAX_NUMA_NODES)
-		socket_id = SOCKET_ID_ANY;
+	if (!rte_eal_has_hugepages() && numa_id < RTE_MAX_NUMA_NODES)
+		numa_id = RTE_NUMA_ID_ANY;
 
 	contig = (flags & RTE_MEMZONE_IOVA_CONTIG) != 0;
 	/* malloc only cares about size flags, remove contig flag from flags */

@@ -194,12 +194,12 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
 	if (len == 0 && bound == 0) {
 		/* no size constraints were placed, so use malloc elem len */
 		requested_len = 0;
-		mz_addr = malloc_heap_alloc_biggest(socket_id, flags, align, contig);
+		mz_addr = malloc_heap_alloc_biggest(numa_id, flags, align, contig);
 	} else {
 		if (len == 0)
 			requested_len = bound;
 		/* allocate memory on heap */
-		mz_addr = malloc_heap_alloc(requested_len, socket_id, flags, align, bound, contig);
+		mz_addr = malloc_heap_alloc(requested_len, numa_id, flags, align, bound, contig);
 	}
 	if (mz_addr == NULL) {
 		rte_errno = ENOMEM;

@@ -239,7 +239,7 @@ memzone_reserve_aligned_thread_unsafe(const char *name, size_t len,
 }
 
 static const struct rte_memzone *
-rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_thread_safe(const char *name, size_t len, int numa_id,
 		unsigned int flags, unsigned int align, unsigned int bound)
 {
 	struct rte_mem_config *mcfg;

@@ -251,9 +251,9 @@ rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
 	rte_rwlock_write_lock(&mcfg->mlock);
 
 	mz = memzone_reserve_aligned_thread_unsafe(
-		name, len, socket_id, flags, align, bound);
+		name, len, numa_id, flags, align, bound);
 
-	rte_eal_trace_memzone_reserve(name, len, socket_id, flags, align,
+	rte_eal_trace_memzone_reserve(name, len, numa_id, flags, align,
 		bound, mz);
 
 	rte_rwlock_write_unlock(&mcfg->mlock);

@@ -268,10 +268,10 @@ rte_memzone_reserve_thread_safe(const char *name, size_t len, int socket_id,
  */
 RTE_EXPORT_SYMBOL(rte_memzone_reserve_bounded)
 const struct rte_memzone *
-rte_memzone_reserve_bounded(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_bounded(const char *name, size_t len, int numa_id,
 			    unsigned flags, unsigned align, unsigned bound)
 {
-	return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+	return rte_memzone_reserve_thread_safe(name, len, numa_id, flags,
 					       align, bound);
 }
 

@@ -281,10 +281,10 @@ rte_memzone_reserve_bounded(const char *name, size_t len, int socket_id,
  */
 RTE_EXPORT_SYMBOL(rte_memzone_reserve_aligned)
 const struct rte_memzone *
-rte_memzone_reserve_aligned(const char *name, size_t len, int socket_id,
+rte_memzone_reserve_aligned(const char *name, size_t len, int numa_id,
 			    unsigned flags, unsigned align)
 {
-	return rte_memzone_reserve_thread_safe(name, len, socket_id, flags,
+	return rte_memzone_reserve_thread_safe(name, len, numa_id, flags,
 					       align, 0);
 }
 

@@ -294,10 +294,10 @@ rte_memzone_reserve_aligned(const char *name, size_t len, int socket_id,
  */
 RTE_EXPORT_SYMBOL(rte_memzone_reserve)
 const struct rte_memzone *
-rte_memzone_reserve(const char *name, size_t len, int socket_id,
+rte_memzone_reserve(const char *name, size_t len, int numa_id,
 		    unsigned flags)
 {
-	return rte_memzone_reserve_thread_safe(name, len, socket_id,
+	return rte_memzone_reserve_thread_safe(name, len, numa_id,
 					       flags, RTE_CACHE_LINE_SIZE, 0);
 }
 

@@ -388,7 +388,7 @@ dump_memzone(const struct rte_memzone *mz, void *arg)
 	info->total_size += mz->len;
 
 	fprintf(f, "Zone %u: name:<%s>, len:0x%zx, virt:%p, "
-				"socket_id:%"PRId32", flags:%"PRIx32"\n",
+				"numa_id:%"PRId32", flags:%"PRIx32"\n",
 			mz_idx,
 			mz->name,
 			mz->len,

index b2c0744447..a84af3b66b 100644
@@ -1855,7 +1855,7 @@ eal_parse_log_options(void)
 }
 
 static int
-eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
+eal_parse_numa_arg(char *strval, volatile uint64_t *numa_arg)
 {
 	char *arg[RTE_MAX_NUMA_NODES];
 	char *end;

@@ -1871,7 +1871,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
 	if (!isdigit(strval[len-1]))
 		return -1;
 
-	/* split the optarg into separate socket values */
+	/* split the optarg into separate NUMA node values */
 	arg_num = rte_strsplit(strval, len,
 			arg, RTE_MAX_NUMA_NODES, ',');
 

@@ -1879,7 +1879,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
 	if (arg_num <= 0)
 		return -1;
 
-	/* parse each defined socket option */
+	/* parse each defined NUMA node option */
 	errno = 0;
 	for (i = 0; i < arg_num; i++) {
 		uint64_t val;

@@ -1891,7 +1891,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg)
 				(arg[i][0] == '\0') || (end == NULL) || (*end != '\0'))
 			return -1;
 		val <<= 20;
-		socket_arg[i] = val;
+		numa_arg[i] = val;
 	}
 
 	return 0;

@@ -2282,14 +2282,14 @@ eal_parse_args(void)
 		}
 	}
 	if (args.numa_mem != NULL) {
-		if (eal_parse_socket_arg(args.numa_mem, int_cfg->numa_mem) < 0) {
+		if (eal_parse_numa_arg(args.numa_mem, int_cfg->numa_mem) < 0) {
 			EAL_LOG(ERR, "invalid numa-mem parameter: '%s'", args.numa_mem);
 			return -1;
 		}
 		int_cfg->force_numa = 1;
 	}
 	if (args.numa_limit != NULL) {
-		if (eal_parse_socket_arg(args.numa_limit, int_cfg->numa_limit) < 0) {
+		if (eal_parse_numa_arg(args.numa_limit, int_cfg->numa_limit) < 0) {
 			EAL_LOG(ERR, "invalid numa-limit parameter: '%s'", args.numa_limit);
 			return -1;
 		}

index dcd81f9e32..e654a57e9a 100644
@@ -28,41 +28,47 @@ RTE_DEFINE_PER_LCORE(unsigned int, _lcore_id) = LCORE_ID_ANY;
 RTE_EXPORT_SYMBOL(per_lcore__thread_id)
 RTE_DEFINE_PER_LCORE(int, _thread_id) = -1;
 static RTE_DEFINE_PER_LCORE(unsigned int, _numa_id) =
-	(unsigned int)SOCKET_ID_ANY;
+	(unsigned int)RTE_NUMA_ID_ANY;
 static RTE_DEFINE_PER_LCORE(rte_cpuset_t, _cpuset);
 
+RTE_EXPORT_SYMBOL(rte_numa_id)
+unsigned int rte_numa_id(void)
+{
+	return RTE_PER_LCORE(_numa_id);
+}
+
 RTE_EXPORT_SYMBOL(rte_socket_id)
 unsigned rte_socket_id(void)
 {
-	return RTE_PER_LCORE(_numa_id);
+	return rte_numa_id();
 }
 
 static int
-eal_cpuset_socket_id(rte_cpuset_t *cpusetp)
+eal_cpuset_numa_id(rte_cpuset_t *cpusetp)
 {
 	unsigned cpu = 0;
-	int socket_id = SOCKET_ID_ANY;
+	int numa_id = RTE_NUMA_ID_ANY;
 	int sid;
 
 	if (cpusetp == NULL)
-		return SOCKET_ID_ANY;
+		return RTE_NUMA_ID_ANY;
 
 	do {
 		if (!CPU_ISSET(cpu, cpusetp))
 			continue;
 
-		if (socket_id == SOCKET_ID_ANY)
-			socket_id = eal_cpu_socket_id(cpu);
+		if (numa_id == RTE_NUMA_ID_ANY)
+			numa_id = eal_cpu_numa_id(cpu);
 
-		sid = eal_cpu_socket_id(cpu);
-		if (socket_id != sid) {
-			socket_id = SOCKET_ID_ANY;
+		sid = eal_cpu_numa_id(cpu);
+		if (numa_id != sid) {
+			numa_id = RTE_NUMA_ID_ANY;
 			break;
 		}
 
 	} while (++cpu < CPU_SETSIZE);
 
-	return socket_id;
+	return numa_id;
 }
 
 static void

@@ -72,7 +78,7 @@ thread_update_affinity(rte_cpuset_t *cpusetp)
 
 	/* store numa_id in TLS for quick access */
 	RTE_PER_LCORE(_numa_id) =
-		eal_cpuset_socket_id(cpusetp);
+		eal_cpuset_numa_id(cpusetp);
 
 	/* store cpuset in TLS for quick access */
 	memmove(&RTE_PER_LCORE(_cpuset), cpusetp,

@@ -240,10 +246,10 @@ static int control_thread_init(void *arg)
 	struct control_thread_params *params = arg;
 
 	__rte_thread_init(rte_lcore_id(), cpuset);
-	/* Set control thread socket ID to SOCKET_ID_ANY
+	/* Set control thread NUMA node ID to RTE_NUMA_ID_ANY
 	 * as control threads may be scheduled on any NUMA node.
 	 */
-	RTE_PER_LCORE(_numa_id) = SOCKET_ID_ANY;
+	RTE_PER_LCORE(_numa_id) = RTE_NUMA_ID_ANY;
 	params->ret = rte_thread_set_affinity_by_id(rte_thread_self(), cpuset);
 	if (params->ret != 0) {
 		rte_atomic_store_explicit(&params->status,

index 1b560d3379..2b14ed3a86 100644
@@ -20,7 +20,7 @@ struct hugepage_file {
 	void *final_va;     /**< virtual addr of 2nd mmap() */
 	uint64_t physaddr;  /**< physical addr */
 	size_t size;        /**< the page size */
-	int socket_id;      /**< NUMA socket ID */
+	int numa_id;        /**< NUMA node ID */
 	int file_id;        /**< the '%d' in HUGEFILE_FMT */
 	char filepath[MAX_HUGEPAGE_PATH]; /**< path to backing file on filesystem */
 };

index 07cd35167d..b7727a4bcf 100644
@@ -30,7 +30,7 @@ struct hugepage_info {
 	uint64_t hugepage_sz;   /**< size of a huge page */
 	char hugedir[PATH_MAX];    /**< dir where hugetlbfs is mounted */
 	uint32_t num_pages[RTE_MAX_NUMA_NODES];
-	/**< number of hugepages of that size on each socket */
+	/**< number of hugepages of that size on each NUMA node */
 	int lock_descriptor;    /**< file descriptor for hugepage dir */
 };
 

index 0c267066d9..d176bbd21a 100644
@@ -13,7 +13,7 @@
  * Allocate segment of specified page size.
  */
 struct rte_memseg *
-eal_memalloc_alloc_seg(size_t page_sz, int socket);
+eal_memalloc_alloc_seg(size_t page_sz, int numa_id);
 
 /*
  * Allocate `n_segs` segments.

@@ -26,7 +26,7 @@ eal_memalloc_alloc_seg(size_t page_sz, int socket);
  */
 int
 eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms, int n_segs, size_t page_sz,
-		int socket, bool exact);
+		int numa_id, bool exact);
 
 /*
  * Deallocate segment

@@ -67,13 +67,13 @@ eal_memalloc_mem_event_notify(enum rte_mem_event event, const void *start,
 
 int
 eal_memalloc_mem_alloc_validator_register(const char *name,
-		rte_mem_alloc_validator_t clb, int socket_id, size_t limit);
+		rte_mem_alloc_validator_t clb, int numa_id, size_t limit);
 
 int
-eal_memalloc_mem_alloc_validator_unregister(const char *name, int socket_id);
+eal_memalloc_mem_alloc_validator_unregister(const char *name, int numa_id);
 
 int
-eal_memalloc_mem_alloc_validate(int socket_id, size_t new_len);
+eal_memalloc_mem_alloc_validate(int numa_id, size_t new_len);
 
 /* returns fd or -errno */
 int

index 2b3b3b62ba..6a0427b7b3 100644
@@ -62,7 +62,7 @@ struct rte_mem_config {
 	struct malloc_heap malloc_heaps[RTE_MAX_HEAPS];
 	/**< DPDK malloc heaps */
 
-	int next_socket_id; /**< Next socket ID for external malloc heap */
+	int next_numa_id; /**< Next NUMA node ID for external malloc heap */
 
 	/* rte_mem_config has to be mapped at the exact same address in all
 	 * processes, so we need to store it.

index 8905464f64..72595930fd 100644
@@ -32,7 +32,7 @@ struct lcore_config {
 
 	volatile RTE_ATOMIC(enum rte_lcore_state_t) state; /**< lcore state */
 	unsigned int numa_id;      /**< NUMA node ID for this lcore */
-	unsigned int core_id;      /**< core number on socket for this lcore */
+	unsigned int core_id;      /**< core number on NUMA node for this lcore */
 	int core_index;            /**< relative index, starting from 0 */
 	uint8_t core_role;         /**< role of core eg: OFF, RTE, SERVICE */
 

@@ -273,8 +273,8 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
  *  Size of segment pages in the MSL.
  * @param n_segs
  *  Number of segments.
- * @param socket_id
- *  Socket ID. Must not be SOCKET_ID_ANY.
+ * @param numa_id
+ *  Socket ID. Must not be RTE_NUMA_ID_ANY.
  * @param heap
  *  Mark MSL as pointing to a heap.
  * @return

@@ -282,7 +282,7 @@ eal_get_virtual_area(void *requested_addr, size_t *size,
  */
 int
 eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
-	uint64_t page_sz, int n_segs, int socket_id, bool heap);
+	uint64_t page_sz, int n_segs, int numa_id, bool heap);
 
 /**
  * Initialize memory segment list and create its backing storage

@@ -295,7 +295,7 @@ eal_memseg_list_init_named(struct rte_memseg_list *msl, const char *name,
  */
 int
 eal_memseg_list_init(struct rte_memseg_list *msl, uint64_t page_sz,
-		int n_segs, int socket_id, int msl_idx, bool heap);
+		int n_segs, int numa_id, int msl_idx, bool heap);
 
 /**
  * Reserve VA space for a memory segment list

@@ -372,7 +372,7 @@ eal_dynmem_hugepage_init(void);
  *  0 on success, (-1) on failure.
  */
 int
-eal_dynmem_calc_num_pages_per_socket(
+eal_dynmem_calc_num_pages_per_numa_node(
 		uint64_t *memory, struct hugepage_info *hp_info,
 		struct hugepage_info *hp_used, unsigned int num_hp_info);
 

index 586de05081..dcd3af5d2a 100644
@@ -17,15 +17,15 @@
 __rte_noreturn uint32_t eal_thread_loop(void *arg);
 
 /**
- * Get the NUMA socket id from cpu id.
+ * Get the NUMA node ID from CPU ID.
  * This function is private to EAL.
  *
  * @param cpu_id
  *   The logical process id.
  * @return
- *   socket_id or SOCKET_ID_ANY
+ *   numa_id or RTE_NUMA_ID_ANY
  */
-unsigned eal_cpu_socket_id(unsigned cpu_id);
+unsigned int eal_cpu_numa_id(unsigned int cpu_id);
 
 /**
  * Default buffer size to use with eal_thread_dump_affinity()

476 lines not on this page · raw message

index dfc56d4ae3..7a75cce7c4 100644
@@ -28,17 +28,17 @@ struct __rte_cache_aligned malloc_heap {
 	struct malloc_elem *volatile last;
 
 	unsigned int alloc_count;
-	unsigned int socket_id;
+	unsigned int numa_id;
 	size_t total_size;
 	char name[RTE_HEAP_NAME_MAX_LEN];
 };
 
 void *
-malloc_heap_alloc(size_t size, int socket, unsigned int flags, size_t align,
+malloc_heap_alloc(size_t size, int numa_id, unsigned int flags, size_t align,
 		  size_t bound, bool contig);
 
 void *
-malloc_heap_alloc_biggest(int socket, unsigned int flags, size_t align, bool contig);
+malloc_heap_alloc_biggest(int numa_id, unsigned int flags, size_t align, bool contig);
 
 int
 malloc_heap_create(struct malloc_heap *heap, const char *heap_name);

@@ -49,7 +49,7 @@ malloc_heap_destroy(struct malloc_heap *heap);
 struct rte_memseg_list *
 malloc_heap_create_external_seg(void *va_addr, rte_iova_t iova_addrs[],
 		unsigned int n_pages, size_t page_sz, const char *seg_name,
-		unsigned int socket_id);
+		unsigned int numa_id);
 
 struct rte_memseg_list *
 malloc_heap_find_external_seg(void *va_addr, size_t len);

@@ -73,13 +73,13 @@ malloc_heap_resize(struct malloc_elem *elem, size_t size);
 
 int
 malloc_heap_get_stats(struct malloc_heap *heap,
-		struct rte_malloc_socket_stats *socket_stats);
+		struct rte_malloc_numa_stats *numa_stats);
 
 void
 malloc_heap_dump(struct malloc_heap *heap, FILE *f);
 
 int
-malloc_socket_to_heap_id(unsigned int socket_id);
+malloc_numa_to_heap_id(unsigned int numa_id);
 
 int
 rte_eal_malloc_heap_init(void);

index 9765277f5d..e0086ec679 100644
@@ -232,7 +232,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
 		return -1;
 	}
 
-	/* heap idx is index into the heap array, not socket ID */
+	/* heap idx is index into the heap array, not NUMA node ID */
 	if (ar->malloc_heap_idx >= RTE_MAX_HEAPS) {
 		EAL_LOG(ERR, "Attempting to allocate from invalid heap");
 		return -1;

@@ -242,11 +242,11 @@ handle_alloc_request(const struct malloc_mp_req *m,
 
 	/*
 	 * for allocations, we must only use internal heaps, but since the
-	 * rte_malloc_heap_socket_is_external() is thread-safe and we're already
+	 * rte_malloc_heap_numa_is_external() is thread-safe and we're already
 	 * read-locked, we'll have to take advantage of the fact that internal
-	 * socket ID's are always lower than RTE_MAX_NUMA_NODES.
+	 * NUMA node IDs are always lower than RTE_MAX_NUMA_NODES.
 	 */
-	if (heap->socket_id >= RTE_MAX_NUMA_NODES) {
+	if (heap->numa_id >= RTE_MAX_NUMA_NODES) {
 		EAL_LOG(ERR, "Attempting to allocate from external heap");
 		return -1;
 	}

@@ -263,7 +263,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
 	}
 	memset(ms, 0, sizeof(*ms) * n_segs);
 
-	elem = alloc_pages_on_heap(heap, ar->page_sz, ar->elt_size, ar->socket,
+	elem = alloc_pages_on_heap(heap, ar->page_sz, ar->elt_size, ar->numa_id,
 			ar->flags, ar->align, ar->bound, ar->contig, ms,
 			n_segs);
 

index 43dc2a81a2..a540ec627b 100644
@@ -31,7 +31,7 @@ struct malloc_req_alloc {
 	uint32_t malloc_heap_idx;
 	uint64_t page_sz;
 	size_t elt_size;
-	int socket;
+	int numa_id;
 	unsigned int flags;
 	size_t align;
 	size_t bound;

@@ -75,7 +75,7 @@ malloc_heap_free_pages(void *aligned_start, size_t aligned_len);
 
 struct malloc_elem *
 alloc_pages_on_heap(struct malloc_heap *heap, uint64_t pg_sz, size_t elt_size,
-		int socket, unsigned int flags, size_t align, size_t bound,
+		int numa_id, unsigned int flags, size_t align, size_t bound,
 		bool contig, struct rte_memseg **ms, int n_segs);
 
 void

365 lines not on this page · raw message

index faf5f0e911..de4918f954 100644
@@ -351,12 +351,12 @@ eal_get_hugepage_mem_size(void)
 static int
 check_socket(const struct rte_memseg_list *msl, void *arg)
 {
-	int *socket_id = arg;
+	int *numa_id = arg;
 
 	if (msl->external)
 		return 0;
 
-	if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
+	if (msl->socket_id == *numa_id && msl->memseg_arr.count != 0)
 		return 1;
 
 	return 0;

@@ -365,13 +365,13 @@ check_socket(const struct rte_memseg_list *msl, void *arg)
 static void
 eal_check_mem_on_local_socket(void)
 {
-	int socket_id;
+	int numa_id;
 	const struct rte_config *config = rte_eal_get_configuration();
 
-	socket_id = rte_lcore_to_socket_id(config->main_lcore);
+	numa_id = rte_lcore_to_numa_id(config->main_lcore);
 
-	if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
-		EAL_LOG(WARNING, "WARNING: Main core has no memory on local socket!");
+	if (rte_memseg_list_walk(check_socket, &numa_id) == 0)
+		EAL_LOG(WARNING, "WARNING: Main lcore has no memory on local NUMA node!");
 }
 
 

index 1d3d1b67b9..a1a3b88bc9 100644
@@ -36,7 +36,7 @@ eal_get_ncpus(void)
 }
 
 unsigned
-eal_cpu_socket_id(__rte_unused unsigned cpu_id)
+eal_cpu_numa_id(__rte_unused unsigned int cpu_id)
 {
 	return 0;
 }

index 49faf0c6aa..bfaba725b5 100644
@@ -14,14 +14,14 @@
 int
 eal_memalloc_alloc_seg_bulk(struct rte_memseg **ms __rte_unused,
 		int __rte_unused n_segs, size_t __rte_unused page_sz,
-		int __rte_unused socket, bool __rte_unused exact)
+		int __rte_unused numa_id, bool __rte_unused exact)
 {
 	EAL_LOG(ERR, "Memory hotplug not supported on FreeBSD");
 	return -1;
 }
 
 struct rte_memseg *
-eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused socket)
+eal_memalloc_alloc_seg(size_t __rte_unused page_sz, int __rte_unused numa_id)
 {
 	EAL_LOG(ERR, "Memory hotplug not supported on FreeBSD");
 	return NULL;

index d87e479863..f03e2ad44c 100644
@@ -238,7 +238,7 @@ rte_eal_hugepage_init(void)
 			seg->len = page_sz;
 			seg->nchannel = mcfg->nchannel;
 			seg->nrank = mcfg->nrank;
-			seg->socket_id = 0;
+			seg->numa_id = 0;
 
 			rte_fbarray_set_used(arr, ms_idx);
 

index 50f91d0929..62c6811f90 100644
@@ -93,32 +93,32 @@ RTE_TRACE_POINT(
 RTE_TRACE_POINT(
 	rte_eal_trace_mem_zmalloc,
 	RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
-		int socket, void *ptr),
+		int numa_id, void *ptr),
 	rte_trace_point_emit_string(type);
 	rte_trace_point_emit_size_t(size);
 	rte_trace_point_emit_u32(align);
-	rte_trace_point_emit_int(socket);
+	rte_trace_point_emit_int(numa_id);
 	rte_trace_point_emit_ptr(ptr);
 )
 
 RTE_TRACE_POINT(
 	rte_eal_trace_mem_malloc,
 	RTE_TRACE_POINT_ARGS(const char *type, size_t size, unsigned int align,
-		int socket, void *ptr),
+		int numa_id, void *ptr),
 	rte_trace_point_emit_string(type);
 	rte_trace_point_emit_size_t(size);
 	rte_trace_point_emit_u32(align);
-	rte_trace_point_emit_int(socket);
+	rte_trace_point_emit_int(numa_id);
 	rte_trace_point_emit_ptr(ptr);
 )
 
 RTE_TRACE_POINT(
 	rte_eal_trace_mem_realloc,
-	RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int socket,
+	RTE_TRACE_POINT_ARGS(size_t size, unsigned int align, int numa_id,
 		void *ptr),
 	rte_trace_point_emit_size_t(size);
 	rte_trace_point_emit_u32(align);
-	rte_trace_point_emit_int(socket);
+	rte_trace_point_emit_int(numa_id);
 	rte_trace_point_emit_ptr(ptr);
 )
 

@@ -131,12 +131,12 @@ RTE_TRACE_POINT(
 /* Memzone */
 RTE_TRACE_POINT(
 	rte_eal_trace_memzone_reserve,
-	RTE_TRACE_POINT_ARGS(const char *name, size_t len, int socket_id,
+	RTE_TRACE_POINT_ARGS(const char *name, size_t len, int numa_id,
 		unsigned int flags, unsigned int align, unsigned int bound,
 		const void *mz),
 	rte_trace_point_emit_string(name);
 	rte_trace_point_emit_size_t(len);
-	rte_trace_point_emit_int(socket_id);
+	rte_trace_point_emit_int(numa_id);
 	rte_trace_point_emit_u32(flags);
 	rte_trace_point_emit_u32(align);
 	rte_trace_point_emit_u32(bound);

112 lines not on this page · raw message

312 lines not on this page · raw message

index 940770f1eb..2633550524 100644
@@ -36,7 +36,13 @@ extern "C" {
 #define RTE_PGSIZE_4G   (1ULL << 32)
 #define RTE_PGSIZE_16G  (1ULL << 34)
 
-#define SOCKET_ID_ANY -1                    /**< Any NUMA socket. */
+/** Any NUMA node ID. */
+#define RTE_NUMA_ID_ANY -1
+
+/**
+ * Legacy alias of RTE_NUMA_ID_ANY.
+ */
+#define SOCKET_ID_ANY RTE_NUMA_ID_ANY
 
 /** Prevent this segment from being freed back to the OS. */
 #define RTE_MEMSEG_FLAG_DO_NOT_FREE RTE_BIT32(0)

index 5a0e1b8a15..125241c538 100644
@@ -98,7 +98,7 @@ size_t rte_memzone_max_get(void);
  *   new allocations.
  *
  * @note: When reserving memzones with len set to 0, it is preferable to also
- *   set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ *   set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
  *   will likely not yield expected results. Specifically, the resulting memzone
  *   may not necessarily be the biggest memzone available, but rather biggest
  *   memzone available on socket id corresponding to an lcore from which

@@ -112,7 +112,7 @@ size_t rte_memzone_max_get(void);
  *   is 0, the biggest contiguous zone will be reserved.
  * @param socket_id
  *   The socket identifier in the case of
- *   NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ *   NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   The flags parameter is used to request memzones to be

@@ -161,7 +161,7 @@ const struct rte_memzone *rte_memzone_reserve(const char *name,
  *   new allocations.
  *
  * @note: When reserving memzones with len set to 0, it is preferable to also
- *   set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ *   set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
  *   will likely not yield expected results. Specifically, the resulting memzone
  *   may not necessarily be the biggest memzone available, but rather biggest
  *   memzone available on socket id corresponding to an lcore from which

@@ -175,7 +175,7 @@ const struct rte_memzone *rte_memzone_reserve(const char *name,
  *   is 0, the biggest contiguous zone will be reserved.
  * @param socket_id
  *   The socket identifier in the case of
- *   NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ *   NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   The flags parameter is used to request memzones to be

@@ -229,7 +229,7 @@ const struct rte_memzone *rte_memzone_reserve_aligned(const char *name,
  *   new allocations.
  *
  * @note: When reserving memzones with len set to 0, it is preferable to also
- *   set a valid socket_id. Setting socket_id to SOCKET_ID_ANY is supported, but
+ *   set a valid socket_id. Setting socket_id to RTE_NUMA_ID_ANY is supported, but
  *   will likely not yield expected results. Specifically, the resulting memzone
  *   may not necessarily be the biggest memzone available, but rather biggest
  *   memzone available on socket id corresponding to an lcore from which

@@ -243,7 +243,7 @@ const struct rte_memzone *rte_memzone_reserve_aligned(const char *name,
  *   is 0, the biggest contiguous zone will be reserved.
  * @param socket_id
  *   The socket identifier in the case of
- *   NUMA. The value can be SOCKET_ID_ANY if there is no NUMA
+ *   NUMA. The value can be RTE_NUMA_ID_ANY if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   The flags parameter is used to request memzones to be

index 278504237d..0d26c780f2 100644
@@ -434,24 +434,24 @@ eal_hugedirs_unlock(void)
 static int
 check_socket(const struct rte_memseg_list *msl, void *arg)
 {
-	int *socket_id = arg;
+	int *numa_id = arg;
 
 	if (msl->external)
 		return 0;
 
-	return *socket_id == msl->socket_id;
+	return *numa_id == msl->socket_id;
 }
 
 static void
 eal_check_mem_on_local_socket(void)
 {
-	int socket_id;
+	int numa_id;
 	const struct rte_config *config = rte_eal_get_configuration();
 
-	socket_id = rte_lcore_to_socket_id(config->main_lcore);
+	numa_id = rte_lcore_to_numa_id(config->main_lcore);
 
-	if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
-		EAL_LOG(WARNING, "WARNING: Main core has no memory on local socket!");
+	if (rte_memseg_list_walk(check_socket, &numa_id) == 0)
+		EAL_LOG(WARNING, "WARNING: Main lcore has no memory on local NUMA node!");
 }
 
 static int

@@ -526,8 +526,8 @@ eal_worker_thread_create(unsigned int lcore_id)
 	stack_size = eal_get_internal_configuration()->huge_worker_stack_size;
 	if (stack_size != 0) {
 		/* Allocate NUMA aware stack memory and set pthread attributes */
-		stack_ptr = rte_zmalloc_socket("lcore_stack", stack_size,
-			RTE_CACHE_LINE_SIZE, rte_lcore_to_socket_id(lcore_id));
+		stack_ptr = rte_zmalloc_numa("lcore_stack", stack_size,
+			RTE_CACHE_LINE_SIZE, rte_lcore_to_numa_id(lcore_id));
 		if (stack_ptr == NULL) {
 			rte_eal_init_alert("Cannot allocate worker lcore stack memory");
 			rte_errno = ENOMEM;

index 05c5b3f613..9eec3789f0 100644
@@ -136,29 +136,29 @@ get_num_hugepages(const char *subdir, size_t sz, unsigned int reusable_pages)
 }
[… more lines in the raw message]

Lines of this file are not shown. View the raw message.

index 29b36dd610..ce2c28b591 100644

Lines of this file are not shown. View the raw message.

index 8bfcbb1469..6003f04bd7 100644

Lines of this file are not shown. View the raw message.

76 lines not on this page · raw message

index ff72b8ee38..c48c93da0c 100644

Lines of this file are not shown. View the raw message.

42 lines not on this page · raw message

index 232749573a..2f956adc1a 100644

Lines of this file are not shown. View the raw message.

index 9f85191016..67aba17d24 100644

Lines of this file are not shown. View the raw message.

index 91cf15eaaa..a07fc086c9 100644

Lines of this file are not shown. View the raw message.

index 9c22fb8f01..1e5eee6787 100644
@@ -1121,7 +1121,7 @@ show_port(void)
 
 			printf(" mempool %s socket %d",
 			       queue_info.mp->name,
-			       queue_info.mp->socket_id);
+			       queue_info.mp->numa_id);
 
 			if (queue_info.conf.offloads != 0)
 				show_offloads(queue_info.conf.offloads, rte_eth_dev_rx_offload_name);

index e46faaf7e9..42358cd14f 100644
@@ -620,7 +620,7 @@ static int softreq_init(struct nitrox_softreq *sr,
 
 	err = create_sglist_from_mbuf(&sr->src, sr->op->m_src,
 				      sr->op->src.offset,
-				      sr->op->src.length, 0, mp->socket_id);
+				      sr->op->src.length, 0, mp->numa_id);
 	if (unlikely(err))
 		return err;
 

@@ -630,7 +630,7 @@ static int softreq_init(struct nitrox_softreq *sr,
 			sr->op->dst.offset,
 			rte_pktmbuf_pkt_len(sr->op->m_dst) - sr->op->dst.offset,
 			need_decomp_threshold ? 1 : 0,
-			mp->socket_id);
+			mp->numa_id);
 	if (unlikely(err))
 		return err;
 

@@ -1161,10 +1161,10 @@ static void req_pool_obj_init(struct rte_mempool *mp, void *arg, void *obj,
 	sr = obj;
 	sr->src.sgl = rte_zmalloc_socket(NULL,
 				sizeof(*sr->src.sgl) * NITROX_ZIP_SGL_COUNT,
-				8, mp->socket_id);
+				8, mp->numa_id);
 	sr->dst.sgl = rte_zmalloc_socket(NULL,
 				sizeof(*sr->dst.sgl) * NITROX_ZIP_SGL_COUNT,
-				8, mp->socket_id);
+				8, mp->numa_id);
 	if (sr->src.sgl == NULL || sr->dst.sgl == NULL) {
 		NITROX_LOG_LINE(ERR, "Failed to allocate zip_sgl memory");
 		*err = -ENOMEM;

index 41f1d20cec..11945e0e6e 100644
@@ -37,7 +37,7 @@ cnxk_tim_chnk_pool_populate_aligned(struct rte_mempool *mp, size_t align)
 	stride = (size_t)mp->header_size + mp->elt_size + mp->trailer_size;
 	len = stride * mp->size;
 
-	mem = rte_zmalloc_socket("cnxk_tim_chunks", len, align, mp->socket_id);
+	mem = rte_zmalloc_socket("cnxk_tim_chunks", len, align, mp->numa_id);
 	if (mem == NULL)
 		return -ENOMEM;
 

index 6fee10176b..d3f626e064 100644
@@ -67,7 +67,7 @@ bucket_stack_create(const struct rte_mempool *mp, unsigned int n_elts)
 				   sizeof(struct bucket_stack) +
 				   n_elts * sizeof(void *),
 				   RTE_CACHE_LINE_SIZE,
-				   mp->socket_id);
+				   mp->numa_id);
 	if (stack == NULL)
 		return NULL;
 	stack->limit = n_elts;

@@ -429,7 +429,7 @@ bucket_init_per_lcore(unsigned int lcore_id, void *arg)
 	if (mp->flags & RTE_MEMPOOL_F_SP_PUT)
 		rg_flags |= RING_F_SP_ENQ;
 	bd->adoption_buffer_rings[lcore_id] = rte_ring_create(rg_name,
-		rte_align32pow2(mp->size + 1), mp->socket_id, rg_flags);
+		rte_align32pow2(mp->size + 1), mp->numa_id, rg_flags);
 	if (bd->adoption_buffer_rings[lcore_id] == NULL)
 		goto error;
 

@@ -466,7 +466,7 @@ bucket_alloc(struct rte_mempool *mp)
 		return rc;
 
 	bd = rte_zmalloc_socket("bucket_pool", sizeof(*bd),
-				RTE_CACHE_LINE_SIZE, mp->socket_id);
+				RTE_CACHE_LINE_SIZE, mp->numa_id);
 	if (bd == NULL) {
 		rc = -ENOMEM;
 		goto no_mem_for_data;

@@ -506,7 +506,7 @@ bucket_alloc(struct rte_mempool *mp)
 	}
 	bd->shared_orphan_ring =
 		rte_ring_create(rg_name, rte_align32pow2(mp->size + 1),
-				mp->socket_id, rg_flags);
+				mp->numa_id, rg_flags);
 	if (bd->shared_orphan_ring == NULL) {
 		rc = -rte_errno;
 		goto cannot_create_shared_orphan_ring;

@@ -522,7 +522,7 @@ bucket_alloc(struct rte_mempool *mp)
 		rte_ring_create(rg_name,
 				rte_align32pow2((mp->size + 1) /
 						bd->obj_per_bucket),
-				mp->socket_id, rg_flags);
+				mp->numa_id, rg_flags);
 	if (bd->shared_bucket_ring == NULL) {
 		rc = -rte_errno;
 		goto cannot_create_shared_bucket_ring;

index 631e521b58..7658731b04 100644
@@ -21,7 +21,7 @@ octeontx_fpavf_alloc(struct rte_mempool *mp)
 
 	pool = octeontx_fpa_bufpool_create(object_size, memseg_count,
 						OCTEONTX_FPAVF_BUF_OFFSET,
-						mp->socket_id);
+						mp->numa_id);
 	rc = octeontx_fpa_bufpool_block_size(pool);
 	if (rc < 0)
 		goto _end;

@@ -48,7 +48,7 @@ octeontx_fpavf_free(struct rte_mempool *mp)
 	uintptr_t pool;
 	pool = (uintptr_t)mp->pool_id;
 
-	octeontx_fpa_bufpool_destroy(pool, mp->socket_id);
+	octeontx_fpa_bufpool_destroy(pool, mp->numa_id);
 }
 
 static __rte_always_inline void *

index c6aa935eea..2c297e4856 100644
@@ -96,7 +96,7 @@ ring_alloc(struct rte_mempool *mp, uint32_t rg_flags)
 	 * in this function for that condition.
 	 */
 	r = rte_ring_create(rg_name, rte_align32pow2(mp->size + 1),
-		mp->socket_id, rg_flags);
+		mp->numa_id, rg_flags);
 	if (r == NULL)
 		return -rte_errno;
 

index 11c1243bec..eae85ef1fc 100644
@@ -20,7 +20,7 @@ __stack_alloc(struct rte_mempool *mp, uint32_t flags)
 		return -rte_errno;
 	}
 
-	s = rte_stack_create(name, mp->size, mp->socket_id, flags);
+	s = rte_stack_create(name, mp->size, mp->numa_id, flags);
 	if (s == NULL)
 		return -rte_errno;
 

index e307029b15..5e2c2dbf85 100644
@@ -1226,7 +1226,7 @@ mlx4_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
 	mr = rte_zmalloc_socket(NULL,
 				RTE_ALIGN_CEIL(sizeof(*mr),
 					       RTE_CACHE_LINE_SIZE),
-				RTE_CACHE_LINE_SIZE, mp->socket_id);
+				RTE_CACHE_LINE_SIZE, mp->numa_id);
 	if (mr == NULL) {
 		WARN("port %u unable to allocate memory for a new MR of"
 		     " mempool (%s).",

index ca7f4681c9..146acec174 100644
@@ -537,7 +537,7 @@ eth_dev_handle_port_rxq(const char *cmd __rte_unused,
 
 	rte_tel_data_start_dict(d);
 	rte_tel_data_add_dict_string(d, "mempool_name", qinfo.mp->name);
-	rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->socket_id);
+	rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->numa_id);
 
 	rx_thresh = &qinfo.conf.rx_thresh;
 	rte_tel_data_add_dict_uint(d, "host_threshold", rx_thresh->hthresh);

index 53d17d7a00..71de25a3ab 100644
@@ -1513,7 +1513,7 @@ rte_event_vector_pool_create(const char *name, unsigned int n,
 	if (ret < 0)
 		goto err;
 
-	rte_eventdev_trace_vector_pool_create(mp, mp->name, mp->socket_id,
+	rte_eventdev_trace_vector_pool_create(mp, mp->name, mp->numa_id,
 		mp->size, mp->cache_size, mp->elt_size);
 
 	return mp;

index 60e47cf67b..4baec51427 100644
@@ -113,10 +113,10 @@ RTE_TRACE_POINT(
 
 RTE_TRACE_POINT(
 	rte_mempool_trace_cache_create,
-	RTE_TRACE_POINT_ARGS(uint32_t size, int socket_id,
+	RTE_TRACE_POINT_ARGS(uint32_t size, int numa_id,
 		struct rte_mempool_cache *cache),
 	rte_trace_point_emit_u32(size);
-	rte_trace_point_emit_i32(socket_id);
+	rte_trace_point_emit_i32(numa_id);
 	rte_trace_point_emit_ptr(cache);
 	rte_trace_point_emit_u32(cache->len);
 )

167 lines not on this page · raw message

index b34cd893b1..9ede776a67 100644
@@ -245,7 +245,15 @@ struct __rte_cache_aligned rte_mempool {
 	void *pool_config;               /**< optional args for ops alloc. */
 	const struct rte_memzone *mz;    /**< Memzone where pool is alloc'd. */
 	unsigned int flags;              /**< Flags of the mempool. */
-	int socket_id;                   /**< Socket id passed at create. */
+	union {
+		/** NUMA node ID passed at create. */
+		int numa_id;
+		/**
+		 * Deprecated alias of numa_id.
+		 */
+		__rte_deprecated_msg("use numa_id")
+		int socket_id;
+	};
 	uint32_t size;                   /**< Max size of the mempool. */
 	uint32_t cache_size;             /**< Size of per-lcore default local cache. */
 

@@ -1084,9 +1092,9 @@ rte_mempool_free(struct rte_mempool *mp);
  * @param obj_init_arg
  *   An opaque pointer to data that can be used as an argument for
  *   each call to the object constructor function.
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in the case of
- *   NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in the case of
+ *   NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   The *flags* arguments is an OR of following flags:

@@ -1117,11 +1125,11 @@ rte_mempool_free(struct rte_mempool *mp);
  *    - ENOMEM - no appropriate memory area found in which to create memzone
  */
 struct rte_mempool *
-rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
-		   unsigned cache_size, unsigned private_data_size,
+rte_mempool_create(const char *name, unsigned int n, unsigned int elt_size,
+		   unsigned int cache_size, unsigned int private_data_size,
 		   rte_mempool_ctor_t *mp_init, void *mp_init_arg,
 		   rte_mempool_obj_cb_t *obj_init, void *obj_init_arg,
-		   int socket_id, unsigned int flags)
+		   int numa_id, unsigned int flags)
 	__rte_malloc __rte_dealloc(rte_mempool_free, 1);
 
 /**

@@ -1145,9 +1153,9 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
  *   The size of the private data appended after the mempool
  *   structure. This is useful for storing some private data after the
  *   mempool structure, as is done for rte_mbuf_pool for example.
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in the case of
- *   NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ *   The *numa_id* argument is the socket identifier in the case of
+ *   NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   Flags controlling the behavior of the mempool. See

@@ -1159,7 +1167,7 @@ rte_mempool_create(const char *name, unsigned n, unsigned elt_size,
 struct rte_mempool *
 rte_mempool_create_empty(const char *name, unsigned int n, unsigned int elt_size,
 			 unsigned int cache_size, unsigned int private_data_size,
-			 int socket_id, unsigned int flags)
+			 int numa_id, unsigned int flags)
 		__rte_malloc __rte_dealloc(rte_mempool_free, 1);
 
 /**

@@ -1351,12 +1359,12 @@ rte_mempool_cache_free(struct rte_mempool_cache *cache);
  *   The size of the mempool cache. See rte_mempool_create()'s cache_size
  *   parameter description for more information. The same limits and
  *   considerations apply here too.
- * @param socket_id
- *   The socket identifier in the case of NUMA. The value can be
- *   SOCKET_ID_ANY if there is no NUMA constraint for the reserved zone.
+ * @param numa_id
+ *   The NUMA node ID in the case of NUMA. The value can be
+ *   RTE_NUMA_ID_ANY if there is no NUMA constraint for the reserved zone.
  */
 struct rte_mempool_cache *
-rte_mempool_cache_create(uint32_t size, int socket_id)
+rte_mempool_cache_create(uint32_t size, int numa_id)
 	__rte_malloc __rte_dealloc(rte_mempool_cache_free, 1);
 
 /**

index 10b52dc679..c566592027 100644
@@ -256,7 +256,7 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned int count,
 RTE_EXPORT_SYMBOL(rte_ring_create_elem)
 struct rte_ring *
 rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
-		int socket_id, unsigned int flags)
+		int numa_id, unsigned int flags)
 {
 	char mz_name[RTE_MEMZONE_NAMESIZE];
 	struct rte_ring *r;

@@ -300,7 +300,7 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
 	 * we are secondary process, the memzone_reserve function will set
 	 * rte_errno for us appropriately - hence no check in this function
 	 */
-	mz = rte_memzone_reserve_aligned(mz_name, ring_size, socket_id,
+	mz = rte_memzone_reserve_aligned(mz_name, ring_size, numa_id,
 					 mz_flags, alignof(typeof(*r)));
 	if (mz != NULL) {
 		r = mz->addr;

@@ -325,10 +325,10 @@ rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count,
 /* create the ring */
 RTE_EXPORT_SYMBOL(rte_ring_create)
 struct rte_ring *
-rte_ring_create(const char *name, unsigned int count, int socket_id,
+rte_ring_create(const char *name, unsigned int count, int numa_id,
 		unsigned int flags)
 {
-	return rte_ring_create_elem(name, sizeof(void *), count, socket_id,
+	return rte_ring_create_elem(name, sizeof(void *), count, numa_id,
 		flags);
 }
 

@@ -605,7 +605,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
 		return;
 
 	rte_tel_data_add_dict_string(d, "name", r->name);
-	rte_tel_data_add_dict_int(d, "socket", r->memzone->socket_id);
+	rte_tel_data_add_dict_int(d, "numa_id", r->memzone->socket_id);
 	rte_tel_data_add_dict_int(d, "flags", r->flags);
 	rte_tel_data_add_dict_string(d, "producer_type",
 		ring_prod_sync_type_to_name(r));

@@ -622,7 +622,7 @@ ring_info_cb(struct rte_ring *r, void *arg)
 	rte_tel_data_add_dict_string(d, "mz_name", mz->name);
 	rte_tel_data_add_dict_uint(d, "mz_len", mz->len);
 	rte_tel_data_add_dict_uint(d, "mz_hugepage_sz", mz->hugepage_sz);
-	rte_tel_data_add_dict_int(d, "mz_socket_id", mz->socket_id);
+	rte_tel_data_add_dict_int(d, "mz_numa_id", mz->socket_id);
 	rte_tel_data_add_dict_uint_hex(d, "mz_flags", mz->flags, 0);
 }
 

index 3382a8e2f2..ff1f4ae90a 100644
@@ -146,9 +146,9 @@ void rte_ring_free(struct rte_ring *r);
  * @param count
  *   The size of the ring (must be a power of 2,
  *   unless RING_F_EXACT_SZ is set in flags).
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in case of
- *   NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in case of
+ *   NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   An OR of the following:

@@ -193,7 +193,7 @@ void rte_ring_free(struct rte_ring *r);
  *    - ENOMEM - no appropriate memory area found in which to create memzone
  */
 struct rte_ring *rte_ring_create(const char *name, unsigned int count,
-				 int socket_id, unsigned int flags)
+				 int numa_id, unsigned int flags)
 	__rte_malloc __rte_dealloc(rte_ring_free, 1);
 
 /**

index b96bfc003f..9397183538 100644
@@ -58,9 +58,9 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count);
  *   The size of ring element, in bytes. It must be a multiple of 4.
  * @param count
  *   The number of elements in the ring (must be a power of 2).
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in case of
- *   NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in case of
+ *   NUMA. The value can be *RTE_NUMA_ID_ANY* if there is no NUMA
  *   constraint for the reserved zone.
  * @param flags
  *   An OR of the following:

@@ -99,7 +99,7 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count);
  *    - ENOMEM - no appropriate memory area found in which to create memzone
  */
 struct rte_ring *rte_ring_create_elem(const char *name, unsigned int esize,
-			unsigned int count, int socket_id, unsigned int flags);
+			unsigned int count, int numa_id, unsigned int flags);
 
 /**
  * Enqueue several objects on the ring (multi-producers safe).

index ce55ab991e..ee65422054 100644
@@ -238,7 +238,7 @@ hash_create_free(__rte_unused void *arg)
 		.key_len = 4,
 		.hash_func = (rte_hash_function)rte_jhash_32b,
 		.hash_func_init_val = 0,
-		.socket_id = 0,
+		.numa_id = 0,
 	};
 
 	WAIT_SYNCHRO_FOR_WORKERS();

@@ -303,7 +303,7 @@ fbk_create_free(__rte_unused void *arg)
 		.name = NULL,
 		.entries = 4,
 		.entries_per_bucket = 4,
-		.socket_id = 0,
+		.numa_id = 0,
 		.hash_func = rte_jhash_1word,
 		.init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT,
 	};

208 lines not on this page · raw message

index 0af3eb2c33..7c0b4434e6 100644
@@ -119,7 +119,7 @@ test_hash_multiwriter(void)
 		.key_len = sizeof(uint32_t),
 		.hash_func = rte_jhash,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 	if (use_htm)
 		hash_params.extra_flag =

index d66b96e5ce..b3d78f4c6d 100644
@@ -104,7 +104,7 @@ create_table(unsigned int with_data, unsigned int table_index,
 
 	ut_params.name = name;
 	ut_params.key_len = hashtest_key_lens[table_index];
-	ut_params.socket_id = rte_socket_id();
+	ut_params.numa_id = rte_numa_id();
 	h[table_index] = rte_hash_find_existing(name);
 	rte_hash_free(h[table_index]);
 	h[table_index] = rte_hash_create(&ut_params);

@@ -653,7 +653,7 @@ fbk_hash_perf_test(void)
 		.name = "fbk_hash_test",
 		.entries = ENTRIES,
 		.entries_per_bucket = 4,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 	struct rte_fbk_hash_table *handle = NULL;
 	uint32_t *keys = NULL;

index 25fe072fc9..156edd84e2 100644
@@ -149,7 +149,7 @@ init_params(int use_ext, int use_htm, int rw_lf, int use_jhash, bool perf)
 		.entries = TOTAL_ENTRY * (perf ? PERF_MULTIPLIER : 1),
 		.key_len = sizeof(uint32_t),
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 	if (use_jhash)
 		hash_params.hash_func = rte_jhash;

index bef987d29d..bcad2fc813 100644
@@ -154,7 +154,7 @@ init_params(int rwc_lf, int use_jhash, int htm, int ext_bkt)
 		.entries = TOTAL_ENTRY,
 		.key_len = sizeof(uint32_t),
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	if (use_jhash)

index 05ad1ab5dd..7f749d6d7f 100644
@@ -1050,7 +1050,7 @@ init_hash(int hash_id)
 		.entries = TOTAL_ENTRY,
 		.key_len = sizeof(uint32_t),
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.hash_func = rte_hash_crc,
 		.extra_flag =
 			RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF,

index bdffd64e60..d5cb3d90bb 100644
@@ -339,7 +339,7 @@ static struct rte_hash *init_hash(void)
 		.entries = TOTAL_ENTRY,
 		.key_len = sizeof(uint32_t),
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.hash_func = rte_hash_crc,
 		.extra_flag =
 			RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF,

index f0ec87198f..31c6facef6 100644
@@ -998,7 +998,7 @@ int32_t bnxt_vnic_queue_db_init(struct bnxt *bp)
 		hash_tbl_params.entries = RTE_HASH_BUCKET_ENTRIES;
 
 	hash_tbl_params.key_len = BNXT_VNIC_MAX_QUEUE_SZ_IN_8BITS;
-	hash_tbl_params.socket_id = rte_socket_id();
+	hash_tbl_params.numa_id = rte_numa_id();
 	bp->vnic_queue_db.rss_q_db = rte_hash_create(&hash_tbl_params);
 	if (bp->vnic_queue_db.rss_q_db == NULL) {
 		PMD_DRV_LOG_LINE(ERR, "Failed to create rss hash tbl");

index f739cdf2a3..5d799dd3da 100644
@@ -358,7 +358,7 @@ int32_t ulp_matcher_init(struct bnxt_ulp_context *ulp_ctx)
 				  RTE_HASH_BUCKET_ENTRIES;
 
 	hash_tbl_params.key_len = sizeof(struct ulp_matcher_hash_db_key);
-	hash_tbl_params.socket_id = rte_socket_id();
+	hash_tbl_params.numa_id = rte_numa_id();
 	data->class_matcher_db = rte_hash_create(&hash_tbl_params);
 	if (data->class_matcher_db == NULL) {
 		BNXT_DRV_DBG(ERR, "Failed to create class matcher hash tbl\n");

@@ -380,7 +380,7 @@ int32_t ulp_matcher_init(struct bnxt_ulp_context *ulp_ctx)
 	/* The hash list size set to max support and not dependent on template*/
 	hash_tbl_params.entries = BNXT_ULP_ACT_HASH_LIST_SIZE;
 	hash_tbl_params.key_len = sizeof(struct ulp_matcher_action_hash_db_key);
-	hash_tbl_params.socket_id = rte_socket_id();
+	hash_tbl_params.numa_id = rte_numa_id();
 	data->action_matcher_db = rte_hash_create(&hash_tbl_params);
 	if (data->action_matcher_db == NULL) {
 		BNXT_DRV_DBG(ERR, "Failed to create action matcher hash tbl\n");

index 4b0a513977..ed328217e4 100644
@@ -3144,7 +3144,7 @@ enic_fm_init_actions(struct enic_flowman *fm)
 		.key_len = sizeof(struct fm_action),
 		.hash_func = rte_jhash,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	ENICPMD_FUNC_TRACE();

index 9a1b126632..3aca40d17d 100644
@@ -341,7 +341,7 @@ int hinic_osdep_init(struct hinic_hwdev *hwdev)
 	dh_params.key_len = HINIC_HASH_KEY_LEN;
 	dh_params.hash_func = HINIC_HASH_FUNC;
 	dh_params.hash_func_init_val = HINIC_HASH_FUNC_INIT_VAL;
-	dh_params.socket_id = SOCKET_ID_ANY;
+	dh_params.numa_id = RTE_NUMA_ID_ANY;
 
 	paddr_hash = rte_hash_find_existing(dh_params.name);
 	if (paddr_hash == NULL) {

index 0096aa21e9..11f28be758 100644
@@ -911,7 +911,7 @@ int hns3_fdir_filter_init(struct hns3_adapter *hns)
 		return ret;
 	}
 
-	fdir_hash_params.socket_id = rte_socket_id();
+	fdir_hash_params.numa_id = rte_numa_id();
 	TAILQ_INIT(&fdir_info->fdir_list);
 	snprintf(fdir_hash_name, RTE_HASH_NAMESIZE, "%s", hns->hw.data->name);
 	fdir_info->hash_handle = rte_hash_create(&fdir_hash_params);

index fd84d9b21e..d9465fcae2 100644
@@ -2517,7 +2517,7 @@ cpfl_vport_map_init(struct cpfl_adapter_ext *adapter)
 		.entries = CPFL_VPORT_MAP_HASH_ENTRY_NUM,
 		.key_len = sizeof(struct cpfl_vport_id),
 		.hash_func = rte_hash_crc,
-		.socket_id = SOCKET_ID_ANY,
+		.numa_id = RTE_NUMA_ID_ANY,
 	};
 
 	adapter->vport_map_hash = rte_hash_create(&params);

@@ -2559,7 +2559,7 @@ cpfl_repr_allowlist_init(struct cpfl_adapter_ext *adapter)
 		.entries = CPFL_REPR_HASH_ENTRY_NUM,
 		.key_len = sizeof(struct cpfl_repr_id),
 		.hash_func = rte_hash_crc,
-		.socket_id = SOCKET_ID_ANY,
+		.numa_id = RTE_NUMA_ID_ANY,
 	};
 
 	adapter->repr_allowlist_hash = rte_hash_create(&params);

index 498c5c7ec4..66db44aaa1 100644
@@ -1000,7 +1000,7 @@ i40e_tunnel_state_attach(struct rte_eth_dev_data *dev_data)
 		.key_len = sizeof(struct i40e_tunnel_filter_match_key),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	snprintf(tunnel_hash_name, RTE_HASH_NAMESIZE, "tunnel_%s", dev_data->name);

index 69b3b763ba..11e11b6713 100644
@@ -1078,7 +1078,7 @@ i40e_fdir_tmpl_store_init(struct rte_eth_dev *dev)
 		.key_len = sizeof(struct i40e_fdir_tmpl_key),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	if (tmpls->hash_table != NULL)

index 0b92c8dbfb..04787c937c 100644
@@ -306,7 +306,7 @@ i40e_flow_ethertype_engine_init(const struct ci_flow_engine *engine __rte_unused
 		.key_len = sizeof(struct i40e_ethertype_key),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	snprintf(ethertype_hash_name, RTE_HASH_NAMESIZE, "etype_%s", dev_data->name);

index 2350bd5523..3a15abe422 100644
@@ -395,7 +395,7 @@ ice_fdir_init_filter_list(struct ice_pf *pf)
 		.key_len = sizeof(struct ice_fdir_fltr_pattern),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_EXT_TABLE,
 	};
 

index 5137663a61..60a9dbf2c1 100644
@@ -1330,7 +1330,7 @@ ixgbe_fdir_state_attach(struct rte_eth_dev_data *dev_data)
 		.key_len = sizeof(union ixgbe_atr_input),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	snprintf(fdir_hash_name, RTE_HASH_NAMESIZE, "fdir_%s",

index 971964133c..5350133c29 100644
@@ -1088,7 +1088,7 @@ memif_create_socket_hash(void)
 	params.key_len = MEMIF_SOCKET_UN_SIZE;
 	params.hash_func = rte_jhash;
 	params.hash_func_init_val = 0;
-	params.socket_id = SOCKET_ID_ANY;
+	params.numa_id = RTE_NUMA_ID_ANY;
 	return rte_hash_create(&params);
 }
 

index 439a1a1b0e..f72bfd8d8b 100644
@@ -865,7 +865,7 @@ nfp_ct_zone_entry_init(struct nfp_ct_zone_entry *ze,
 	struct rte_hash_parameters ct_merge_hash_params = {
 		.entries    = 1000,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

index ad0fe9a8ef..c494f0c7ed 100644
@@ -5468,7 +5468,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
 		.name       = mask_name,
 		.entries    = NFP_MASK_TABLE_ENTRIES,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

@@ -5476,7 +5476,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
 	struct rte_hash_parameters flow_hash_params = {
 		.name       = flow_name,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

@@ -5485,7 +5485,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
 		.name       = pretun_name,
 		.entries    = 32,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

@@ -5494,7 +5494,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
 		.name       = ct_zone_table_name,
 		.entries    = 65536,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

@@ -5502,7 +5502,7 @@ nfp_flow_priv_init(struct nfp_pf_dev *pf_dev)
 	struct rte_hash_parameters ct_map_hash_params = {
 		.name       = ct_map_table_name,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

index 0e5003ebe3..e04053f0e1 100644
@@ -1082,7 +1082,7 @@ nfp_net_flow_priv_init(struct nfp_pf_dev *pf_dev,
 	struct rte_hash_parameters flow_hash_params = {
 		.name       = flow_name,
 		.hash_func  = rte_jhash,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(uint32_t),
 		.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY,
 	};

index bffbc4a158..78af60062e 100644
@@ -22,7 +22,7 @@ sfc_tbl_meta_cache_ctor(struct rte_hash **ref_cache)
 		.name       = "meta_hash_table",
 		.hash_func  = rte_jhash,
 		.entries    = cache_size,
-		.socket_id  = rte_socket_id(),
+		.numa_id  = rte_numa_id(),
 		.key_len    = sizeof(efx_table_id_t),
 	};
 

index 9dbdbfa309..fe7fed704f 100644
@@ -992,7 +992,7 @@ int txgbe_fdir_filter_init(struct rte_eth_dev *eth_dev)
 		.key_len = sizeof(struct txgbe_atr_input),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	TAILQ_INIT(&fdir_info->fdir_list);

@@ -1028,7 +1028,7 @@ static int txgbe_l2_tn_filter_init(struct rte_eth_dev *eth_dev)
 		.key_len = sizeof(struct txgbe_l2_tn_key),
 		.hash_func = rte_hash_crc,
 		.hash_func_init_val = 0,
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 	};
 
 	TAILQ_INIT(&l2_tn_info->l2_tn_list);

index 5d495ae973..6968bab789 100644
@@ -537,7 +537,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
 
 	/* Create ring (Dummy slot index is not enqueued) */
 	r = rte_ring_create_elem(ring_name, sizeof(uint32_t),
-			rte_align32pow2(num_key_slots), params->socket_id, 0);
+			rte_align32pow2(num_key_slots), params->numa_id, 0);
 	if (r == NULL) {
 		HASH_LOG(ERR, "ring creation failed: %s", rte_strerror(rte_errno));
 		goto err;

@@ -556,7 +556,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
 
 		r_ext = rte_ring_create_elem(ext_ring_name, sizeof(uint32_t),
 				rte_align32pow2(num_buckets + 1),
-				params->socket_id, 0);
+				params->numa_id, 0);
 		if (r_ext == NULL) {
 			HASH_LOG(ERR, "ext buckets ring create failed: %s",
 				rte_strerror(rte_errno));

@@ -590,17 +590,17 @@ rte_hash_create(const struct rte_hash_parameters *params)
 		goto err_unlock;
 	}
 
-	h = (struct rte_hash *)rte_zmalloc_socket(hash_name, sizeof(struct rte_hash),
-					RTE_CACHE_LINE_SIZE, params->socket_id);
+	h = (struct rte_hash *)rte_zmalloc_numa(hash_name, sizeof(struct rte_hash),
+					RTE_CACHE_LINE_SIZE, params->numa_id);
 
 	if (h == NULL) {
 		HASH_LOG(ERR, "memory allocation failed");
 		goto err_unlock;
 	}
 
-	buckets = rte_zmalloc_socket(NULL,
+	buckets = rte_zmalloc_numa(NULL,
 				num_buckets * sizeof(struct rte_hash_bucket),
-				RTE_CACHE_LINE_SIZE, params->socket_id);
+				RTE_CACHE_LINE_SIZE, params->numa_id);
 
 	if (buckets == NULL) {
 		HASH_LOG(ERR, "buckets memory allocation failed");

@@ -609,9 +609,9 @@ rte_hash_create(const struct rte_hash_parameters *params)
 
 	/* Allocate same number of extendable buckets */
 	if (ext_table_support) {
-		buckets_ext = rte_zmalloc_socket(NULL,
+		buckets_ext = rte_zmalloc_numa(NULL,
 				num_buckets * sizeof(struct rte_hash_bucket),
-				RTE_CACHE_LINE_SIZE, params->socket_id);
+				RTE_CACHE_LINE_SIZE, params->numa_id);
 		if (buckets_ext == NULL) {
 			HASH_LOG(ERR, "ext buckets memory allocation "
 							"failed");

@@ -641,16 +641,16 @@ rte_hash_create(const struct rte_hash_parameters *params)
 			  KEY_ALIGNMENT);
 	const uint64_t key_tbl_size = (uint64_t) key_entry_size * num_key_slots;
 
-	k = rte_zmalloc_socket(NULL, key_tbl_size,
-			RTE_CACHE_LINE_SIZE, params->socket_id);
+	k = rte_zmalloc_numa(NULL, key_tbl_size,
+			RTE_CACHE_LINE_SIZE, params->numa_id);
 
 	if (k == NULL) {
 		HASH_LOG(ERR, "memory allocation failed");
 		goto err_unlock;
 	}
 
-	tbl_chng_cnt = rte_zmalloc_socket(NULL, sizeof(uint32_t),
-			RTE_CACHE_LINE_SIZE, params->socket_id);
+	tbl_chng_cnt = rte_zmalloc_numa(NULL, sizeof(uint32_t),
+			RTE_CACHE_LINE_SIZE, params->numa_id);
 
 	if (tbl_chng_cnt == NULL) {
 		HASH_LOG(ERR, "memory allocation failed");

@@ -669,9 +669,9 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	}
 
 	if (use_local_cache) {
-		local_free_slots = rte_zmalloc_socket(NULL,
+		local_free_slots = rte_zmalloc_numa(NULL,
 				sizeof(struct lcore_cache) * RTE_MAX_LCORE,
-				RTE_CACHE_LINE_SIZE, params->socket_id);
+				RTE_CACHE_LINE_SIZE, params->numa_id);
 		if (local_free_slots == NULL) {
 			HASH_LOG(ERR, "local free slots memory allocation failed");
 			goto err_unlock;

index 45d4a13427..112a2ae958 100644
@@ -135,7 +135,7 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params)
 	}
 
 	/* Allocate memory for table. */
-	ht = rte_zmalloc_socket(hash_name, mem_size, 0, params->socket_id);
+	ht = rte_zmalloc_numa(hash_name, mem_size, 0, params->numa_id);
 	if (ht == NULL) {
 		HASH_LOG(ERR, "Failed to allocate fbk hash table");
 		rte_free(te);

index 6b70cfaa0b..57ecca2527 100644
@@ -50,7 +50,15 @@ struct rte_fbk_hash_params {
 	const char *name;		/**< Name of the hash table. */
 	uint32_t entries;		/**< Total number of entries. */
 	uint32_t entries_per_bucket;	/**< Number of entries in a bucket. */
-	int socket_id;			/**< Socket to allocate memory on. */
+	union {
+		/** NUMA node ID to allocate memory on. */
+		int numa_id;
+		/**
+		 * Deprecated alias of numa_id.
+		 */
+		__rte_deprecated_msg("use numa_id")
+		int socket_id;
+	};
 	rte_fbk_hash_fn hash_func;	/**< The hash function. */
 	uint32_t init_val;		/**< For initialising hash function. */
 };

index e33f0aea0f..c03c90cc32 100644
@@ -86,7 +86,15 @@ struct rte_hash_parameters {
 	uint32_t key_len;		/**< Length of hash key. */
 	rte_hash_function hash_func;	/**< Primary Hash function used to calculate hash. */
 	uint32_t hash_func_init_val;	/**< Init value used by hash_func. */
-	int socket_id;			/**< NUMA Socket ID for memory. */
+	union {
+		/** NUMA node ID for memory. */
+		int numa_id;
+		/**
+		 * Deprecated alias of numa_id.
+		 */
+		__rte_deprecated_msg("use numa_id")
+		int socket_id;
+	};
 	uint8_t extra_flag;		/**< Indicate if additional parameters are present. */
 };
 

index 15ea868f77..df2d1b4877 100644
@@ -302,7 +302,7 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 	hash_params.hash_func = DEFAULT_HASH_FUNC;
 	hash_params.hash_func_init_val = rte_rand();
 	sad->init_val = hash_params.hash_func_init_val;
-	hash_params.socket_id = conf->socket_id;
+	hash_params.numa_id = conf->socket_id;
 	hash_params.name = hash_name;
 	if (conf->flags & RTE_IPSEC_SAD_FLAG_RW_CONCURRENCY)
 		hash_params.extra_flag = RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY;

index e23c886766..5eb2f3761d 100644
@@ -246,7 +246,7 @@ rte_lpm6_create(const char *name, int socket_id,
 		.hash_func_init_val = 0,
 		.name = mem_name,
 		.reserved = 0,
-		.socket_id = socket_id,
+		.numa_id = socket_id,
 		.extra_flag = 0
 	};
 

index 5a74e28c85..47aad42022 100644
@@ -53,7 +53,7 @@ static struct rte_hash_parameters udp4_params = {
 	.key_len = sizeof(uint32_t),
 	.hash_func = rte_jhash,
 	.hash_func_init_val = 0,
-	.socket_id = 0,
+	.numa_id = 0,
 };
 
 RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_node_udp4_dst_port_add, 23.11)

@@ -109,7 +109,7 @@ setup_udp4_dstprt_hash(struct udp4_input_node_main *nm, int socket)
 	/* create Hash table */
 	snprintf(s, sizeof(s), "UDP4_INPUT_HASH_%d", socket);
 	hash_udp4->name = s;
-	hash_udp4->socket_id = socket;
+	hash_udp4->numa_id = socket;
 	nm->hash_tbl[socket] = rte_hash_create(hash_udp4);
 	if (nm->hash_tbl[socket] == NULL)
 		return -rte_errno;

index 38a7bd75d6..6c851c173a 100644
@@ -1837,7 +1837,7 @@ rte_vhost_crypto_create(int vid, uint8_t cryptodev_id,
 	params.entries = VHOST_CRYPTO_SESSION_MAP_ENTRIES;
 	params.hash_func = rte_jhash;
 	params.key_len = sizeof(uint64_t);
-	params.socket_id = socket_id;
+	params.numa_id = socket_id;
 	vcrypto->session_map = rte_hash_create(&params);
 	if (!vcrypto->session_map) {
 		VC_LOG_ERR("Failed to creath session map");

index 23447196c3..1ba4156367 100644
@@ -107,7 +107,7 @@ static struct rte_member_parameters params = {
 		.false_positive_rate = 0.03,
 		.prim_hash_seed = 1,
 		.sec_hash_seed = 11,
-		.socket_id = 0			/* NUMA Socket ID for memory. */
+		.numa_id = 0			/* NUMA Socket ID for memory. */
 };
 
 /* for sketch definitions */

@@ -146,7 +146,7 @@ test_member_find_existing(void)
 		.false_positive_rate = 0.03,
 		.prim_hash_seed = 1,
 		.sec_hash_seed = 11,
-		.socket_id = 0			/* NUMA Socket ID for memory. */
+		.numa_id = 0			/* NUMA Socket ID for memory. */
 	};
 
 	/* Create */

@@ -182,7 +182,7 @@ test_member_create_bad_param(void)
 		.false_positive_rate = 0.03,
 		.prim_hash_seed = 1,
 		.sec_hash_seed = 11,
-		.socket_id = 0			/* NUMA Socket ID for memory. */
+		.numa_id = 0			/* NUMA Socket ID for memory. */
 	};
 
 	printf("Expected error section begin...\n");

index db6b8a18ef..5bf75bf8d4 100644
@@ -140,7 +140,7 @@ struct rte_member_parameters member_params = {
 		.false_positive_rate = 0.03,
 		.prim_hash_seed = 0,
 		.sec_hash_seed = 1,
-		.socket_id = 0,			/* NUMA Socket ID for memory. */
+		.numa_id = 0,			/* NUMA Socket ID for memory. */
 	};
 
 static int

@@ -220,7 +220,7 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle,
 	}
 	member_params.false_positive_rate = VBF_FALSE_RATE;
 	member_params.key_len = params->key_size;
-	member_params.socket_id = test_socket_id;
+	member_params.numa_id = test_socket_id;
 	member_params.num_keys = entry_cnt;
 	member_params.name = "test_member_ht";
 	member_params.is_cache = 0;

index 5ff32f1e45..a213504425 100644
@@ -115,7 +115,7 @@ rte_member_create(const struct rte_member_parameters *params)
 	if (params->type == RTE_MEMBER_TYPE_SKETCH) {
 		snprintf(ring_name, sizeof(ring_name), "SK_%s", params->name);
 		sketch_key_ring = rte_ring_create_elem(ring_name, sizeof(uint32_t),
-				rte_align32pow2(params->top_k), params->socket_id, 0);
+				rte_align32pow2(params->top_k), params->numa_id, 0);
 		if (sketch_key_ring == NULL) {
 			MEMBER_LOG(ERR, "Sketch Ring Memory allocation failed");
 			return NULL;

@@ -145,16 +145,16 @@ rte_member_create(const struct rte_member_parameters *params)
 	}
 
 	/* Create a new setsum structure */
-	setsum = rte_zmalloc_socket(params->name,
+	setsum = rte_zmalloc_numa(params->name,
 			sizeof(struct rte_member_setsum), RTE_CACHE_LINE_SIZE,
-			params->socket_id);
+			params->numa_id);
 	if (setsum == NULL) {
 		MEMBER_LOG(ERR, "Create setsummary failed");
 		goto error_unlock_exit;
 	}
 	strlcpy(setsum->name, params->name, sizeof(setsum->name));
 	setsum->type = params->type;
-	setsum->socket_id = params->socket_id;
+	setsum->numa_id = params->numa_id;
 	setsum->key_len = params->key_len;
 	setsum->num_set = params->num_set;
 	setsum->prim_hash_seed = params->prim_hash_seed;

index 6d9740e0f1..9f9b74b421 100644
@@ -171,7 +171,15 @@ struct __rte_cache_aligned rte_member_setsum {
 
 
 	/* Second cache line should start here. */
-	uint32_t socket_id;          /* NUMA Socket ID for memory. */
+	union {
+		/** NUMA node ID for memory. */
+		uint32_t numa_id;
+		/**
+		 * Deprecated alias of numa_id.
+		 */
+		__rte_deprecated_msg("use numa_id")
+		uint32_t socket_id;
+	};
 	char name[RTE_MEMBER_NAMESIZE]; /* Name of this set summary. */
 #ifdef RTE_ARCH_X86
 	bool use_avx512;

@@ -316,7 +324,15 @@ struct __rte_cache_aligned rte_member_parameters {
 	 */
 	uint32_t extra_flag;
 
-	int socket_id;			/**< NUMA Socket ID for memory. */
+	union {
+		/** NUMA node ID for memory. */
+		int numa_id;
+		/**
+		 * Deprecated alias of numa_id.
+		 */
+		__rte_deprecated_msg("use numa_id")
+		int socket_id;
+	};
 };
 
 /**

index d551c85a75..40e4991e38 100644
@@ -38,7 +38,7 @@ struct node {
 struct minheap {
 	uint32_t key_len;
 	uint32_t size;
-	uint32_t socket;
+	uint32_t numa_id;
 	struct hash *hashtable;
 	struct node *elem;
 };

@@ -134,9 +134,9 @@ resize_hash_table(struct minheap *hp)
 			hp->hashtable->num_item / ((float)hp->hashtable->bkt_cnt * HASH_BKT_SIZE));
 		MEMBER_LOG(ERR, "Sketch Minheap HT resize happen!");
 		rte_free(hp->hashtable);
-		hp->hashtable = rte_zmalloc_socket(NULL, sizeof(struct hash) +
+		hp->hashtable = rte_zmalloc_numa(NULL, sizeof(struct hash) +
 						new_bkt_cnt * sizeof(struct hash_bkt),
-						RTE_CACHE_LINE_SIZE, hp->socket);
+						RTE_CACHE_LINE_SIZE, hp->numa_id);
 
 		if (hp->hashtable == NULL) {
 			MEMBER_LOG(ERR, "Sketch Minheap HT allocation failed");

@@ -170,10 +170,10 @@ rte_member_minheap_find(struct minheap *hp, const void *key)
 
 static int
 rte_member_minheap_init(struct minheap *heap, int size,
-			uint32_t socket, uint32_t seed)
+			uint32_t numa_id, uint32_t seed)
 {
-	heap->elem = rte_zmalloc_socket(NULL, sizeof(struct node) * size,
-				RTE_CACHE_LINE_SIZE, socket);
+	heap->elem = rte_zmalloc_numa(NULL, sizeof(struct node) * size,
+				RTE_CACHE_LINE_SIZE, numa_id);
 	if (heap->elem == NULL) {
 		MEMBER_LOG(ERR, "Sketch Minheap elem allocation failed");
 		return -ENOMEM;

@@ -184,9 +184,9 @@ rte_member_minheap_init(struct minheap *heap, int size,
 	if (hash_bkt_cnt == 0)
 		hash_bkt_cnt = 1;
 
-	heap->hashtable = rte_zmalloc_socket(NULL, sizeof(struct hash) +
+	heap->hashtable = rte_zmalloc_numa(NULL, sizeof(struct hash) +
 					hash_bkt_cnt * sizeof(struct hash_bkt),
-					RTE_CACHE_LINE_SIZE, socket);
+					RTE_CACHE_LINE_SIZE, numa_id);
 
 	if (heap->hashtable == NULL) {
 		MEMBER_LOG(ERR, "Sketch Minheap HT allocation failed");

@@ -196,7 +196,7 @@ rte_member_minheap_init(struct minheap *heap, int size,
 
 	heap->hashtable->seed = seed;
 	heap->hashtable->bkt_cnt = hash_bkt_cnt;
-	heap->socket = socket;
+	heap->numa_id = numa_id;
 
 	return 0;
 }

index 8c89a949c8..1f82d0fe16 100644
@@ -95,9 +95,9 @@ rte_member_create_ht(struct rte_member_setsum *ss,
 
 	size_bucket_t = sizeof(struct member_ht_bucket);
 
-	struct member_ht_bucket *buckets = rte_zmalloc_socket(NULL,
+	struct member_ht_bucket *buckets = rte_zmalloc_numa(NULL,
 			num_buckets * size_bucket_t,
-			RTE_CACHE_LINE_SIZE, ss->socket_id);
+			RTE_CACHE_LINE_SIZE, ss->numa_id);
 
 	if (buckets == NULL) {
 		MEMBER_LOG(ERR, "memory allocation failed for HT "

index b753bac1bd..0d551f4bd7 100644
@@ -160,7 +160,7 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
 		ss->sketch_delete = sketch_delete_scalar;
 	}
 
-	ss->socket_id = params->socket_id;
+	ss->numa_id = params->numa_id;
 
 	if (ss->count_byte == 0)
 		num_col = 4.0 / params->error_rate / params->sample_rate;

@@ -171,23 +171,23 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
 	else
 		num_col = 4.0 / params->error_rate;
 
-	ss->table = rte_zmalloc_socket(NULL,
+	ss->table = rte_zmalloc_numa(NULL,
 			sizeof(uint64_t) * num_col * ss->num_row,
-			RTE_CACHE_LINE_SIZE, ss->socket_id);
+			RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (ss->table == NULL) {
 		MEMBER_LOG(ERR, "Sketch Table memory allocation failed");
 		return -ENOMEM;
 	}
 
-	ss->hash_seeds = rte_zmalloc_socket(NULL, sizeof(uint64_t) * ss->num_row,
-			RTE_CACHE_LINE_SIZE, ss->socket_id);
+	ss->hash_seeds = rte_zmalloc_numa(NULL, sizeof(uint64_t) * ss->num_row,
+			RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (ss->hash_seeds == NULL) {
 		MEMBER_LOG(ERR, "Sketch Hashseeds memory allocation failed");
 		return -ENOMEM;
 	}
 
-	ss->runtime_var = rte_zmalloc_socket(NULL, sizeof(struct sketch_runtime),
-					RTE_CACHE_LINE_SIZE, ss->socket_id);
+	ss->runtime_var = rte_zmalloc_numa(NULL, sizeof(struct sketch_runtime),
+					RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (ss->runtime_var == NULL) {
 		MEMBER_LOG(ERR, "Sketch Runtime memory allocation failed");
 		rte_free(ss);

@@ -204,8 +204,8 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
 	ss->key_len = params->key_len;
 	runtime->heap.key_len = ss->key_len;
 
-	runtime->key_slots = rte_zmalloc_socket(NULL, ss->key_len * ss->topk,
-					RTE_CACHE_LINE_SIZE, ss->socket_id);
+	runtime->key_slots = rte_zmalloc_numa(NULL, ss->key_len * ss->topk,
+					RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (runtime->key_slots == NULL) {
 		MEMBER_LOG(ERR, "Sketch Key Slots allocation failed");
 		goto error;

@@ -217,13 +217,13 @@ rte_member_create_sketch(struct rte_member_setsum *ss,
 					&i, sizeof(uint32_t));
 
 	if (rte_member_minheap_init(&(runtime->heap), params->top_k,
-			ss->socket_id, params->prim_hash_seed) < 0) {
+			ss->numa_id, params->prim_hash_seed) < 0) {
 		MEMBER_LOG(ERR, "Sketch Minheap allocation failed");
 		goto error_runtime;
 	}
 
-	runtime->report_array = rte_zmalloc_socket(NULL, sizeof(struct node) * ss->topk,
-					RTE_CACHE_LINE_SIZE, ss->socket_id);
+	runtime->report_array = rte_zmalloc_numa(NULL, sizeof(struct node) * ss->topk,
+					RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (runtime->report_array == NULL) {
 		MEMBER_LOG(ERR, "Sketch Runtime Report Array allocation failed");
 		goto error_runtime;

index 5ad9487fad..9eb3f4a6f3 100644
@@ -118,8 +118,8 @@ rte_member_create_vbf(struct rte_member_setsum *ss,
 		"The new calculated vBF false positive rate is %.5f",
 		num_keys_per_bf, ss->bits, ss->num_hashes, fp_one_bf, new_fp);
 
-	ss->table = rte_zmalloc_socket(NULL, ss->num_set * (ss->bits >> 3),
-					RTE_CACHE_LINE_SIZE, ss->socket_id);
+	ss->table = rte_zmalloc_numa(NULL, ss->num_set * (ss->bits >> 3),
+					RTE_CACHE_LINE_SIZE, ss->numa_id);
 	if (ss->table == NULL)
 		return -ENOMEM;
 

index e6f8d6fe85..92310c94be 100644
@@ -327,11 +327,11 @@ rte_eth_dev_create(struct rte_device *device, const char *name,
 
 		if (priv_data_size) {
 			/* try alloc private data on device-local node. */
-			ethdev->data->dev_private = rte_zmalloc_socket(
+			ethdev->data->dev_private = rte_zmalloc_numa(
 				name, priv_data_size, RTE_CACHE_LINE_SIZE,
 				device->numa_node);
 
-			/* fall back to alloc on any socket on failure */
+			/* fall back to alloc on any NUMA node on failure */
 			if (ethdev->data->dev_private == NULL) {
 				ethdev->data->dev_private = rte_zmalloc(name,
 						priv_data_size, RTE_CACHE_LINE_SIZE);

@@ -741,7 +741,7 @@ RTE_EXPORT_INTERNAL_SYMBOL(rte_eth_dma_zone_reserve)
 const struct rte_memzone *
 rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
 			 uint16_t queue_id, size_t size, unsigned int align,
-			 int socket_id)
+			 int numa_id)
 {
 	char z_name[RTE_MEMZONE_NAMESIZE];
 	const struct rte_memzone *mz;

@@ -757,7 +757,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
 
 	mz = rte_memzone_lookup(z_name);
 	if (mz) {
-		if ((socket_id != SOCKET_ID_ANY && socket_id != mz->socket_id) ||
+		if ((numa_id != RTE_NUMA_ID_ANY && numa_id != mz->socket_id) ||
 				size > mz->len ||
 				((uintptr_t)mz->addr & (align - 1)) != 0) {
 			RTE_ETHDEV_LOG_LINE(ERR,

@@ -769,7 +769,7 @@ rte_eth_dma_zone_reserve(const struct rte_eth_dev *dev, const char *ring_name,
 		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);
 }
 

index ac6f850a7e..28f0e8b2b4 100644
@@ -616,7 +616,7 @@ typedef int (*eth_queue_stop_t)(struct rte_eth_dev *dev,
 typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev,
 				    uint16_t rx_queue_id,
 				    uint16_t nb_rx_desc,
-				    unsigned int socket_id,
+				    unsigned int numa_id,
 				    const struct rte_eth_rxconf *rx_conf,
 				    struct rte_mempool *mb_pool);
 

@@ -624,7 +624,7 @@ typedef int (*eth_rx_queue_setup_t)(struct rte_eth_dev *dev,
 typedef int (*eth_tx_queue_setup_t)(struct rte_eth_dev *dev,
 				    uint16_t tx_queue_id,
 				    uint16_t nb_tx_desc,
-				    unsigned int socket_id,
+				    unsigned int numa_id,
 				    const struct rte_eth_txconf *tx_conf);
 
 /** @internal Enable interrupt of a receive queue of an Ethernet device. */

@@ -1813,14 +1813,14 @@ void rte_eth_dev_probing_finish(struct rte_eth_dev *dev);
  *   The sizeof of the memory area
  * @param align
  *   Alignment for resulting memzone. Must be a power of 2.
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in case of NUMA.
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in case of NUMA.
  */
 __rte_internal
 const struct rte_memzone *
 rte_eth_dma_zone_reserve(const struct rte_eth_dev *eth_dev, const char *name,
 			 uint16_t queue_id, size_t size,
-			 unsigned align, int socket_id);
+			 unsigned int align, int numa_id);
 
 /**
  * Free previously allocated memzone for HW rings.

index ce3e293818..36482e606c 100644
@@ -96,13 +96,13 @@ rte_eth_dev_pci_allocate(struct rte_pci_device *dev, size_t private_data_size)
 			return NULL;
 
 		if (private_data_size) {
-			/* Try and alloc the private-data structure on socket local to the device */
-			eth_dev->data->dev_private = rte_zmalloc_socket(name,
+			/* Try and alloc private-data on the device NUMA node */
+			eth_dev->data->dev_private = rte_zmalloc_numa(name,
 				private_data_size, RTE_CACHE_LINE_SIZE,
 				dev->device.numa_node);
 
-			/* if cannot allocate memory on the socket local to the device
-			 * use rte_malloc to allocate memory on some other socket, if available.
+			/* if cannot allocate memory on the NUMA node local to the device
+			 * use rte_malloc to allocate memory on some other NUMA node, if available.
 			 */
 			if (eth_dev->data->dev_private == NULL) {
 				eth_dev->data->dev_private = rte_zmalloc(name,

index 70cc6ae63c..0a642bf242 100644
@@ -359,7 +359,7 @@ eth_dev_shared_data_prepare(void)
 		/* Allocate port data and ownership shared memory. */
 		mz = rte_memzone_reserve(MZ_RTE_ETH_DEV_DATA,
 				sizeof(*eth_dev_shared_data),
-				SOCKET_ID_ANY, flags);
+				RTE_NUMA_ID_ANY, flags);
 		if (mz == NULL) {
 			RTE_ETHDEV_LOG_LINE(ERR, "Cannot allocate ethdev shared data");
 			goto out;

index ebf5279a84..633cfb2efe 100644
@@ -143,10 +143,10 @@ RTE_TRACE_POINT(
 )
 
 RTE_TRACE_POINT(
-	rte_ethdev_trace_socket_id,
-	RTE_TRACE_POINT_ARGS(uint16_t port_id, int socket_id),
+	rte_ethdev_trace_numa_id,
+	RTE_TRACE_POINT_ARGS(uint16_t port_id, int numa_id),
 	rte_trace_point_emit_u16(port_id);
-	rte_trace_point_emit_int(socket_id);
+	rte_trace_point_emit_int(numa_id);
 )
 
 RTE_TRACE_POINT(

index b0644ea489..5cdbb1b27a 100644
@@ -92,8 +92,8 @@ RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_owner_delete,
 RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_owner_get,
 	lib.ethdev.owner_get)
 
-RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_socket_id,
-	lib.ethdev.socket_id)
+RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_numa_id,
+	lib.ethdev.numa_id)
 
 RTE_TRACE_POINT_REGISTER(rte_ethdev_trace_get_sec_ctx,
 	lib.ethdev.get_sec_ctx)

index 010ec75a00..9c039778d4 100644
@@ -40,7 +40,7 @@ rte_eth_vdev_allocate(struct rte_vdev_device *dev, size_t private_data_size)
 		return NULL;
 
 	if (private_data_size) {
-		eth_dev->data->dev_private = rte_zmalloc_socket(name,
+		eth_dev->data->dev_private = rte_zmalloc_numa(name,
 			private_data_size, RTE_CACHE_LINE_SIZE,
 			dev->device.numa_node);
 		if (!eth_dev->data->dev_private) {

index 8f91a353d9..23fcf2d2e8 100644
@@ -642,30 +642,37 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)
 	return ret;
 }
 
-RTE_EXPORT_SYMBOL(rte_eth_dev_socket_id)
+RTE_EXPORT_SYMBOL(rte_eth_dev_numa_id)
 int
-rte_eth_dev_socket_id(uint16_t port_id)
+rte_eth_dev_numa_id(uint16_t port_id)
 {
-	int socket_id = SOCKET_ID_ANY;
+	int numa_id = RTE_NUMA_ID_ANY;
 	struct rte_eth_dev *ethdev;
 
 	if (port_id >= RTE_MAX_ETHPORTS) {
 		rte_errno = EINVAL;
-		return socket_id;
+		return numa_id;
 	}
 
 	ethdev = &rte_eth_devices[port_id];
 	if (!eth_dev_is_allocated(ethdev)) {
 		rte_errno = EINVAL;
 	} else {
-		socket_id = rte_eth_devices[port_id].data->numa_node;
-		if (socket_id == SOCKET_ID_ANY)
+		numa_id = rte_eth_devices[port_id].data->numa_node;
+		if (numa_id == RTE_NUMA_ID_ANY)
 			rte_errno = 0;
 	}
 
-	rte_ethdev_trace_socket_id(port_id, socket_id);
+	rte_ethdev_trace_numa_id(port_id, numa_id);
+
+	return numa_id;
+}
 
-	return socket_id;
+RTE_EXPORT_SYMBOL(rte_eth_dev_socket_id)
+int
+rte_eth_dev_socket_id(uint16_t port_id)
+{
+	return rte_eth_dev_numa_id(port_id);
 }
 
 RTE_EXPORT_SYMBOL(rte_eth_dev_get_sec_ctx)

@@ -2344,7 +2351,7 @@ rte_eth_rx_queue_check_mempools(struct rte_mempool **rx_mempools,
 RTE_EXPORT_SYMBOL(rte_eth_rx_queue_setup)
 int
 rte_eth_rx_queue_setup(uint16_t port_id, 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 *mp)
 {

@@ -2554,7 +2561,7 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 	}
 
 	ret = dev->dev_ops->rx_queue_setup(dev, rx_queue_id, nb_rx_desc,
-					   socket_id, &local_conf, mp);
+					   numa_id, &local_conf, mp);
 	if (!ret) {
 		if (!dev->data->min_rx_buf_size ||
 		    dev->data->min_rx_buf_size > mbp_buf_size)

@@ -2675,7 +2682,7 @@ rte_eth_rx_hairpin_queue_setup(uint16_t port_id, uint16_t rx_queue_id,
 RTE_EXPORT_SYMBOL(rte_eth_tx_queue_setup)
 int
 rte_eth_tx_queue_setup(uint16_t port_id, 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)
 {
 	struct rte_eth_dev *dev;

@@ -2781,7 +2788,7 @@ rte_eth_tx_queue_setup(uint16_t port_id, uint16_t tx_queue_id,
 
 	rte_ethdev_trace_txq_setup(port_id, tx_queue_id, nb_tx_desc, tx_conf);
 	return eth_err(port_id, dev->dev_ops->tx_queue_setup(dev,
-		       tx_queue_id, nb_tx_desc, socket_id, &local_conf));
+		       tx_queue_id, nb_tx_desc, numa_id, &local_conf));
 }
 
 RTE_EXPORT_SYMBOL(rte_eth_tx_hairpin_queue_setup)

index 1924483689..83a4dfb337 100644
@@ -2424,7 +2424,7 @@ rte_eth_dev_is_removed(uint16_t port_id);
  * Allocate and set up a receive queue for an Ethernet device.
  *
  * The function allocates a contiguous block of memory for *nb_rx_desc*
- * receive descriptors from a memory zone associated with *socket_id*
+ * receive descriptors from a memory zone associated with *numa_id*
  * and initializes each receive descriptor with a network buffer allocated
  * from the memory pool *mb_pool*.
  *

@@ -2436,9 +2436,9 @@ rte_eth_dev_is_removed(uint16_t port_id);
  *   to rte_eth_dev_configure().
  * @param nb_rx_desc
  *   The number of receive descriptors to allocate for the receive ring.
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in case of NUMA.
- *   The value can be *SOCKET_ID_ANY* if there is no NUMA constraint for
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in case of NUMA.
+ *   The value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for
  *   the DMA memory allocated for the receive descriptors of the ring.
  * @param rx_conf
  *   The pointer to the configuration data to be used for the receive queue.

@@ -2483,7 +2483,7 @@ rte_eth_dev_is_removed(uint16_t port_id);
  *      initializing receive descriptors.
  */
 int rte_eth_rx_queue_setup(uint16_t port_id, 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);
 

@@ -2526,9 +2526,9 @@ int rte_eth_rx_hairpin_queue_setup
  *   to rte_eth_dev_configure().
  * @param nb_tx_desc
  *   The number of transmit descriptors to allocate for the transmit ring.
- * @param socket_id
- *   The *socket_id* argument is the socket identifier in case of NUMA.
- *   Its value can be *SOCKET_ID_ANY* if there is no NUMA constraint for
+ * @param numa_id
+ *   The *numa_id* argument is the NUMA node ID in case of NUMA.
+ *   Its value can be *RTE_NUMA_ID_ANY* if there is no NUMA constraint for
  *   the DMA memory allocated for the transmit descriptors of the ring.
  * @param tx_conf
  *   The pointer to the configuration data to be used for the transmit queue.

@@ -2564,7 +2564,7 @@ int rte_eth_rx_hairpin_queue_setup
  *   - -ENOMEM: Unable to allocate the transmit ring descriptors.
  */
 int rte_eth_tx_queue_setup(uint16_t port_id, 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);
 
 /**

@@ -2704,14 +2704,30 @@ int rte_eth_dev_count_aggr_ports(uint16_t port_id);
 int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id,
 				     uint8_t affinity);
 
+/**
+ * Return the NUMA node to which an Ethernet device is connected
+ *
+ * @param port_id
+ *   The port identifier of the Ethernet device
+ * @return
+ *   - The NUMA node ID which the Ethernet device is connected to.
+ *   - RTE_NUMA_ID_ANY if the NUMA node could not be
+ *     determined. rte_errno is then set to:
+ *     - EINVAL is the port_id is invalid,
+ *     - 0 is the NUMA node could not be determined,
+ */
+int rte_eth_dev_numa_id(uint16_t port_id);
+
 /**
  * Return the NUMA socket to which an Ethernet device is connected
  *
+ * This is a legacy alias of rte_eth_dev_numa_id().
+ *
  * @param port_id
  *   The port identifier of the Ethernet device
  * @return
  *   - The NUMA socket ID which the Ethernet device is connected to.
- *   - -1 (which translates to SOCKET_ID_ANY) if the socket could not be
+ *   - -1 (which translates to RTE_NUMA_ID_ANY) if the socket could not be
  *     determined. rte_errno is then set to:
  *     - EINVAL is the port_id is invalid,
  *     - 0 is the socket could not be determined,

@@ -4064,7 +4080,7 @@ enum rte_eth_event_type {
 	/**
 	 * The port is being probed, i.e. allocated and not yet available.
 	 * It is too early to check validity, query infos, and configure
-	 * the port. But some functions, like rte_eth_dev_socket_id() and
+	 * the port. But some functions, like rte_eth_dev_numa_id() and
 	 * rte_eth_dev_owner_*() are available to the application.
 	 */
 	RTE_ETH_EVENT_NEW,

index 146acec174..1749e86421 100644
@@ -537,7 +537,7 @@ eth_dev_handle_port_rxq(const char *cmd __rte_unused,
 
 	rte_tel_data_start_dict(d);
 	rte_tel_data_add_dict_string(d, "mempool_name", qinfo.mp->name);
-	rte_tel_data_add_dict_uint(d, "socket_id", qinfo.mp->numa_id);
+	rte_tel_data_add_dict_uint(d, "numa_id", qinfo.mp->numa_id);
 
 	rx_thresh = &qinfo.conf.rx_thresh;
 	rte_tel_data_add_dict_uint(d, "host_threshold", rx_thresh->hthresh);

index fd02107baf..aa689b297a 100644
@@ -716,7 +716,7 @@ testsuite_setup(void)
 	rte_cryptodev_info_get(dev_id, &info);
 
 	ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
-	ts_params->conf.socket_id = SOCKET_ID_ANY;
+	ts_params->conf.numa_id = SOCKET_ID_ANY;
 	ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
 
 	unsigned int session_size =

@@ -1512,7 +1512,7 @@ dev_configure_and_start(uint64_t ff_disable)
 	memset(ut_params, 0, sizeof(*ut_params));
 
 	/* Reconfigure device to default parameters */
-	ts_params->conf.socket_id = SOCKET_ID_ANY;
+	ts_params->conf.numa_id = SOCKET_ID_ANY;
 	ts_params->conf.ff_disable = ff_disable;
 	ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
 	ts_params->qp_conf.mp_session = ts_params->session_mpool;

index d9807f34e0..d68fe84cde 100644
@@ -1185,7 +1185,7 @@ testsuite_setup(void)
 
 	/* configure device with num qp */
 	ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
-	ts_params->conf.socket_id = SOCKET_ID_ANY;
+	ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
 	ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY |
 			RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO;
 	TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id,

@@ -1251,7 +1251,7 @@ ut_setup_asym(void)
 	);
 
 	/* Reconfigure device to default parameters */
-	ts_params->conf.socket_id = SOCKET_ID_ANY;
+	ts_params->conf.numa_id = RTE_NUMA_ID_ANY;
 
 	TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
 			&ts_params->conf),

index bb21c3bc50..d0ff3e0b35 100644
@@ -425,7 +425,7 @@ crosscheck_init(void)
 
 	/* Setup queue pair conf params */
 	ts_params->conf.nb_queue_pairs = nb_queue_pairs;
-	ts_params->conf.socket_id = SOCKET_ID_ANY;
+	ts_params->conf.numa_id = SOCKET_ID_ANY;
 	ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
 	ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
 	ts_params->qp_conf.mp_session = ts_params->session_mpool;

index d3b1e25d57..3f2ff40cd8 100644
@@ -355,7 +355,7 @@ bcmfs_sym_dev_create(struct bcmfs_device *fsdev)
 {
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.private_data_size = sizeof(struct bcmfs_sym_dev_private)
 	};
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];

index 700e141667..ab19f8fd9c 100644
@@ -288,7 +288,7 @@ cryptodev_ccp_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	init_params.def_p.max_nb_queue_pairs = CCP_PMD_MAX_QUEUE_PAIRS;
 
 	CCP_LOG_INFO("Initialising %s on NUMA node %d", name,
-		init_params.def_p.socket_id);
+		init_params.def_p.numa_id);
 	CCP_LOG_INFO("Max number of queue pairs = %d",
 		init_params.def_p.max_nb_queue_pairs);
 	CCP_LOG_INFO("Authentication offload to %s",

index 598def51a5..1c1478ad80 100644
@@ -34,7 +34,7 @@ cn10k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 {
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.private_data_size = sizeof(struct cnxk_cpt_vf)
 	};
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];

index 7b8293cc05..36f2a615dd 100644
@@ -31,7 +31,7 @@ static int
 cn20k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_pci_device *pci_dev)
 {
 	struct rte_cryptodev_pmd_init_params init_params = {.name = "",
-							    .socket_id = rte_socket_id(),
+							    .numa_id = rte_numa_id(),
 							    .private_data_size =
 								    sizeof(struct cnxk_cpt_vf)};
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];

index 818458bd6f..bb5c837b0a 100644
@@ -39,7 +39,7 @@ cn9k_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 {
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.private_data_size = sizeof(struct cnxk_cpt_vf)
 	};
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];

index d83698f1ad..7bcb472838 100644
@@ -4551,7 +4551,7 @@ cryptodev_dpaa2_sec_probe(struct rte_dpaa2_driver *dpaa2_drv __rte_unused,
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
 		.private_data_size = sizeof(struct dpaa2_sec_dev_private),
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.max_nb_queue_pairs =
 			RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS,
 			/* setting default, will be updated in init. */

index f03efb316d..65b3573a1a 100644
@@ -3777,7 +3777,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused,
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
 		.private_data_size = sizeof(struct dpaa_sec_dev_private),
-		.socket_id = rte_socket_id(),
+		.numa_id = rte_numa_id(),
 		.max_nb_queue_pairs =
 			RTE_DPAA_MAX_NB_SEC_QPS,
 	};

index 468d77fead..23ec99004b 100644
@@ -101,7 +101,7 @@ ipsec_mb_create(struct rte_vdev_device *vdev,
 		pmd_data->internals_priv_size;
 	init_params.max_nb_queue_pairs =
 		RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS;
-	init_params.socket_id = rte_socket_id();
+	init_params.numa_id = rte_socket_id();
 
 	name = rte_vdev_device_name(vdev);
 	if (name == NULL)

index 1a2600655a..d0f01dab4a 100644
@@ -342,7 +342,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	qp->priv = priv;
 	qp->entries_n = entries;
 	if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
-				  priv->dev_config.socket_id)) {
+				  priv->dev_config.numa_id)) {
 		DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
 			(uint32_t)qp_id);
 		rte_errno = ENOMEM;

index 1c914caa85..badde267a7 100644
@@ -515,7 +515,7 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 		goto error;
 	}
 	if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
-			      priv->dev_config.socket_id) != 0) {
+			      priv->dev_config.numa_id) != 0) {
 		DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
 			(uint32_t)qp_id);
 		rte_errno = ENOMEM;

index 65a63c9d62..c69f526c52 100644
@@ -1178,7 +1178,7 @@ mrvl_pmd_parse_input_args(struct mrvl_pmd_init_params *params,
 		ret = rte_kvargs_process(kvlist,
 					 RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
 					 &parse_integer_arg,
-					 &params->common.socket_id);
+					 &params->common.numa_id);
 		if (ret < 0)
 			goto free_kvlist;
 

@@ -1219,7 +1219,7 @@ cryptodev_mrvl_crypto_init(struct rte_vdev_device *vdev)
 				sizeof(struct mrvl_crypto_private),
 			.max_nb_queue_pairs =
 				sam_get_num_inst() * sam_get_num_cios(0),
-			.socket_id = rte_socket_id()
+			.numa_id = rte_numa_id()
 		},
 		.max_nb_sessions = MRVL_PMD_DEFAULT_MAX_NB_SESSIONS
 	};

index 7c2dc98a4b..510d6059b1 100644
@@ -749,7 +749,7 @@ nitrox_sym_pmd_create(struct nitrox_device *ndev)
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
 	struct rte_cryptodev_pmd_init_params init_params = {
 			.name = "",
-			.socket_id = ndev->pdev->device.numa_node,
+			.numa_id = ndev->pdev->device.numa_node,
 			.private_data_size = sizeof(struct nitrox_sym_device)
 	};
 	struct rte_cryptodev *cdev;

index ceaefa329b..8ca09ba3d0 100644
@@ -533,7 +533,7 @@ scheduler_parse_init_params(struct scheduler_init_params *params,
 
 		ret = rte_kvargs_process(kvlist, RTE_CRYPTODEV_VDEV_SOCKET_ID,
 				&parse_integer_arg,
-				&params->def_p.socket_id);
+				&params->def_p.numa_id);
 		if (ret < 0)
 			goto free_kvlist;
 

index d70651646e..d0fe21947c 100644
@@ -1691,7 +1691,7 @@ crypto_virtio_pci_probe(
 {
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = pci_dev->device.numa_node,
+		.numa_id = pci_dev->device.numa_node,
 		.private_data_size = sizeof(struct virtio_crypto_hw)
 	};
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];

index 4daa188e1d..4cddb964e2 100644
@@ -374,7 +374,7 @@ virtio_user_cryptodev_alloc(struct rte_vdev_device *vdev)
 	struct virtio_user_dev *dev;
 	struct virtio_crypto_hw *hw;
 
-	init_params.socket_id = vdev->device.numa_node;
+	init_params.numa_id = vdev->device.numa_node;
 	init_params.private_data_size = sizeof(struct virtio_user_dev);
 	cryptodev = rte_cryptodev_pmd_create(vdev->device.name, &vdev->device, &init_params);
 	if (cryptodev == NULL) {

index 181e19f9f2..d1cdfcce0b 100644
@@ -260,7 +260,7 @@ zsda_crypto_dev_create(struct zsda_pci_device *zsda_pci_dev)
 
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = (int)rte_socket_id(),
+		.numa_id = (int)rte_numa_id(),
 		.private_data_size = sizeof(struct zsda_crypto_dev_private)
 	};
 

index d79d561bf6..d82128ce26 100644
@@ -81,9 +81,9 @@ rte_cryptodev_pmd_parse_input_args(
 			goto free_kvlist;
 
 		ret = rte_kvargs_process(kvlist,
-				RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+				RTE_CRYPTODEV_PMD_NUMA_ID_ARG,
 				&rte_cryptodev_pmd_parse_uint_arg,
-				&params->socket_id);
+				&params->numa_id);
 		if (ret < 0)
 			goto free_kvlist;
 

@@ -116,11 +116,11 @@ rte_cryptodev_pmd_create(const char *name,
 	CDEV_LOG_INFO("Creating cryptodev %s", name);
 
 	CDEV_LOG_INFO("Initialisation parameters - name: %s,"
-			"socket id: %d, max queue pairs: %u",
-			name, params->socket_id, params->max_nb_queue_pairs);
+			"NUMA node id: %d, max queue pairs: %u",
+			name, params->numa_id, params->max_nb_queue_pairs);
 
 	/* allocate device structure */
-	cryptodev = rte_cryptodev_pmd_allocate(name, params->socket_id);
+	cryptodev = rte_cryptodev_pmd_allocate(name, params->numa_id);
 	if (cryptodev == NULL) {
 		CDEV_LOG_ERR("Failed to allocate crypto device for %s", name);
 		return NULL;

@@ -129,10 +129,10 @@ rte_cryptodev_pmd_create(const char *name,
 	/* allocate private device structure */
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 		cryptodev->data->dev_private =
-				rte_zmalloc_socket("cryptodev device private",
+				rte_zmalloc_numa("cryptodev device private",
 						params->private_data_size,
 						RTE_CACHE_LINE_SIZE,
-						params->socket_id);
+						params->numa_id);
 
 		if (cryptodev->data->dev_private == NULL) {
 			CDEV_LOG_ERR("Cannot allocate memory for cryptodev %s"

index 929c6defe9..1677fbf3c2 100644
@@ -33,13 +33,13 @@ extern "C" {
 
 #define RTE_CRYPTODEV_PMD_NAME_ARG			("name")
 #define RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG			("max_nb_queue_pairs")
-#define RTE_CRYPTODEV_PMD_SOCKET_ID_ARG			("socket_id")
+#define RTE_CRYPTODEV_PMD_NUMA_ID_ARG			("numa_id")
 
 
 static const char * const cryptodev_pmd_valid_params[] = {
 	RTE_CRYPTODEV_PMD_NAME_ARG,
 	RTE_CRYPTODEV_PMD_MAX_NB_QP_ARG,
-	RTE_CRYPTODEV_PMD_SOCKET_ID_ARG,
+	RTE_CRYPTODEV_PMD_NUMA_ID_ARG,
 	NULL
 };
 

@@ -50,7 +50,7 @@ static const char * const cryptodev_pmd_valid_params[] = {
 struct rte_cryptodev_pmd_init_params {
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
 	size_t private_data_size;
-	int socket_id;
+	int numa_id;
 	unsigned int max_nb_queue_pairs;
 };
 

@@ -65,7 +65,7 @@ struct __rte_cache_aligned rte_cryptodev_data {
 	/** Device ID for this instance */
 	uint8_t dev_id;
 	/** Socket ID where memory is allocated */
-	int socket_id;
+	int numa_id;
 	/** Unique identifier name */
 	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
 

@@ -269,13 +269,13 @@ typedef void (*cryptodev_info_get_t)(struct rte_cryptodev *dev,
  * @param	dev		Crypto device pointer
  * @param	qp_id		Queue Pair Index
  * @param	qp_conf		Queue configuration structure
- * @param	socket_id	Socket Index
+ * @param	numa_id	Socket Index
  *
  * @return	Returns 0 on success.
  */
 typedef int (*cryptodev_queue_pair_setup_t)(struct rte_cryptodev *dev,
 		uint16_t qp_id,	const struct rte_cryptodev_qp_conf *qp_conf,
-		int socket_id);
+		int numa_id);
 
 /**
  * Release memory resources allocated by given queue pair.

@@ -296,7 +296,7 @@ typedef int (*cryptodev_queue_pair_release_t)(struct rte_cryptodev *dev,
  * @param	dev		Crypto device pointer
  * @param	qp_id		Queue pair index
  * @param	qp_conf		Queue configuration structure
- * @param	socket_id	Socket index
+ * @param	numa_id	Socket index
  *
  * @return
  *  - 0: on success.

@@ -304,7 +304,7 @@ typedef int (*cryptodev_queue_pair_release_t)(struct rte_cryptodev *dev,
  */
 typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
 		uint16_t qp_id,	const struct rte_cryptodev_qp_conf *qp_conf,
-		int socket_id);
+		int numa_id);
 
 /**
  * Create a session mempool to allocate sessions from

@@ -312,7 +312,7 @@ typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
  * @param	dev		Crypto device pointer
  * @param	nb_objs		number of sessions objects in mempool
  * @param	obj_cache_size	l-core object cache size, see *rte_ring_create*
- * @param	socket_id	Socket Id to allocate  mempool on.
+ * @param	numa_id	Socket Id to allocate  mempool on.
  *
  * @return
  * - On success returns a pointer to a rte_mempool

@@ -320,7 +320,7 @@ typedef int (*cryptodev_queue_pair_reset_t)(struct rte_cryptodev *dev,
  */
 typedef int (*cryptodev_sym_create_session_pool_t)(
 		struct rte_cryptodev *dev, unsigned nb_objs,
-		unsigned obj_cache_size, int socket_id);
+		unsigned int obj_cache_size, int numa_id);
 
 
 /**

@@ -534,13 +534,13 @@ struct rte_cryptodev_ops {
  * to that slot for the driver to use.
  *
  * @param	name		Unique identifier name for each device
- * @param	socket_id	Socket to allocate resources on.
+ * @param	numa_id	Socket to allocate resources on.
  * @return
  *   - Slot in the rte_dev_devices array for a new device;
  */
 __rte_internal
 struct rte_cryptodev *
-rte_cryptodev_pmd_allocate(const char *name, int socket_id);
+rte_cryptodev_pmd_allocate(const char *name, int numa_id);
 
 /**
  * Function for internal use by dummy drivers primarily, e.g. ring-based

index 788790432a..0a16c5a824 100644
@@ -61,11 +61,11 @@ RTE_TRACE_POINT(
 RTE_TRACE_POINT(
 	rte_cryptodev_trace_queue_pair_reset,
 	RTE_TRACE_POINT_ARGS(uint8_t dev_id, uint16_t queue_pair_id,
-		const struct rte_cryptodev_qp_conf *conf, int socket_id),
+		const struct rte_cryptodev_qp_conf *conf, int numa_id),
 	rte_trace_point_emit_u8(dev_id);
 	rte_trace_point_emit_u16(queue_pair_id);
 	rte_trace_point_emit_u32(conf->nb_descriptors);
-	rte_trace_point_emit_int(socket_id);
+	rte_trace_point_emit_int(numa_id);
 )
 
 RTE_TRACE_POINT(

@@ -267,20 +267,20 @@ RTE_TRACE_POINT(
 RTE_TRACE_POINT(
 	rte_cryptodev_trace_queue_pair_count,
 	RTE_TRACE_POINT_ARGS(const void *dev, const char *name,
-		uint8_t socket_id, uint8_t dev_id, uint16_t nb_queue_pairs),
+		uint8_t numa_id, uint8_t dev_id, uint16_t nb_queue_pairs),
 	rte_trace_point_emit_ptr(dev);
 	rte_trace_point_emit_string(name);
-	rte_trace_point_emit_u8(socket_id);
+	rte_trace_point_emit_u8(numa_id);
 	rte_trace_point_emit_u8(dev_id);
 	rte_trace_point_emit_u16(nb_queue_pairs);
 )
 
 RTE_TRACE_POINT(
-	rte_cryptodev_trace_socket_id,
-	RTE_TRACE_POINT_ARGS(uint8_t dev_id, const char *name, int socket_id),
+	rte_cryptodev_trace_numa_id,
+	RTE_TRACE_POINT_ARGS(uint8_t dev_id, const char *name, int numa_id),
 	rte_trace_point_emit_u8(dev_id);
 	rte_trace_point_emit_string(name);
-	rte_trace_point_emit_int(socket_id);
+	rte_trace_point_emit_int(numa_id);
 )
 
 RTE_TRACE_POINT(

@@ -512,10 +512,10 @@ RTE_TRACE_POINT(
 
 RTE_TRACE_POINT(
 	rte_cryptodev_trace_op_pool_create,
-	RTE_TRACE_POINT_ARGS(const char *name, int socket_id, int type,
+	RTE_TRACE_POINT_ARGS(const char *name, int numa_id, int type,
 		uint32_t nb_elts, const void *mp),
 	rte_trace_point_emit_string(name);
-	rte_trace_point_emit_int(socket_id);
+	rte_trace_point_emit_int(numa_id);
 	rte_trace_point_emit_int(type);
 	rte_trace_point_emit_u32(nb_elts);
 	rte_trace_point_emit_ptr(mp);

index 69737adcbe..cecd203634 100644
@@ -108,8 +108,8 @@ RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_name_get,
 RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_queue_pair_count,
 	lib.cryptodev.queue.pair.count)
 
-RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_socket_id,
-	lib.cryptodev.socket.id)
+RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_numa_id,
+	lib.cryptodev.numa_id)
 
 RTE_TRACE_POINT_REGISTER(rte_cryptodev_trace_stats_get,
 	lib.cryptodev.stats.get)

index dcf4a36fb2..fced5d99cf 100644
@@ -254,7 +254,7 @@ __rte_crypto_op_get_priv_data_size(struct rte_mempool *mempool)
  *				cache size
  * @param	priv_size	Size of private data to allocate with each
  *				operation
- * @param	socket_id	Socket to allocate memory on
+ * @param	numa_id	Socket to allocate memory on
  *
  * @return
  *  - On success pointer to mempool

@@ -263,7 +263,7 @@ __rte_crypto_op_get_priv_data_size(struct rte_mempool *mempool)
 struct rte_mempool *
 rte_crypto_op_pool_create(const char *name, enum rte_crypto_op_type type,
 		unsigned nb_elts, unsigned cache_size, uint16_t priv_size,
-		int socket_id);
+		int numa_id);
 
 /**
  * Bulk allocate raw element from mempool and return as crypto operations

203 lines not on this page · raw message

117 lines not on this page · raw message

index 9b42147a0b..be32a4c998 100644
@@ -73,7 +73,7 @@ isal_comp_pmd_config(struct rte_compressdev *dev,
 				NULL, /* obj initialization constructor arg */
 				NULL, /**< obj constructor*/
 				NULL, /* obj constructor arg */
-				config->socket_id, /* socket id */
+				config->numa_id, /* socket id */
 				0); /* flags */
 	}
 

index 1361dab630..d122715672 100644
@@ -179,7 +179,7 @@ mlx5_compress_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 	}
 	dev->data->queue_pairs[qp_id] = qp;
 	if (mlx5_mr_ctrl_init(&qp->mr_ctrl, &priv->cdev->mr_scache.dev_gen,
-			      priv->dev_config.socket_id)) {
+			      priv->dev_config.numa_id)) {
 		DRV_LOG(ERR, "Cannot allocate MR Btree for qp %u.",
 			(uint32_t)qp_id);
 		rte_errno = ENOMEM;

@@ -369,7 +369,7 @@ mlx5_compress_xform_create(struct rte_compressdev *dev,
 	if (ret < 0)
 		return ret;
 	xfrm = rte_zmalloc_socket(__func__, sizeof(*xfrm), 0,
-						    priv->dev_config.socket_id);
+						    priv->dev_config.numa_id);
 	if (xfrm == NULL)
 		return -ENOMEM;
 	xfrm->opcode = MLX5_OPCODE_MMO;

index 41a3ee0de8..56a90a35c5 100644
@@ -68,7 +68,7 @@ static int nitrox_comp_dev_configure(struct rte_compressdev *dev,
 	comp_dev->xform_pool = rte_mempool_create(name,
 			xform_cnt, sizeof(struct nitrox_comp_xform),
 			0, 0, NULL, NULL, NULL, NULL,
-			config->socket_id, 0);
+			config->numa_id, 0);
 	if (comp_dev->xform_pool == NULL) {
 		NITROX_LOG_LINE(ERR, "Failed to create xform pool, err %d",
 			   rte_errno);

@@ -411,7 +411,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
 	}
 
 	nxform->history_window = rte_zmalloc_socket(NULL, nxform->window_size,
-					8, comp_dev->xform_pool->socket_id);
+					8, comp_dev->xform_pool->numa_id);
 	if (unlikely(nxform->history_window == NULL)) {
 		err = -ENOMEM;
 		goto err_exit;

@@ -422,7 +422,7 @@ static int nitrox_comp_stream_create(struct rte_compressdev *dev,
 
 	nxform->context = rte_zmalloc_socket(NULL,
 					NITROX_DECOMP_CTX_SIZE, 8,
-					comp_dev->xform_pool->socket_id);
+					comp_dev->xform_pool->numa_id);
 	if (unlikely(nxform->context == NULL)) {
 		err = -ENOMEM;
 		goto err_exit;

@@ -553,7 +553,7 @@ nitrox_comp_pmd_create(struct nitrox_device *ndev)
 	char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
 	struct rte_compressdev_pmd_init_params init_params = {
 			.name = "",
-			.socket_id = ndev->pdev->device.numa_node,
+			.numa_id = ndev->pdev->device.numa_node,
 	};
 	struct rte_compressdev *cdev;
 

index 92dac79423..5ac49318da 100644
@@ -160,13 +160,13 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 					sizeof(struct qat_sgl) +
 					sizeof(struct qat_flat_buf) *
 					QAT_PMD_COMP_SGL_DEF_SEGMENTS,
-					64, dev->data->socket_id);
+					64, dev->data->numa_id);
 
 		cookie->qat_sgl_dst_d = rte_zmalloc_socket(NULL,
 					sizeof(struct qat_sgl) +
 					sizeof(struct qat_flat_buf) *
 					QAT_PMD_COMP_SGL_DEF_SEGMENTS,
-					64, dev->data->socket_id);
+					64, dev->data->numa_id);
 
 		if (cookie->qat_sgl_src_d == NULL ||
 				cookie->qat_sgl_dst_d == NULL) {

@@ -185,7 +185,7 @@ qat_comp_qp_setup(struct rte_compressdev *dev, uint16_t qp_id,
 		cookie->dst_nb_elems = cookie->src_nb_elems =
 				QAT_PMD_COMP_SGL_DEF_SEGMENTS;
 
-		cookie->socket_id = dev->data->socket_id;
+		cookie->socket_id = dev->data->numa_id;
 
 		cookie->error = 0;
 	}

@@ -240,7 +240,7 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
 
 	memzone = rte_memzone_reserve_aligned(inter_buff_mz_name,
 			size_of_ptr_array,
-			comp_dev->compressdev->data->socket_id,
+			comp_dev->compressdev->data->numa_id,
 			RTE_MEMZONE_IOVA_CONTIG, QAT_64_BYTE_ALIGN);
 	if (memzone == NULL) {
 		QAT_LOG(ERR,

@@ -268,7 +268,7 @@ qat_comp_setup_inter_buffers(struct qat_comp_dev_private *comp_dev,
 		if (mz == NULL) {
 			mz = rte_memzone_reserve_aligned(inter_buff_mz_name,
 					full_size,
-					comp_dev->compressdev->data->socket_id,
+					comp_dev->compressdev->data->numa_id,
 					RTE_MEMZONE_IOVA_CONTIG,
 					QAT_64_BYTE_ALIGN);
 			if (mz == NULL) {

@@ -355,7 +355,7 @@ qat_comp_create_xform_pool(struct qat_comp_dev_private *comp_dev,
 		mp = rte_mempool_create(xform_pool_name,
 				num_elements,
 				qat_comp_xform_size(), 0, 0,
-				NULL, NULL, NULL, NULL, config->socket_id,
+				NULL, NULL, NULL, NULL, config->numa_id,
 				0);
 	if (mp == NULL) {
 		QAT_LOG(ERR, "Err creating mempool %s w %d elements of size %d",

@@ -534,7 +534,7 @@ qat_comp_dev_config(struct rte_compressdev *dev,
 
 	if (config->max_nb_streams) {
 		comp_dev->streampool = qat_comp_create_stream_pool(comp_dev,
-				     config->socket_id, config->max_nb_streams);
+				     config->numa_id, config->max_nb_streams);
 		if (comp_dev->streampool == NULL) {
 			ret = -ENOMEM;
 			goto error_out;

@@ -678,7 +678,7 @@ qat_comp_dev_create(struct qat_pci_device *qat_pci_dev)
 			&qat_pci_devs[qat_pci_dev->qat_dev_id];
 	struct rte_compressdev_pmd_init_params init_params = {
 		.name = "",
-		.socket_id = qat_dev_instance->pci_dev->device.numa_node,
+		.numa_id = qat_dev_instance->pci_dev->device.numa_node,
 	};
 	char name[RTE_COMPRESSDEV_NAME_MAX_LEN];
 	char capa_memz_name[RTE_COMPRESSDEV_NAME_MAX_LEN];