As with basic memory user parameters, move the NUMA-specific parameters to the user config struct. Update flag types to bool in the process.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_dynmem.c | 15 +++++++-------- lib/eal/common/eal_common_options.c | 24 +++++++++++------------- lib/eal/common/eal_internal_cfg.h | 11 ++++------- lib/eal/common/malloc_heap.c | 2 +- lib/eal/freebsd/eal.c | 2 +- lib/eal/linux/eal.c | 2 +- lib/eal/linux/eal_memory.c | 23 ++++++++++++----------- lib/eal/windows/eal.c | 2 +- 8 files changed, 38 insertions(+), 43 deletions(-) diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c index 5bd22f6ef0..38e3ff7bcb 100644 --- a/lib/eal/common/eal_common_dynmem.c +++ b/lib/eal/common/eal_common_dynmem.c @@ -230,6 +230,7 @@ eal_dynmem_hugepage_init(void) int hp_sz_idx, socket_id; struct internal_config *internal_conf = eal_get_internal_configuration(); + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); memset(used_hp, 0, sizeof(used_hp)); @@ -266,7 +267,7 @@ eal_dynmem_hugepage_init(void) /* make a copy of numa_mem, needed for balanced allocation. */ for (hp_sz_idx = 0; hp_sz_idx < RTE_MAX_NUMA_NODES; hp_sz_idx++) - memory[hp_sz_idx] = internal_conf->numa_mem[hp_sz_idx]; + memory[hp_sz_idx] = user_cfg->numa_mem[hp_sz_idx]; /* calculate final number of pages */ if (eal_dynmem_calc_num_pages_per_socket(memory, @@ -334,10 +335,10 @@ eal_dynmem_hugepage_init(void) } /* if socket limits were specified, set them */ - if (internal_conf->force_numa_limits) { + if (user_cfg->force_numa_limits) { unsigned int i; for (i = 0; i < RTE_MAX_NUMA_NODES; i++) { - uint64_t limit = internal_conf->numa_limit[i]; + uint64_t limit = user_cfg->numa_limit[i]; if (limit == 0) continue; if (rte_mem_alloc_validator_register("socket-limit", @@ -374,8 +375,6 @@ eal_dynmem_calc_num_pages_per_socket( unsigned int requested, available; int total_num_pages = 0; uint64_t remaining_mem, cur_mem; - const struct internal_config *internal_conf = - eal_get_internal_configuration(); const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); uint64_t total_mem = user_cfg->memory; @@ -383,7 +382,7 @@ eal_dynmem_calc_num_pages_per_socket( return -1; /* if specific memory amounts per socket weren't requested */ - if (internal_conf->force_numa == 0) { + if (!user_cfg->force_numa) { size_t total_size; #ifdef RTE_ARCH_64 int cpu_per_socket[RTE_MAX_NUMA_NODES]; @@ -510,8 +509,8 @@ eal_dynmem_calc_num_pages_per_socket( /* if we didn't satisfy all memory requirements per socket */ if (memory[socket] > 0 && - internal_conf->numa_mem[socket] != 0) { - requested = internal_conf->numa_mem[socket] / 0x100000; + user_cfg->numa_mem[socket] != 0) { + requested = user_cfg->numa_mem[socket] / 0x100000; available = requested - (memory[socket] / 0x100000); EAL_LOG(ERR, "Not enough memory available on socket %u! Requested: %uMB, available: %uMB", socket, requested, available); diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 11b77bc9dd..03c0aed4e2 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -499,18 +499,16 @@ eal_reset_internal_config(struct internal_config *internal_cfg) user_cfg->memory = 0; user_cfg->force_nrank = 0; user_cfg->force_nchannel = 0; + user_cfg->force_numa = false; + for (i = 0; i < RTE_MAX_NUMA_NODES; i++) + user_cfg->numa_mem[i] = 0; + user_cfg->force_numa_limits = false; + for (i = 0; i < RTE_MAX_NUMA_NODES; i++) + user_cfg->numa_limit[i] = 0; internal_cfg->hugefile_prefix = NULL; internal_cfg->hugepage_dir = NULL; internal_cfg->hugepage_file.unlink_before_mapping = false; internal_cfg->hugepage_file.unlink_existing = true; - internal_cfg->force_numa = 0; - /* zero out the NUMA config */ - for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - internal_cfg->numa_mem[i] = 0; - internal_cfg->force_numa_limits = 0; - /* zero out the NUMA limits config */ - for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - internal_cfg->numa_limit[i] = 0; /* zero out hugedir descriptors */ for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) { memset(&internal_cfg->hugepage_info[i], 0, @@ -2174,18 +2172,18 @@ 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_socket_arg(args.numa_mem, user_cfg->numa_mem) < 0) { EAL_LOG(ERR, "invalid numa-mem parameter: '%s'", args.numa_mem); return -1; } - int_cfg->force_numa = 1; + user_cfg->force_numa = true; } if (args.numa_limit != NULL) { - if (eal_parse_socket_arg(args.numa_limit, int_cfg->numa_limit) < 0) { + if (eal_parse_socket_arg(args.numa_limit, user_cfg->numa_limit) < 0) { EAL_LOG(ERR, "invalid numa-limit parameter: '%s'", args.numa_limit); return -1; } - int_cfg->force_numa_limits = 1; + user_cfg->force_numa_limits = true; } /* tracing settings, not supported on windows */ @@ -2371,7 +2369,7 @@ eal_adjust_config(struct internal_config *internal_cfg) /* if no memory amounts were requested, this will result in 0 and * will be overridden later, right after eal_hugepage_info_init() */ for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - user_cfg->memory += internal_cfg->numa_mem[i]; + user_cfg->memory += user_cfg->numa_mem[i]; return 0; } diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index 1625c697b2..e99e74cecd 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -57,6 +57,10 @@ struct eal_user_cfg { size_t memory; /**< amount of asked memory */ uint8_t force_nchannel; /**< force number of channels */ uint8_t force_nrank; /**< force number of ranks */ + bool force_numa; /**< true to request memory on specific NUMA nodes */ + bool force_numa_limits; /**< true to apply per-NUMA memory limits */ + uint64_t numa_mem[RTE_MAX_NUMA_NODES]; /**< amount of memory per NUMA node */ + uint64_t numa_limit[RTE_MAX_NUMA_NODES]; /**< limit amount of memory per NUMA node */ }; /** @@ -93,13 +97,6 @@ struct internal_config { */ volatile unsigned create_uio_dev; /**< true to create /dev/uioX devices */ volatile enum rte_proc_type_t process_type; /**< multi-process proc type */ - /** true to try allocating memory on specific NUMA nodes */ - volatile unsigned force_numa; - /** amount of memory per NUMA node */ - volatile uint64_t numa_mem[RTE_MAX_NUMA_NODES]; - volatile unsigned force_numa_limits; - /** limit amount of memory per NUMA node */ - volatile uint64_t numa_limit[RTE_MAX_NUMA_NODES]; uintptr_t base_virtaddr; /**< base address to try and reserve memory from */ volatile unsigned legacy_mem; /**< true to enable legacy memory behavior (no dynamic allocation, diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index 39240c261c..77f364158a 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -701,7 +701,7 @@ malloc_heap_alloc_on_heap_id(size_t size, unsigned int heap_id, unsigned int fla static unsigned int malloc_get_numa_socket(void) { - const struct internal_config *conf = eal_get_internal_configuration(); + const struct eal_user_cfg *conf = eal_get_user_configuration(); unsigned int socket_id = rte_socket_id(); unsigned int idx; diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 1779362686..d890b899e1 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -588,7 +588,7 @@ rte_eal_init(int argc, char **argv) } } - if (user_cfg->memory == 0 && internal_conf->force_numa == 0) { + if (user_cfg->memory == 0 && !user_cfg->force_numa) { if (internal_conf->no_hugetlbfs) user_cfg->memory = MEMSIZE_IF_NO_HUGE_PAGE; else diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index a15e4dd598..ae0f42b15e 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -751,7 +751,7 @@ rte_eal_init(int argc, char **argv) } } - if (user_cfg->memory == 0 && internal_conf->force_numa == 0) { + if (user_cfg->memory == 0 && !user_cfg->force_numa) { if (internal_conf->no_hugetlbfs) user_cfg->memory = MEMSIZE_IF_NO_HUGE_PAGE; } diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index 695596668f..9532dfc5cb 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -274,8 +274,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi, struct bitmask *oldmask = NULL; bool have_numa = true; unsigned long maxnode = 0; - const struct internal_config *internal_conf = - eal_get_internal_configuration(); + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); /* Check if kernel supports NUMA. */ if (numa_available() != 0) { @@ -294,7 +293,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi, oldpolicy = MPOL_DEFAULT; } for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - if (internal_conf->numa_mem[i]) + if (user_cfg->numa_mem[i]) maxnode = i + 1; } #endif @@ -313,7 +312,7 @@ map_all_hugepages(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi, if (j == maxnode) { node_id = (node_id + 1) % maxnode; - while (!internal_conf->numa_mem[node_id]) { + while (!user_cfg->numa_mem[node_id]) { node_id++; node_id %= maxnode; } @@ -1151,6 +1150,7 @@ eal_legacy_hugepage_init(void) struct hugepage_info used_hp[MAX_HUGEPAGE_SIZES]; struct internal_config *internal_conf = eal_get_internal_configuration(); + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); uint64_t memory[RTE_MAX_NUMA_NODES]; @@ -1291,7 +1291,7 @@ eal_legacy_hugepage_init(void) /* make a copy of numa_mem, needed for balanced allocation. */ for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - memory[i] = internal_conf->numa_mem[i]; + memory[i] = user_cfg->numa_mem[i]; /* map all hugepages and sort them */ for (i = 0; i < (int)internal_conf->num_hugepage_sizes; i++) { @@ -1359,7 +1359,7 @@ eal_legacy_hugepage_init(void) huge_recover_sigbus(); - if (eal_get_user_configuration()->memory == 0 && internal_conf->force_numa == 0) + if (eal_get_user_configuration()->memory == 0 && !user_cfg->force_numa) eal_get_user_configuration()->memory = eal_get_hugepage_mem_size(); nr_hugefiles = nr_hugepages; @@ -1387,7 +1387,7 @@ eal_legacy_hugepage_init(void) /* make a copy of numa_mem, needed for number of pages calculation */ for (i = 0; i < RTE_MAX_NUMA_NODES; i++) - memory[i] = internal_conf->numa_mem[i]; + memory[i] = user_cfg->numa_mem[i]; /* calculate final number of pages */ nr_hugepages = eal_dynmem_calc_num_pages_per_socket(memory, @@ -1720,6 +1720,7 @@ memseg_primary_init_32(void) uint64_t max_mem; struct internal_config *internal_conf = eal_get_internal_configuration(); + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); /* no-huge does not need this at all */ if (internal_conf->no_hugetlbfs) @@ -1744,12 +1745,12 @@ memseg_primary_init_32(void) */ active_sockets = 0; total_requested_mem = 0; - if (internal_conf->force_numa) + if (user_cfg->force_numa) for (i = 0; i < rte_socket_count(); i++) { uint64_t mem; socket_id = rte_socket_id_by_idx(i); - mem = internal_conf->numa_mem[socket_id]; + mem = user_cfg->numa_mem[socket_id]; if (mem == 0) continue; @@ -1807,7 +1808,7 @@ memseg_primary_init_32(void) /* if we didn't specifically request memory on this socket */ skip = active_sockets != 0 && - internal_conf->numa_mem[socket_id] == 0; + user_cfg->numa_mem[socket_id] == 0; /* ...or if we didn't specifically request memory on *any* * socket, and this is not main lcore */ @@ -1822,7 +1823,7 @@ memseg_primary_init_32(void) /* max amount of memory on this socket */ max_socket_mem = (active_sockets != 0 ? - internal_conf->numa_mem[socket_id] : + user_cfg->numa_mem[socket_id] : eal_get_user_configuration()->memory) + extra_mem_per_socket; cur_socket_mem = 0; diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index 2e1cd88189..f8a536bb97 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -231,7 +231,7 @@ rte_eal_init(int argc, char **argv) goto err_out; } - if (user_cfg->memory == 0 && !internal_conf->force_numa) { + if (user_cfg->memory == 0 && !user_cfg->force_numa) { if (internal_conf->no_hugetlbfs) user_cfg->memory = MEMSIZE_IF_NO_HUGE_PAGE; } -- 2.51.0
