Move the pagesz-mem fields to the user config structure as these are specified via commandline input. The derived memory limit for hugepages is moved to the runtime configuration, since it's not a direct user input parameter.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_dynmem.c | 3 ++- lib/eal/common/eal_common_options.c | 35 ++++++++++++++++------------- lib/eal/common/eal_internal_cfg.h | 16 ++++++------- lib/eal/linux/eal_memory.c | 3 ++- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/lib/eal/common/eal_common_dynmem.c b/lib/eal/common/eal_common_dynmem.c index 752cd539a1..e48466c272 100644 --- a/lib/eal/common/eal_common_dynmem.c +++ b/lib/eal/common/eal_common_dynmem.c @@ -37,6 +37,7 @@ eal_dynmem_memseg_lists_init(void) struct internal_config *internal_conf = eal_get_internal_configuration(); const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); /* no-huge does not need this at all */ if (user_cfg->no_hugetlbfs) @@ -109,7 +110,7 @@ eal_dynmem_memseg_lists_init(void) pagesz = type->page_sz; max_mem_per_type = - internal_conf->hugepage_mem_sz_limits[type->hpi_idx]; + runtime_state->hugepage_mem_sz_limits[type->hpi_idx]; /* * we need to create a segment list for this type. we must take diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 3d1842688c..b6a5b3ea8b 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -510,6 +510,7 @@ void eal_reset_internal_config(struct internal_config *internal_cfg) { struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int i; user_cfg->memory = 0; @@ -521,6 +522,12 @@ eal_reset_internal_config(struct internal_config *internal_cfg) user_cfg->force_numa_limits = false; for (i = 0; i < RTE_MAX_NUMA_NODES; i++) user_cfg->numa_limit[i] = 0; + for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) { + runtime_state->hugepage_mem_sz_limits[i] = 0; + user_cfg->pagesz_mem_overrides[i].pagesz = 0; + user_cfg->pagesz_mem_overrides[i].limit = 0; + } + user_cfg->num_pagesz_mem_overrides = 0; user_cfg->process_type = RTE_PROC_PRIMARY; user_cfg->no_hugetlbfs = false; user_cfg->no_pci = false; @@ -533,11 +540,7 @@ eal_reset_internal_config(struct internal_config *internal_cfg) memset(&internal_cfg->hugepage_info[i], 0, sizeof(internal_cfg->hugepage_info[0])); internal_cfg->hugepage_info[i].lock_descriptor = -1; - internal_cfg->hugepage_mem_sz_limits[i] = 0; - internal_cfg->pagesz_mem_overrides[i].pagesz = 0; - internal_cfg->pagesz_mem_overrides[i].limit = 0; } - internal_cfg->num_pagesz_mem_overrides = 0; internal_cfg->base_virtaddr = 0; /* if set to NONE, interrupt mode is determined automatically */ @@ -1904,7 +1907,7 @@ eal_parse_socket_arg(char *strval, volatile uint64_t *socket_arg) } static int -eal_parse_pagesz_mem(char *strval, struct internal_config *internal_cfg) +eal_parse_pagesz_mem(char *strval, struct eal_user_cfg *user_cfg) { char strval_cpy[1024]; char *fields[3]; @@ -1965,8 +1968,8 @@ eal_parse_pagesz_mem(char *strval, struct internal_config *internal_cfg) return -1; } - for (i = 0; i < internal_cfg->num_pagesz_mem_overrides; i++) { - pmo = &internal_cfg->pagesz_mem_overrides[i]; + for (i = 0; i < user_cfg->num_pagesz_mem_overrides; i++) { + pmo = &user_cfg->pagesz_mem_overrides[i]; if (pmo->pagesz != pagesz) continue; @@ -1978,17 +1981,17 @@ eal_parse_pagesz_mem(char *strval, struct internal_config *internal_cfg) } /* do we have space? */ - if (internal_cfg->num_pagesz_mem_overrides >= MAX_HUGEPAGE_SIZES) { + if (user_cfg->num_pagesz_mem_overrides >= MAX_HUGEPAGE_SIZES) { EAL_LOG(ERR, "--pagesz-mem: too many page size entries (max %d)", MAX_HUGEPAGE_SIZES); return -1; } - pmo = &internal_cfg->pagesz_mem_overrides[internal_cfg->num_pagesz_mem_overrides]; + pmo = &user_cfg->pagesz_mem_overrides[user_cfg->num_pagesz_mem_overrides]; pmo->pagesz = pagesz; pmo->limit = mem_limit; - internal_cfg->num_pagesz_mem_overrides++; + user_cfg->num_pagesz_mem_overrides++; return 0; } @@ -2325,7 +2328,7 @@ eal_parse_args(void) user_cfg->force_numa_limits = true; } TAILQ_FOREACH(arg, &args.pagesz_mem, next) { - if (eal_parse_pagesz_mem(arg->arg, int_cfg) < 0) { + if (eal_parse_pagesz_mem(arg->arg, user_cfg) < 0) { EAL_LOG(ERR, "invalid pagesz-mem parameter: '%s'", arg->arg); return -1; } @@ -2522,6 +2525,8 @@ eal_adjust_config(struct internal_config *internal_cfg) int eal_apply_hugepage_mem_sz_limits(struct internal_config *internal_cfg) { + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); unsigned int i; for (i = 0; i < internal_cfg->num_hugepage_sizes; i++) { @@ -2534,12 +2539,12 @@ eal_apply_hugepage_mem_sz_limits(struct internal_config *internal_cfg) (uint64_t)RTE_MAX_MEMSEG_PER_TYPE * pagesz); /* override with user value for matching page size */ - for (j = 0; j < (unsigned int)internal_cfg->num_pagesz_mem_overrides; j++) { - if (internal_cfg->pagesz_mem_overrides[j].pagesz == pagesz) - limit = internal_cfg->pagesz_mem_overrides[j].limit; + for (j = 0; j < user_cfg->num_pagesz_mem_overrides; j++) { + if (user_cfg->pagesz_mem_overrides[j].pagesz == pagesz) + limit = user_cfg->pagesz_mem_overrides[j].limit; } - internal_cfg->hugepage_mem_sz_limits[i] = limit; + runtime_state->hugepage_mem_sz_limits[i] = limit; } return 0; diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index 4e81a84085..9e23f7f3be 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -74,6 +74,12 @@ struct eal_user_cfg { char *hugepage_dir; /**< specific hugetlbfs directory to use */ 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 */ + /** storage for user-specified pagesz-mem overrides */ + struct pagesz_mem_override { + uint64_t pagesz; /**< page size in bytes */ + uint64_t limit; /**< memory limit in bytes */ + } pagesz_mem_overrides[MAX_HUGEPAGE_SIZES]; + unsigned int num_pagesz_mem_overrides; /**< number of stored overrides */ }; /** @@ -91,6 +97,8 @@ struct eal_platform_info { */ struct eal_runtime_state { uint8_t reserved; + uint64_t hugepage_mem_sz_limits[MAX_HUGEPAGE_SIZES]; + /**< default max memory per hugepage size */ }; /** @@ -116,14 +124,6 @@ struct internal_config { /**< user defined mbuf pool ops name */ unsigned num_hugepage_sizes; /**< how many sizes on this system */ struct hugepage_info hugepage_info[MAX_HUGEPAGE_SIZES]; - uint64_t hugepage_mem_sz_limits[MAX_HUGEPAGE_SIZES]; - /**< default max memory per hugepage size */ - /** storage for user-specified pagesz-mem overrides */ - struct pagesz_mem_override { - uint64_t pagesz; /**< page size in bytes */ - uint64_t limit; /**< memory limit in bytes */ - } pagesz_mem_overrides[MAX_HUGEPAGE_SIZES]; - unsigned int num_pagesz_mem_overrides; /**< number of stored overrides */ enum rte_iova_mode iova_mode ; /**< Set IOVA mode on this system */ rte_cpuset_t ctrl_cpuset; /**< cpuset for ctrl threads */ volatile unsigned int init_complete; diff --git a/lib/eal/linux/eal_memory.c b/lib/eal/linux/eal_memory.c index 2184b022fc..a45be4a56a 100644 --- a/lib/eal/linux/eal_memory.c +++ b/lib/eal/linux/eal_memory.c @@ -1704,6 +1704,7 @@ memseg_primary_init_32(void) struct internal_config *internal_conf = eal_get_internal_configuration(); const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); /* no-huge does not need this at all */ if (user_cfg->no_hugetlbfs) @@ -1824,7 +1825,7 @@ memseg_primary_init_32(void) continue; max_pagesz_mem = max_socket_mem - cur_socket_mem; - pagesz_mem_limit = internal_conf->hugepage_mem_sz_limits[hpi_idx]; + pagesz_mem_limit = runtime_state->hugepage_mem_sz_limits[hpi_idx]; max_pagesz_mem = RTE_MIN(max_pagesz_mem, pagesz_mem_limit); /* make it multiple of page size */ -- 2.53.0
