The functions to configure some of the runtime state based on the user-provided options no longer belong in eal_common_options.c, which should instead be more focused on processing the user-provided options. Move the functions to eal_common_config instead, and explicitly have the runtime state setup function called from eal_init directly, rather than hidden as a last step in arg parsing.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_config.c | 135 +++++++++++++++++++++++++++- lib/eal/common/eal_common_options.c | 132 +-------------------------- lib/eal/common/eal_options.h | 2 - lib/eal/common/eal_private.h | 22 +++++ lib/eal/freebsd/eal.c | 6 ++ lib/eal/linux/eal.c | 6 ++ lib/eal/windows/eal.c | 6 ++ 7 files changed, 175 insertions(+), 134 deletions(-) diff --git a/lib/eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c index 35654cc71f..60eeea6439 100644 --- a/lib/eal/common/eal_common_config.c +++ b/lib/eal/common/eal_common_config.c @@ -2,8 +2,10 @@ * Copyright(c) 2020 Mellanox Technologies, Ltd */ -#include <rte_string_fns.h> +#include <pthread.h> +#include <rte_string_fns.h> +#include <rte_thread.h> #include <eal_export.h> #include "eal_internal_cfg.h" #include "eal_private.h" @@ -127,3 +129,134 @@ rte_eal_has_pci(void) { return !eal_user_cfg.no_pci; } + +static void +compute_ctrl_threads_cpuset(void) +{ + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + rte_cpuset_t *cpuset = &runtime_state->ctrl_cpuset; + rte_cpuset_t default_set; + unsigned int lcore_id; + + for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { + if (rte_lcore_has_role(lcore_id, ROLE_OFF)) + continue; + RTE_CPU_OR(cpuset, cpuset, &runtime_state->lcore_cfg[lcore_id].cpuset); + } + RTE_CPU_NOT(cpuset, cpuset); + + if (rte_thread_get_affinity_by_id(rte_thread_self(), &default_set) != 0) + CPU_ZERO(&default_set); + + RTE_CPU_AND(cpuset, cpuset, &default_set); + + /* if no remaining cpu, use main lcore cpu affinity */ + if (!CPU_COUNT(cpuset)) { + memcpy(cpuset, &runtime_state->lcore_cfg[rte_get_main_lcore()].cpuset, + sizeof(*cpuset)); + } + + /* log the computed control thread cpuset for debugging */ + char *cpuset_str = eal_cpuset_to_str(cpuset); + if (cpuset_str != NULL) { + EAL_LOG(DEBUG, "Control threads will use cores: %s", cpuset_str); + free(cpuset_str); + } +} + +static int +eal_apply_lcore_config(void) +{ + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + + /* lcore_cpusets[] is always populated at parse time for all input forms */ + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + unsigned int i; + unsigned int count = 0; + + for (i = 0; i < RTE_MAX_LCORE; i++) { + if (user_cfg->lcore_cpusets[i] == NULL) { + runtime_state->lcore_cfg[i].role = ROLE_OFF; + runtime_state->lcore_cfg[i].core_index = -1; + CPU_ZERO(&runtime_state->lcore_cfg[i].cpuset); + runtime_state->lcore_cfg[i].first_cpu = UINT16_MAX; + continue; + } + runtime_state->lcore_cfg[i].role = ROLE_RTE; + runtime_state->lcore_cfg[i].core_index = count++; + memcpy(&runtime_state->lcore_cfg[i].cpuset, + user_cfg->lcore_cpusets[i], sizeof(rte_cpuset_t)); + runtime_state->lcore_cfg[i].first_cpu = + (uint16_t)(RTE_CPU_FFS(&runtime_state->lcore_cfg[i].cpuset) - 1); + } + if (count == 0) { + EAL_LOG(ERR, "No valid lcores in core list"); + return -1; + } + runtime_state->lcore_count = count; + return 0; +} + +int +eal_apply_runtime_state(void) +{ + const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + + if (eal_apply_lcore_config() < 0) + return -1; + + /* Apply service core roles: service_cpuset bits are lcore IDs */ + if (CPU_COUNT(&user_cfg->service_cpuset) > 0) { + unsigned int i; + char *cpuset_str; + + for (i = 0; i < RTE_MAX_LCORE; i++) { + if (!CPU_ISSET(i, &user_cfg->service_cpuset)) + continue; + if (runtime_state->lcore_cfg[i].role != ROLE_RTE) { + EAL_LOG(WARNING, + "service lcore %u is not in the enabled lcore set; ignoring", + i); + continue; + } + runtime_state->lcore_cfg[i].role = ROLE_SERVICE; + } + cpuset_str = eal_cpuset_to_str(&user_cfg->service_cpuset); + if (cpuset_str != NULL) { + EAL_LOG(DEBUG, "Service cores configured: %s", cpuset_str); + free(cpuset_str); + } + } + + /* set the main lcore */ + if (user_cfg->main_lcore != -1) { + runtime_state->main_lcore = user_cfg->main_lcore; + } else { + /* default main lcore is the first one */ + runtime_state->main_lcore = rte_get_next_lcore(-1, 0, 0); + if (runtime_state->main_lcore >= RTE_MAX_LCORE) { + EAL_LOG(ERR, "Main lcore is not enabled for DPDK"); + return -1; + } + } + +#ifndef RTE_EXEC_ENV_WINDOWS + /* create runtime data directory. In no_shconf mode, skip any errors */ + if (eal_create_runtime_dir() < 0) { + if (!user_cfg->no_shconf) { + EAL_LOG(ERR, "Cannot create runtime directory"); + return -1; + } + EAL_LOG(WARNING, "No DPDK runtime directory created"); + } +#endif + + runtime_state->process_type = (user_cfg->process_type == RTE_PROC_AUTO) ? + eal_proc_type_detect() : + user_cfg->process_type; + + compute_ctrl_threads_cpuset(); + + return 0; +} diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 292ac7378e..605c5a59d1 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -2173,41 +2173,7 @@ eal_parse_args(void) for (int i = 0; i < RTE_MAX_NUMA_NODES; i++) user_cfg->memory += user_cfg->numa_mem[i]; - return eal_apply_runtime_state(); -} - -static void -compute_ctrl_threads_cpuset(void) -{ - struct eal_runtime_state *runtime_state = eal_get_runtime_state(); - rte_cpuset_t *cpuset = &runtime_state->ctrl_cpuset; - rte_cpuset_t default_set; - unsigned int lcore_id; - - for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - if (rte_lcore_has_role(lcore_id, ROLE_OFF)) - continue; - RTE_CPU_OR(cpuset, cpuset, &runtime_state->lcore_cfg[lcore_id].cpuset); - } - RTE_CPU_NOT(cpuset, cpuset); - - if (rte_thread_get_affinity_by_id(rte_thread_self(), &default_set) != 0) - CPU_ZERO(&default_set); - - RTE_CPU_AND(cpuset, cpuset, &default_set); - - /* if no remaining cpu, use main lcore cpu affinity */ - if (!CPU_COUNT(cpuset)) { - memcpy(cpuset, &runtime_state->lcore_cfg[rte_get_main_lcore()].cpuset, - sizeof(*cpuset)); - } - - /* log the computed control thread cpuset for debugging */ - char *cpuset_str = eal_cpuset_to_str(cpuset); - if (cpuset_str != NULL) { - EAL_LOG(DEBUG, "Control threads will use cores: %s", cpuset_str); - free(cpuset_str); - } + return 0; } int @@ -2235,102 +2201,6 @@ eal_cleanup_config(void) return 0; } -static int -eal_apply_lcore_config(void) -{ - struct eal_user_cfg *user_cfg = eal_get_user_configuration(); - - /* lcore_cpusets[] is always populated at parse time for all input forms */ - struct eal_runtime_state *runtime_state = eal_get_runtime_state(); - unsigned int i; - unsigned int count = 0; - - for (i = 0; i < RTE_MAX_LCORE; i++) { - if (user_cfg->lcore_cpusets[i] == NULL) { - runtime_state->lcore_cfg[i].role = ROLE_OFF; - runtime_state->lcore_cfg[i].core_index = -1; - CPU_ZERO(&runtime_state->lcore_cfg[i].cpuset); - runtime_state->lcore_cfg[i].first_cpu = UINT16_MAX; - continue; - } - runtime_state->lcore_cfg[i].role = ROLE_RTE; - runtime_state->lcore_cfg[i].core_index = count++; - memcpy(&runtime_state->lcore_cfg[i].cpuset, - user_cfg->lcore_cpusets[i], sizeof(rte_cpuset_t)); - runtime_state->lcore_cfg[i].first_cpu = - (uint16_t)(RTE_CPU_FFS(&runtime_state->lcore_cfg[i].cpuset) - 1); - } - if (count == 0) { - EAL_LOG(ERR, "No valid lcores in core list"); - return -1; - } - runtime_state->lcore_count = count; - return 0; -} - -int -eal_apply_runtime_state(void) -{ - struct eal_user_cfg *user_cfg = eal_get_user_configuration(); - struct eal_runtime_state *runtime_state = eal_get_runtime_state(); - - if (eal_apply_lcore_config() < 0) - return -1; - - /* Apply service core roles: service_cpuset bits are lcore IDs */ - if (CPU_COUNT(&user_cfg->service_cpuset) > 0) { - unsigned int i; - char *cpuset_str; - - for (i = 0; i < RTE_MAX_LCORE; i++) { - if (!CPU_ISSET(i, &user_cfg->service_cpuset)) - continue; - if (runtime_state->lcore_cfg[i].role != ROLE_RTE) { - EAL_LOG(WARNING, - "service lcore %u is not in the enabled lcore set; ignoring", - i); - continue; - } - runtime_state->lcore_cfg[i].role = ROLE_SERVICE; - } - cpuset_str = eal_cpuset_to_str(&user_cfg->service_cpuset); - if (cpuset_str != NULL) { - EAL_LOG(DEBUG, "Service cores configured: %s", cpuset_str); - free(cpuset_str); - } - } - - /* set the main lcore */ - if (user_cfg->main_lcore != -1) { - runtime_state->main_lcore = user_cfg->main_lcore; - } else { - /* default main lcore is the first one */ - runtime_state->main_lcore = rte_get_next_lcore(-1, 0, 0); - if (runtime_state->main_lcore >= RTE_MAX_LCORE) { - EAL_LOG(ERR, "Main lcore is not enabled for DPDK"); - return -1; - } - } - -#ifndef RTE_EXEC_ENV_WINDOWS - /* create runtime data directory. In no_shconf mode, skip any errors */ - if (eal_create_runtime_dir() < 0) { - if (!user_cfg->no_shconf) { - EAL_LOG(ERR, "Cannot create runtime directory"); - return -1; - } - EAL_LOG(WARNING, "No DPDK runtime directory created"); - } -#endif - - runtime_state->process_type = (user_cfg->process_type == RTE_PROC_AUTO) ? - eal_proc_type_detect() : user_cfg->process_type; - - compute_ctrl_threads_cpuset(); - - return 0; -} - RTE_EXPORT_SYMBOL(rte_vect_get_max_simd_bitwidth) uint16_t rte_vect_get_max_simd_bitwidth(void) diff --git a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h index d20381a48f..77a6a4405f 100644 --- a/lib/eal/common/eal_options.h +++ b/lib/eal/common/eal_options.h @@ -13,9 +13,7 @@ struct eal_user_cfg; int eal_parse_log_options(void); int eal_parse_args(void); int eal_option_device_parse(void); -int eal_apply_runtime_state(void); int eal_cleanup_config(void); -enum rte_proc_type_t eal_proc_type_detect(void); int eal_plugins_init(void); int eal_save_args(int argc, char **argv); void eal_clean_saved_args(void); diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index c5efdb070a..877c0840ec 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -28,6 +28,28 @@ */ int eal_collate_args(int argc, char **argv); +/** + * Apply user configuration to runtime state. + * + * Translates the populated eal_user_cfg into the eal_runtime_state, + * including lcore roles, main lcore, service cores, process type + * detection, and the runtime directory. + * + * @return + * 0 on success, negative on error + */ +int eal_apply_runtime_state(void); + +/** + * Detect the process type. + * + * Used to detect process type when the user requests process type auto-detection, + * rather than manually specifying primary or secondary. + * @return + * The detected process type. + */ +enum rte_proc_type_t eal_proc_type_detect(void); + /** * Convert an rte_cpuset_t to string form suitable for parsing by argparse. * diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 13bbd8b868..2245ffc5ac 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -463,6 +463,12 @@ rte_eal_init(int argc, char **argv) user_cfg->in_memory = false; } + if (eal_apply_runtime_state() < 0) { + rte_eal_init_alert("Cannot apply runtime state."); + rte_errno = EINVAL; + goto err_out; + } + if (eal_plugins_init() < 0) { rte_eal_init_alert("Cannot init plugins"); rte_errno = EINVAL; diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 328c74ae4d..d3f1748297 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -619,6 +619,12 @@ rte_eal_init(int argc, char **argv) goto err_out; } + if (eal_apply_runtime_state() < 0) { + rte_eal_init_alert("Cannot apply runtime state."); + rte_errno = EINVAL; + goto err_out; + } + if (eal_plugins_init() < 0) { rte_eal_init_alert("Cannot init plugins"); rte_errno = EINVAL; diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index b8034dceed..e03ba18c4b 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -217,6 +217,12 @@ rte_eal_init(int argc, char **argv) user_cfg->no_shconf = true; } + if (eal_apply_runtime_state() < 0) { + rte_eal_init_alert("Cannot apply runtime state."); + rte_errno = EINVAL; + goto err_out; + } + if (!user_cfg->no_hugetlbfs && (eal_hugepage_info_init() < 0)) { rte_eal_init_alert("Cannot get hugepage information"); rte_errno = EACCES; -- 2.51.0
