Move the lcore role and lcore count values from rte_config struct to the runtime state struct. Update all call sites. The service_lcore_count value was set but never actually used, so just remove it from rte_config rather than moving it to the new structure.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_lcore.c | 53 ++++++++++++++--------------- lib/eal/common/eal_common_options.c | 37 +++++++++----------- lib/eal/common/eal_internal_cfg.h | 2 ++ lib/eal/common/eal_private.h | 3 -- lib/eal/common/rte_service.c | 14 ++++---- 5 files changed, 51 insertions(+), 58 deletions(-) diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c index 43acc6ebee..20d543d76f 100644 --- a/lib/eal/common/eal_common_lcore.c +++ b/lib/eal/common/eal_common_lcore.c @@ -29,7 +29,7 @@ unsigned int rte_get_main_lcore(void) RTE_EXPORT_SYMBOL(rte_lcore_count) unsigned int rte_lcore_count(void) { - return rte_eal_get_configuration()->lcore_count; + return eal_get_runtime_state()->lcore_count; } RTE_EXPORT_SYMBOL(rte_lcore_index) @@ -85,33 +85,33 @@ RTE_EXPORT_SYMBOL(rte_eal_lcore_role) enum rte_lcore_role_t rte_eal_lcore_role(unsigned int lcore_id) { - struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); if (lcore_id >= RTE_MAX_LCORE) return ROLE_OFF; - return cfg->lcore_role[lcore_id]; + return runtime_state->lcore_role[lcore_id]; } RTE_EXPORT_SYMBOL(rte_lcore_has_role) int rte_lcore_has_role(unsigned int lcore_id, enum rte_lcore_role_t role) { - struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); if (lcore_id >= RTE_MAX_LCORE) return 0; - return cfg->lcore_role[lcore_id] == role; + return runtime_state->lcore_role[lcore_id] == role; } RTE_EXPORT_SYMBOL(rte_lcore_is_enabled) int rte_lcore_is_enabled(unsigned int lcore_id) { - struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); if (lcore_id >= RTE_MAX_LCORE) return 0; - return cfg->lcore_role[lcore_id] == ROLE_RTE; + return runtime_state->lcore_role[lcore_id] == ROLE_RTE; } RTE_EXPORT_SYMBOL(rte_get_next_lcore) @@ -319,7 +319,7 @@ void * rte_lcore_callback_register(const char *name, rte_lcore_init_cb init, rte_lcore_uninit_cb uninit, void *arg) { - struct rte_config *cfg = rte_eal_get_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct lcore_callback *callback; unsigned int lcore_id; @@ -339,7 +339,7 @@ rte_lcore_callback_register(const char *name, rte_lcore_init_cb init, if (callback->init == NULL) goto no_init; for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - if (cfg->lcore_role[lcore_id] == ROLE_OFF) + if (runtime_state->lcore_role[lcore_id] == ROLE_OFF) continue; if (callback_init(callback, lcore_id) == 0) continue; @@ -347,7 +347,7 @@ rte_lcore_callback_register(const char *name, rte_lcore_init_cb init, * previous lcore. */ while (lcore_id-- != 0) { - if (cfg->lcore_role[lcore_id] == ROLE_OFF) + if (runtime_state->lcore_role[lcore_id] == ROLE_OFF) continue; callback_uninit(callback, lcore_id); } @@ -369,7 +369,7 @@ RTE_EXPORT_SYMBOL(rte_lcore_callback_unregister) void rte_lcore_callback_unregister(void *handle) { - struct rte_config *cfg = rte_eal_get_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct lcore_callback *callback = handle; unsigned int lcore_id; @@ -379,7 +379,7 @@ rte_lcore_callback_unregister(void *handle) if (callback->uninit == NULL) goto no_uninit; for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - if (cfg->lcore_role[lcore_id] == ROLE_OFF) + if (runtime_state->lcore_role[lcore_id] == ROLE_OFF) continue; callback_uninit(callback, lcore_id); } @@ -394,7 +394,6 @@ rte_lcore_callback_unregister(void *handle) unsigned int eal_lcore_non_eal_allocate(void) { - struct rte_config *cfg = rte_eal_get_configuration(); struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct lcore_callback *callback; struct lcore_callback *prev; @@ -409,12 +408,12 @@ eal_lcore_non_eal_allocate(void) goto out; } for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - if (cfg->lcore_role[lcore_id] != ROLE_OFF) + if (runtime_state->lcore_role[lcore_id] != ROLE_OFF) continue; rte_bitset_set(runtime_state->core_indices, core_index); runtime_state->lcore_cfg[lcore_id].core_index = core_index; - cfg->lcore_role[lcore_id] = ROLE_NON_EAL; - cfg->lcore_count++; + runtime_state->lcore_role[lcore_id] = ROLE_NON_EAL; + runtime_state->lcore_count++; break; } if (lcore_id == RTE_MAX_LCORE) { @@ -437,8 +436,8 @@ eal_lcore_non_eal_allocate(void) rte_bitset_clear(runtime_state->core_indices, runtime_state->lcore_cfg[lcore_id].core_index); runtime_state->lcore_cfg[lcore_id].core_index = -1; - cfg->lcore_role[lcore_id] = ROLE_OFF; - cfg->lcore_count--; + runtime_state->lcore_role[lcore_id] = ROLE_OFF; + runtime_state->lcore_count--; lcore_id = RTE_MAX_LCORE; goto out; } @@ -450,20 +449,19 @@ eal_lcore_non_eal_allocate(void) void eal_lcore_non_eal_release(unsigned int lcore_id) { - struct rte_config *cfg = rte_eal_get_configuration(); struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct lcore_callback *callback; rte_rwlock_write_lock(&lcore_lock); - if (cfg->lcore_role[lcore_id] != ROLE_NON_EAL) + if (runtime_state->lcore_role[lcore_id] != ROLE_NON_EAL) goto out; TAILQ_FOREACH(callback, &lcore_callbacks, next) callback_uninit(callback, lcore_id); rte_bitset_clear(runtime_state->core_indices, runtime_state->lcore_cfg[lcore_id].core_index); runtime_state->lcore_cfg[lcore_id].core_index = -1; - cfg->lcore_role[lcore_id] = ROLE_OFF; - cfg->lcore_count--; + runtime_state->lcore_role[lcore_id] = ROLE_OFF; + runtime_state->lcore_count--; out: rte_rwlock_write_unlock(&lcore_lock); } @@ -472,13 +470,13 @@ RTE_EXPORT_SYMBOL(rte_lcore_iterate) int rte_lcore_iterate(rte_lcore_iterate_cb cb, void *arg) { - struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); unsigned int lcore_id; int ret = 0; rte_rwlock_read_lock(&lcore_lock); for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - if (cfg->lcore_role[lcore_id] == ROLE_OFF) + if (runtime_state->lcore_role[lcore_id] == ROLE_OFF) continue; ret = cb(lcore_id, arg); if (ret != 0) @@ -523,7 +521,6 @@ static int lcore_dump_cb(unsigned int lcore_id, void *arg) { const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); - struct rte_config *cfg = rte_eal_get_configuration(); char *cpuset; struct rte_lcore_usage usage; rte_lcore_usage_cb usage_cb; @@ -544,7 +541,7 @@ lcore_dump_cb(unsigned int lcore_id, void *arg) cpuset = eal_cpuset_to_str(&runtime_state->lcore_cfg[lcore_id].cpuset); fprintf(f, "lcore %u, socket %u, role %s, cpuset %s\n", lcore_id, rte_lcore_to_socket_id(lcore_id), - lcore_role_str(cfg->lcore_role[lcore_id]), + lcore_role_str(runtime_state->lcore_role[lcore_id]), cpuset != NULL ? cpuset : "<unknown>"); free(cpuset); free(usage_str); @@ -597,7 +594,6 @@ static int lcore_telemetry_info_cb(unsigned int lcore_id, void *arg) { const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); - struct rte_config *cfg = rte_eal_get_configuration(); struct lcore_telemetry_info *info = arg; char ratio_str[RTE_TEL_MAX_STRING_LEN]; struct rte_lcore_usage usage; @@ -611,7 +607,8 @@ lcore_telemetry_info_cb(unsigned int lcore_id, void *arg) rte_tel_data_start_dict(info->d); rte_tel_data_add_dict_int(info->d, "lcore_id", lcore_id); rte_tel_data_add_dict_int(info->d, "socket", rte_lcore_to_socket_id(lcore_id)); - rte_tel_data_add_dict_string(info->d, "role", lcore_role_str(cfg->lcore_role[lcore_id])); + rte_tel_data_add_dict_string(info->d, "role", + lcore_role_str(runtime_state->lcore_role[lcore_id])); cpuset = rte_tel_data_alloc(); if (cpuset == NULL) return -ENOMEM; diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index bc18374377..62c94e7704 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -863,7 +863,6 @@ static int xdigit2val(unsigned char c) static int eal_parse_service_coremask(const char *coremask) { - struct rte_config *cfg = rte_eal_get_configuration(); struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int i, j, idx = 0; unsigned int count = 0; @@ -908,10 +907,10 @@ eal_parse_service_coremask(const char *coremask) return -1; } - if (cfg->lcore_role[idx] == ROLE_RTE) + if (runtime_state->lcore_role[idx] == ROLE_RTE) taken_lcore_count++; - cfg->lcore_role[idx] = ROLE_SERVICE; + runtime_state->lcore_role[idx] = ROLE_SERVICE; count++; } } @@ -932,14 +931,12 @@ eal_parse_service_coremask(const char *coremask) "Please ensure -c or -l includes service cores"); } - cfg->service_lcore_count = count; return 0; } static int update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) { - struct rte_config *cfg = rte_eal_get_configuration(); struct eal_runtime_state *runtime_state = eal_get_runtime_state(); unsigned int lcore_id = remap_base; unsigned int count = 0; @@ -949,7 +946,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) /* set everything to disabled first, then set up values */ rte_bitset_clear_all(runtime_state->core_indices, RTE_MAX_LCORE); for (i = 0; i < RTE_MAX_LCORE; i++) { - cfg->lcore_role[i] = ROLE_OFF; + runtime_state->lcore_role[i] = ROLE_OFF; runtime_state->lcore_cfg[i].core_index = -1; } @@ -978,7 +975,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) } rte_bitset_set(runtime_state->core_indices, count); - cfg->lcore_role[lcore_id] = ROLE_RTE; + runtime_state->lcore_role[lcore_id] = ROLE_RTE; runtime_state->lcore_cfg[lcore_id].core_index = count; CPU_ZERO(&runtime_state->lcore_cfg[lcore_id].cpuset); CPU_SET(i, &runtime_state->lcore_cfg[lcore_id].cpuset); @@ -993,7 +990,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) ret = -1; } if (!ret) - cfg->lcore_count = count; + runtime_state->lcore_count = count; return ret; } @@ -1112,7 +1109,7 @@ rte_eal_parse_coremask(const char *coremask, rte_cpuset_t *cpuset, bool limit_ra static int eal_parse_service_corelist(const char *corelist) { - struct rte_config *cfg = rte_eal_get_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int i; unsigned count = 0; char *end = NULL; @@ -1151,11 +1148,11 @@ eal_parse_service_corelist(const char *corelist) if (min == RTE_MAX_LCORE) min = idx; for (idx = min; idx <= max; idx++) { - if (cfg->lcore_role[idx] != ROLE_SERVICE) { - if (cfg->lcore_role[idx] == ROLE_RTE) + if (runtime_state->lcore_role[idx] != ROLE_SERVICE) { + if (runtime_state->lcore_role[idx] == ROLE_RTE) taken_lcore_count++; - cfg->lcore_role[idx] = ROLE_SERVICE; + runtime_state->lcore_role[idx] = ROLE_SERVICE; count++; } } @@ -1178,7 +1175,7 @@ eal_parse_service_corelist(const char *corelist) rte_cpuset_t service_cpuset; CPU_ZERO(&service_cpuset); for (i = 0; i < RTE_MAX_LCORE; i++) { - if (cfg->lcore_role[i] == ROLE_SERVICE) + if (runtime_state->lcore_role[i] == ROLE_SERVICE) CPU_SET(i, &service_cpuset); } if (CPU_COUNT(&service_cpuset) > 0) { @@ -1198,6 +1195,7 @@ eal_parse_main_lcore(const char *arg) { char *parsing_end; struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); errno = 0; cfg->main_lcore = (uint32_t) strtol(arg, &parsing_end, 0); @@ -1207,12 +1205,12 @@ eal_parse_main_lcore(const char *arg) return -1; /* ensure main core is not used as service core */ - if (cfg->lcore_role[cfg->main_lcore] == ROLE_SERVICE) { + if (runtime_state->lcore_role[cfg->main_lcore] == ROLE_SERVICE) { EAL_LOG(ERR, "Error: Main lcore is used as a service core"); return -1; } /* check that we have the core recorded in the core list */ - if (cfg->lcore_role[cfg->main_lcore] != ROLE_RTE) { + if (runtime_state->lcore_role[cfg->main_lcore] != ROLE_RTE) { EAL_LOG(ERR, "Error: Main lcore is not enabled for DPDK"); return -1; } @@ -1378,7 +1376,6 @@ check_cpuset(rte_cpuset_t *set) static int eal_parse_lcores(const char *lcores) { - struct rte_config *cfg = rte_eal_get_configuration(); struct eal_runtime_state *runtime_state = eal_get_runtime_state(); rte_cpuset_t lcore_set; unsigned int set_count; @@ -1403,7 +1400,7 @@ eal_parse_lcores(const char *lcores) /* Reset lcore config */ rte_bitset_clear_all(runtime_state->core_indices, RTE_MAX_LCORE); for (idx = 0; idx < RTE_MAX_LCORE; idx++) { - cfg->lcore_role[idx] = ROLE_OFF; + runtime_state->lcore_role[idx] = ROLE_OFF; runtime_state->lcore_cfg[idx].core_index = -1; CPU_ZERO(&runtime_state->lcore_cfg[idx].cpuset); runtime_state->lcore_cfg[idx].first_cpu = UINT16_MAX; @@ -1466,10 +1463,10 @@ eal_parse_lcores(const char *lcores) continue; set_count--; - if (cfg->lcore_role[idx] != ROLE_RTE) { + if (runtime_state->lcore_role[idx] != ROLE_RTE) { rte_bitset_set(runtime_state->core_indices, count); runtime_state->lcore_cfg[idx].core_index = count; - cfg->lcore_role[idx] = ROLE_RTE; + runtime_state->lcore_role[idx] = ROLE_RTE; count++; } @@ -1496,7 +1493,7 @@ eal_parse_lcores(const char *lcores) if (count == 0) goto err; - cfg->lcore_count = count; + runtime_state->lcore_count = count; ret = 0; err: diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index a28e2d9fdf..4e4b9e975c 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -147,6 +147,8 @@ struct eal_runtime_state { rte_cpuset_t ctrl_cpuset; /**< cpuset for ctrl threads */ volatile unsigned int init_complete; /**< indicates whether EAL has completed initialization */ + uint32_t lcore_count; /**< Number of active lcore IDs (role != ROLE_OFF). */ + enum rte_lcore_role_t lcore_role[RTE_MAX_LCORE]; /**< State of cores. */ struct lcore_cfg lcore_cfg[RTE_MAX_LCORE]; RTE_BITSET_DECLARE(core_indices, RTE_MAX_LCORE); /**< currently allocated core_indices */ }; diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index 7a7332114f..07500dd449 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -22,9 +22,6 @@ */ struct rte_config { uint32_t main_lcore; /**< Id of the main lcore */ - uint32_t lcore_count; /**< Number of available logical cores. */ - uint32_t service_lcore_count;/**< Number of available service cores. */ - enum rte_lcore_role_t lcore_role[RTE_MAX_LCORE]; /**< State of cores. */ /** Primary or secondary configuration */ enum rte_proc_type_t process_type; diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c index dbf4fe153b..36ef2d32a7 100644 --- a/lib/eal/common/rte_service.c +++ b/lib/eal/common/rte_service.c @@ -105,9 +105,10 @@ rte_service_init(void) RTE_LCORE_VAR_ALLOC(lcore_states); int i; - struct rte_config *cfg = rte_eal_get_configuration(); + const struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); for (i = 0; i < RTE_MAX_LCORE; i++) { - if (cfg->lcore_role[i] == ROLE_SERVICE) { + if (runtime_state->lcore_role[i] == ROLE_SERVICE) { if ((unsigned int)i == cfg->main_lcore) continue; rte_service_lcore_add(i); @@ -709,10 +710,9 @@ rte_service_map_lcore_get(uint32_t id, uint32_t lcore) static void set_lcore_state(uint32_t lcore, int32_t state) { - /* mark core state in hugepage backed config */ - struct rte_config *cfg = rte_eal_get_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); struct core_state *cs = RTE_LCORE_VAR_LCORE(lcore, lcore_states); - cfg->lcore_role[lcore] = state; + runtime_state->lcore_role[lcore] = state; /* update per-lcore optimized state tracking */ cs->is_service_core = (state == ROLE_SERVICE); @@ -1101,7 +1101,7 @@ RTE_EXPORT_SYMBOL(rte_service_dump) int32_t rte_service_dump(FILE *f, uint32_t id) { - struct rte_config *cfg = rte_eal_get_configuration(); + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); uint32_t i; int print_one = (id != UINT32_MAX); @@ -1124,7 +1124,7 @@ rte_service_dump(FILE *f, uint32_t id) fprintf(f, "Service Cores Summary\n"); for (i = 0; i < RTE_MAX_LCORE; i++) { - if (cfg->lcore_role[i] != ROLE_SERVICE) + if (runtime_state->lcore_role[i] != ROLE_SERVICE) continue; service_dump_calls_per_lcore(f, i); -- 2.53.0
