Use RTE_MAX_NUMA_NODES instead of hardcoded values to extend NUMA nodes limit for l3fwd, ipsec-secgw, and vhost_crypto examples.
Remove unused NB_SOCKETS macro in ip_reassembly. Cc: [email protected] Signed-off-by: Liangxing Wang <[email protected]> --- examples/ip_reassembly/main.c | 2 -- examples/ipsec-secgw/ipsec-secgw.h | 2 +- examples/l3fwd-graph/main.c | 2 +- examples/l3fwd-power/main.c | 2 +- examples/l3fwd/l3fwd.h | 2 +- examples/vhost_crypto/main.c | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c index 520fbea1c2..d26a0fb468 100644 --- a/examples/ip_reassembly/main.c +++ b/examples/ip_reassembly/main.c @@ -78,8 +78,6 @@ static uint32_t max_flow_ttl = DEF_FLOW_TTL; #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */ -#define NB_SOCKETS 8 - /* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3 diff --git a/examples/ipsec-secgw/ipsec-secgw.h b/examples/ipsec-secgw/ipsec-secgw.h index b4ef4b6d04..88d74654b2 100644 --- a/examples/ipsec-secgw/ipsec-secgw.h +++ b/examples/ipsec-secgw/ipsec-secgw.h @@ -9,7 +9,7 @@ #define MAX_RX_QUEUE_PER_LCORE 16 -#define NB_SOCKETS 4 +#define NB_SOCKETS RTE_MAX_NUMA_NODES #define MAX_PKT_BURST 32 #define MAX_PKT_BURST_VEC 256 diff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c index 92cdaa1ebe..d77b5f4ef6 100644 --- a/examples/l3fwd-graph/main.c +++ b/examples/l3fwd-graph/main.c @@ -56,7 +56,7 @@ #define MAX_LCORE_PARAMS 1024 -#define NB_SOCKETS 8 +#define NB_SOCKETS RTE_MAX_NUMA_NODES /* Graph module */ #define WORKER_MODEL_RTC "rtc" diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 02ec17d799..ed98a60365 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -114,7 +114,7 @@ RTE_LOG_REGISTER(l3fwd_power_logtype, l3fwd.power, INFO); #define BURST_TX_DRAIN_US 100 /* TX drain every ~100us */ -#define NB_SOCKETS 8 +#define NB_SOCKETS RTE_MAX_NUMA_NODES /* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3 diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h index 471e3b488f..ca9d0d2dd0 100644 --- a/examples/l3fwd/l3fwd.h +++ b/examples/l3fwd/l3fwd.h @@ -33,7 +33,7 @@ #define VECTOR_SIZE_DEFAULT MAX_PKT_BURST #define VECTOR_TMO_NS_DEFAULT 1E6 /* 1ms */ -#define NB_SOCKETS 8 +#define NB_SOCKETS RTE_MAX_NUMA_NODES /* Configure how many packets ahead to prefetch, when reading packets */ #define PREFETCH_OFFSET 3 diff --git a/examples/vhost_crypto/main.c b/examples/vhost_crypto/main.c index 8bdfc40c4b..ab39baaf47 100644 --- a/examples/vhost_crypto/main.c +++ b/examples/vhost_crypto/main.c @@ -31,7 +31,7 @@ #define SESSION_MAP_ENTRIES (1024) #define REFRESH_TIME_SEC (3) -#define MAX_NB_SOCKETS (4) +#define MAX_NB_SOCKETS RTE_MAX_NUMA_NODES #define MAX_NB_WORKER_CORES (16) struct lcore_option { -- 2.43.0
