[PATCH 022/227] node: use NUMA node terminology
Chengwen Feng
chengwen.feng at linux.dev
Tue Nov 3 15:49:40 CET 2026
From: Chengwen Feng <fengchengwen at huawei.com>
Rename socket_id parameters, internal variables and comments to
the NUMA node terminology, and switch internal calls to
rte_zmalloc_numa(), rte_numa_id() and RTE_NUMA_ID_ANY.
Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
---
lib/node/ip4_lookup.c | 4 ++--
lib/node/ip4_lookup_fib.c | 10 +++++-----
lib/node/ip6_lookup.c | 4 ++--
lib/node/ip6_lookup_fib.c | 10 +++++-----
lib/node/kernel_rx.c | 4 ++--
lib/node/node_mbuf_dynfield.c | 2 +-
lib/node/udp4_input.c | 4 ++--
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index 42db993142..d3a1a59f7b 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -194,7 +194,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_lpm(&ip4_lookup_nm, socket);
if (rc) {
node_err("ip4_lookup",
@@ -207,7 +207,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
}
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
- IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->socket];
+ IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->numa_id];
IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
#if defined(__ARM_NEON) || defined(RTE_ARCH_X86) || \
diff --git a/lib/node/ip4_lookup_fib.c b/lib/node/ip4_lookup_fib.c
index 0857d889fc..7ff190abb7 100644
--- a/lib/node/ip4_lookup_fib.c
+++ b/lib/node/ip4_lookup_fib.c
@@ -225,7 +225,7 @@ rte_node_ip4_fib_route_add(uint32_t ip, uint8_t depth, uint16_t next_hop,
uint32_t val;
int ret;
- nb_sockets = rte_socket_count();
+ nb_sockets = rte_numa_count();
in.s_addr = htonl(ip);
inet_ntop(AF_INET, &in, abuf, sizeof(abuf));
/* Embedded next node id into 24 bit next hop */
@@ -288,15 +288,15 @@ ip4_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
return -rte_errno;
}
- rc = setup_fib(graph->socket);
+ rc = setup_fib(graph->numa_id);
if (rc) {
- node_err("ip4_lookup_fib", "Failed to setup fib for sock %u, rc=%d",
- graph->socket, rc);
+ node_err("ip4_lookup_fib", "Failed to setup fib for numa %u, rc=%d",
+ graph->numa_id, rc);
return rc;
}
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
- IP4_LOOKUP_NODE_FIB(node->ctx) = ip4_lookup_fib_nm.fib[graph->socket];
+ IP4_LOOKUP_NODE_FIB(node->ctx) = ip4_lookup_fib_nm.fib[graph->numa_id];
IP4_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_lookup_fib", "Initialized ip4_lookup_fib node");
diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c
index 83c0500c76..934488c5e7 100644
--- a/lib/node/ip6_lookup.c
+++ b/lib/node/ip6_lookup.c
@@ -331,7 +331,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_lpm6(&ip6_lookup_nm, socket);
if (rc) {
node_err("ip6_lookup",
@@ -344,7 +344,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct rte_node *node)
}
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
- IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->socket];
+ IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->numa_id];
IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup", "Initialized ip6_lookup node");
diff --git a/lib/node/ip6_lookup_fib.c b/lib/node/ip6_lookup_fib.c
index 40c5c753df..a471081d29 100644
--- a/lib/node/ip6_lookup_fib.c
+++ b/lib/node/ip6_lookup_fib.c
@@ -218,7 +218,7 @@ rte_node_ip6_fib_route_add(const struct rte_ipv6_addr *ip, uint8_t depth, uint16
uint32_t val;
int ret;
- nb_sockets = rte_socket_count();
+ nb_sockets = rte_numa_count();
inet_ntop(AF_INET6, ip, abuf, sizeof(abuf));
/* Embedded next node id into 24 bit next hop */
val = ((next_node << 16) | next_hop) & ((1ull << 24) - 1);
@@ -279,15 +279,15 @@ ip6_lookup_fib_node_init(const struct rte_graph *graph, struct rte_node *node)
return -rte_errno;
}
- rc = setup_fib6(graph->socket);
+ rc = setup_fib6(graph->numa_id);
if (rc) {
- node_err("ip6_lookup_fib", "Failed to setup fib6 for sock %u, rc=%d",
- graph->socket, rc);
+ node_err("ip6_lookup_fib", "Failed to setup fib6 for numa %u, rc=%d",
+ graph->numa_id, rc);
return rc;
}
/* Update socket's FIB and mbuf dyn priv1 offset in node ctx */
- IP6_LOOKUP_FIB_NODE(node->ctx) = ip6_lookup_fib_nm.fib6[graph->socket];
+ IP6_LOOKUP_FIB_NODE(node->ctx) = ip6_lookup_fib_nm.fib6[graph->numa_id];
IP6_LOOKUP_FIB_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup_fib", "Initialized ip6_lookup_fib node");
diff --git a/lib/node/kernel_rx.c b/lib/node/kernel_rx.c
index 461330414f..5dff10139c 100644
--- a/lib/node/kernel_rx.c
+++ b/lib/node/kernel_rx.c
@@ -211,8 +211,8 @@ kernel_rx_node_init(const struct rte_graph *graph, struct rte_node *node)
return -EINVAL;
}
- recv_info = rte_zmalloc_socket("kernel_rx_info", sizeof(kernel_rx_info_t),
- RTE_CACHE_LINE_SIZE, graph->socket);
+ recv_info = rte_zmalloc_numa("kernel_rx_info", sizeof(kernel_rx_info_t),
+ RTE_CACHE_LINE_SIZE, graph->numa_id);
if (!recv_info) {
node_err("kernel_rx", "Kernel recv_info is NULL");
return -ENOMEM;
diff --git a/lib/node/node_mbuf_dynfield.c b/lib/node/node_mbuf_dynfield.c
index 9dbc80f7e5..74229c9b9c 100644
--- a/lib/node/node_mbuf_dynfield.c
+++ b/lib/node/node_mbuf_dynfield.c
@@ -36,7 +36,7 @@ int rte_node_mbuf_dynfield_register(void)
if (!mz) {
mz = rte_memzone_reserve_aligned(NODE_MBUF_DYNFIELD_MEMZONE_NAME,
sizeof(struct node_mbuf_dynfield_mz),
- SOCKET_ID_ANY, 0,
+ RTE_NUMA_ID_ANY, 0,
RTE_CACHE_LINE_SIZE);
if (!mz) {
node_err("node_mbuf_dyn", "rte_memzone_reserve_aligned failed");
diff --git a/lib/node/udp4_input.c b/lib/node/udp4_input.c
index 47aad42022..175bfa290d 100644
--- a/lib/node/udp4_input.c
+++ b/lib/node/udp4_input.c
@@ -132,7 +132,7 @@ udp4_input_node_init(const struct rte_graph *graph, struct rte_node *node)
/* Setup HASH tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
- socket = rte_lcore_to_socket_id(lcore_id);
+ socket = rte_lcore_to_numa_id(lcore_id);
rc = setup_udp4_dstprt_hash(&udp4_input_nm, socket);
if (rc) {
node_err("udp4_lookup",
@@ -144,7 +144,7 @@ udp4_input_node_init(const struct rte_graph *graph, struct rte_node *node)
init_once = 1;
}
- UDP4_INPUT_NODE_HASH(node->ctx) = udp4_input_nm.hash_tbl[graph->socket];
+ UDP4_INPUT_NODE_HASH(node->ctx) = udp4_input_nm.hash_tbl[graph->numa_id];
node_dbg("udp4_input", "Initialized udp4_input node");
return 0;
--
2.55.0
More information about the dev
mailing list