Remove the last of the fields from the internal config to the runtime state structure, allowing us to remove the general internal_config struct and it's reference function.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_config.c | 10 ---------- lib/eal/common/eal_common_mcfg.c | 5 ++--- lib/eal/common/eal_common_memzone.c | 4 +++- lib/eal/common/eal_common_options.c | 19 ++++++++++--------- lib/eal/common/eal_common_proc.c | 6 +++--- lib/eal/common/eal_common_thread.c | 8 ++++---- lib/eal/common/eal_internal_cfg.h | 9 +-------- lib/eal/common/eal_options.h | 2 +- lib/eal/common/eal_private.h | 9 --------- lib/eal/freebsd/eal.c | 7 +++---- lib/eal/linux/eal.c | 7 +++---- 11 files changed, 30 insertions(+), 56 deletions(-) diff --git a/lib/eal/common/eal_common_config.c b/lib/eal/common/eal_common_config.c index 50cba4fa1a..f1a5e84aa9 100644 --- a/lib/eal/common/eal_common_config.c +++ b/lib/eal/common/eal_common_config.c @@ -37,9 +37,6 @@ static struct eal_platform_info eal_platform_info; /* internal runtime configuration */ static struct eal_runtime_state eal_runtime_state; -/* internal configuration */ -static struct internal_config internal_config; - RTE_EXPORT_SYMBOL(rte_eal_get_runtime_dir) const char * rte_eal_get_runtime_dir(void) @@ -66,13 +63,6 @@ rte_eal_get_configuration(void) return &rte_config; } -/* Return a pointer to the internal configuration structure */ -struct internal_config * -eal_get_internal_configuration(void) -{ - return &internal_config; -} - /* Return a pointer to the user configuration structure */ struct eal_user_cfg * eal_get_user_configuration(void) diff --git a/lib/eal/common/eal_common_mcfg.c b/lib/eal/common/eal_common_mcfg.c index fddeae255e..497b0933c7 100644 --- a/lib/eal/common/eal_common_mcfg.c +++ b/lib/eal/common/eal_common_mcfg.c @@ -15,14 +15,13 @@ eal_mcfg_complete(void) { struct rte_config *cfg = rte_eal_get_configuration(); struct rte_mem_config *mcfg = cfg->mem_config; - struct internal_config *internal_conf = - eal_get_internal_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); /* ALL shared mem_config related INIT DONE */ if (cfg->process_type == RTE_PROC_PRIMARY) mcfg->magic = RTE_MAGIC; - internal_conf->init_complete = 1; + runtime_state->init_complete = 1; } void diff --git a/lib/eal/common/eal_common_memzone.c b/lib/eal/common/eal_common_memzone.c index db43af13a8..1207d524c9 100644 --- a/lib/eal/common/eal_common_memzone.c +++ b/lib/eal/common/eal_common_memzone.c @@ -20,6 +20,7 @@ #include "malloc_heap.h" #include "malloc_elem.h" +#include "eal_internal_cfg.h" #include "eal_private.h" #include "eal_memcfg.h" @@ -30,9 +31,10 @@ RTE_EXPORT_SYMBOL(rte_memzone_max_set) int rte_memzone_max_set(size_t max) { + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct rte_mem_config *mcfg; - if (eal_get_internal_configuration()->init_complete > 0) { + if (runtime_state->init_complete > 0) { EAL_LOG(ERR, "Max memzone cannot be set after EAL init"); return -1; } diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 0750a52373..2d6d4dc9bc 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -491,10 +491,11 @@ eal_get_hugefile_prefix(void) } void -eal_reset_internal_config(struct internal_config *internal_cfg) +eal_reset_internal_config(void) { struct eal_user_cfg *user_cfg = eal_get_user_configuration(); struct eal_platform_info *platform_info = eal_get_platform_info(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int i; user_cfg->memory = 0; @@ -540,8 +541,8 @@ eal_reset_internal_config(struct internal_config *internal_cfg) user_cfg->no_telemetry = false; user_cfg->iova_mode = RTE_IOVA_DC; user_cfg->user_mbuf_pool_ops_name = NULL; - CPU_ZERO(&internal_cfg->ctrl_cpuset); - internal_cfg->init_complete = 0; + CPU_ZERO(&runtime_state->ctrl_cpuset); + runtime_state->init_complete = 0; user_cfg->max_simd_bitwidth.bitwidth = RTE_VECT_DEFAULT_SIMD_BITWIDTH; user_cfg->max_simd_bitwidth.forced = 0; } @@ -1958,7 +1959,6 @@ eal_parse_huge_worker_stack(const char *arg) int eal_parse_args(void) { - struct internal_config *int_cfg = eal_get_internal_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); struct rte_config *rte_cfg = rte_eal_get_configuration(); bool remap_lcores = (args.remap_lcore_ids != NULL); @@ -2307,7 +2307,7 @@ eal_parse_args(void) } #endif - if (eal_adjust_config(int_cfg) != 0) { + if (eal_adjust_config() != 0) { EAL_LOG(ERR, "Invalid configuration"); return -1; } @@ -2316,9 +2316,10 @@ eal_parse_args(void) } static void -compute_ctrl_threads_cpuset(struct internal_config *internal_cfg) +compute_ctrl_threads_cpuset(void) { - rte_cpuset_t *cpuset = &internal_cfg->ctrl_cpuset; + 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; @@ -2359,7 +2360,7 @@ eal_cleanup_config(const struct eal_user_cfg *user_cfg) } int -eal_adjust_config(struct internal_config *internal_cfg) +eal_adjust_config(void) { struct eal_user_cfg *user_cfg = eal_get_user_configuration(); int i; @@ -2367,7 +2368,7 @@ eal_adjust_config(struct internal_config *internal_cfg) if (user_cfg->process_type == RTE_PROC_AUTO) user_cfg->process_type = eal_proc_type_detect(); - compute_ctrl_threads_cpuset(internal_cfg); + compute_ctrl_threads_cpuset(); /* if no memory amounts were requested, this will result in 0 and * will be overridden later, right after eal_hugepage_info_init() */ diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index 74f4f60b0a..dcf18ebf4c 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -343,8 +343,8 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) struct action_entry *entry; struct rte_mp_msg *msg = &m->msg; rte_mp_t action = NULL; - const struct internal_config *internal_conf = - eal_get_internal_configuration(); + const struct eal_runtime_state *runtime_state = + eal_get_runtime_state(); EAL_LOG(DEBUG, "msg: %s", msg->name); @@ -382,7 +382,7 @@ process_msg(struct mp_msg_internal *m, struct sockaddr_un *s) pthread_mutex_unlock(&mp_mutex_action); if (!action) { - if (m->type == MP_REQ && !internal_conf->init_complete) { + if (m->type == MP_REQ && !runtime_state->init_complete) { /* if this is a request, and init is not yet complete, * and callback wasn't registered, we should tell the * requester to ignore our existence because we're not diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c index dcd81f9e32..c2e7315bf4 100644 --- a/lib/eal/common/eal_common_thread.c +++ b/lib/eal/common/eal_common_thread.c @@ -234,9 +234,8 @@ struct control_thread_params { static int control_thread_init(void *arg) { - struct internal_config *internal_conf = - eal_get_internal_configuration(); - rte_cpuset_t *cpuset = &internal_conf->ctrl_cpuset; + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + rte_cpuset_t *cpuset = &runtime_state->ctrl_cpuset; struct control_thread_params *params = arg; __rte_thread_init(rte_lcore_id(), cpuset); @@ -354,11 +353,12 @@ RTE_EXPORT_SYMBOL(rte_thread_register) int rte_thread_register(void) { + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); unsigned int lcore_id; rte_cpuset_t cpuset; /* EAL init flushes all lcores, we can't register before. */ - if (eal_get_internal_configuration()->init_complete != 1) { + if (runtime_state->init_complete != 1) { EAL_LOG(DEBUG, "Called %s before EAL init.", __func__); rte_errno = EINVAL; return -1; diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index fbbe5dce82..9a898e676e 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -102,13 +102,6 @@ struct eal_platform_info { * as appropriate. */ struct eal_runtime_state { - uint8_t reserved; -}; - -/** - * internal configuration - */ -struct internal_config { rte_cpuset_t ctrl_cpuset; /**< cpuset for ctrl threads */ volatile unsigned int init_complete; /**< indicates whether EAL has completed initialization */ @@ -117,6 +110,6 @@ struct internal_config { struct eal_user_cfg *eal_get_user_configuration(void); struct eal_platform_info *eal_get_platform_info(void); struct eal_runtime_state *eal_get_runtime_state(void); -void eal_reset_internal_config(struct internal_config *internal_cfg); +void eal_reset_internal_config(void); #endif /* EAL_INTERNAL_CFG_H */ diff --git a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h index 5ad347b61d..a70c5b0c05 100644 --- a/lib/eal/common/eal_options.h +++ b/lib/eal/common/eal_options.h @@ -13,7 +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_adjust_config(struct internal_config *internal_cfg); +int eal_adjust_config(void); int eal_cleanup_config(const struct eal_user_cfg *user_cfg); enum rte_proc_type_t eal_proc_type_detect(void); int eal_plugins_init(void); diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index e032dd10c9..d9807fb2fb 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -710,15 +710,6 @@ eal_mem_set_dump(void *virt, size_t size, bool dump); int eal_set_runtime_dir(const char *run_dir); -/** - * Get the internal configuration structure. - * - * @return - * A pointer to the internal configuration structure. - */ -struct internal_config * -eal_get_internal_configuration(void); - /** * Get the current value of the rte_application_usage pointer * diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 996a2de9ff..f41a700125 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -407,9 +407,8 @@ rte_eal_init(int argc, char **argv) char cpuset[RTE_CPU_AFFINITY_STR_LEN]; char thread_name[RTE_THREAD_NAME_SIZE]; const struct rte_config *config = rte_eal_get_configuration(); - struct internal_config *internal_conf = - eal_get_internal_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); bool has_phys_addr; enum rte_iova_mode iova_mode; @@ -454,7 +453,7 @@ rte_eal_init(int argc, char **argv) goto err_out; } - eal_reset_internal_config(internal_conf); + eal_reset_internal_config(); if (rte_eal_cpu_init() < 0) { rte_eal_init_alert("Cannot detect lcores."); @@ -745,7 +744,7 @@ rte_eal_init(int argc, char **argv) if (rte_eal_process_type() == RTE_PROC_PRIMARY && !user_cfg->no_telemetry) { if (rte_telemetry_init(rte_eal_get_runtime_dir(), rte_version(), - &internal_conf->ctrl_cpuset) != 0) + &runtime_state->ctrl_cpuset) != 0) goto err_out; } diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index f692521fe7..ffe930155a 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -569,9 +569,8 @@ rte_eal_init(int argc, char **argv) char thread_name[RTE_THREAD_NAME_SIZE]; bool phys_addrs; const struct rte_config *config = rte_eal_get_configuration(); - struct internal_config *internal_conf = - eal_get_internal_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); /* first check if we have been run before */ if (!rte_atomic_compare_exchange_strong_explicit(&run_once, &has_run, 1, @@ -614,7 +613,7 @@ rte_eal_init(int argc, char **argv) goto err_out; } - eal_reset_internal_config(internal_conf); + eal_reset_internal_config(); if (rte_eal_cpu_init() < 0) { rte_eal_init_alert("Cannot detect lcores."); @@ -918,7 +917,7 @@ rte_eal_init(int argc, char **argv) if (rte_eal_process_type() == RTE_PROC_PRIMARY && !user_cfg->no_telemetry) { if (rte_telemetry_init(rte_eal_get_runtime_dir(), rte_version(), - &internal_conf->ctrl_cpuset) != 0) + &runtime_state->ctrl_cpuset) != 0) goto err_out; } -- 2.51.0
