Move the bitset for tracking allocated lcore ids to the runtime configuration struct, to co-exist with the other lcore data.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_lcore.c | 12 +++++++----- lib/eal/common/eal_common_options.c | 11 ++++++----- lib/eal/common/eal_internal_cfg.h | 2 ++ lib/eal/common/eal_private.h | 3 --- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c index c0d8c5d137..da33790b06 100644 --- a/lib/eal/common/eal_common_lcore.c +++ b/lib/eal/common/eal_common_lcore.c @@ -223,7 +223,7 @@ rte_eal_cpu_init(void) runtime_state->lcore_cfg[lcore_id].first_cpu = lcore_id; /* This is the first time we discover the lcores, so the bitset should be zeroed */ - rte_bitset_set(config->core_indices, count); + rte_bitset_set(runtime_state->core_indices, count); /* By default, each detected core is enabled */ config->lcore_role[lcore_id] = ROLE_RTE; @@ -417,7 +417,7 @@ eal_lcore_non_eal_allocate(void) int core_index = -1; rte_rwlock_write_lock(&lcore_lock); - core_index = rte_bitset_find_first_clear(cfg->core_indices, RTE_MAX_LCORE); + core_index = rte_bitset_find_first_clear(runtime_state->core_indices, RTE_MAX_LCORE); if (core_index == -1) { EAL_LOG(DEBUG, "No core_index available."); lcore_id = RTE_MAX_LCORE; @@ -426,7 +426,7 @@ eal_lcore_non_eal_allocate(void) for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { if (cfg->lcore_role[lcore_id] != ROLE_OFF) continue; - rte_bitset_set(cfg->core_indices, core_index); + 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++; @@ -449,7 +449,8 @@ eal_lcore_non_eal_allocate(void) } EAL_LOG(DEBUG, "Initialization refused for lcore %u.", lcore_id); - rte_bitset_clear(cfg->core_indices, runtime_state->lcore_cfg[lcore_id].core_index); + 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--; @@ -473,7 +474,8 @@ eal_lcore_non_eal_release(unsigned int lcore_id) goto out; TAILQ_FOREACH(callback, &lcore_callbacks, next) callback_uninit(callback, lcore_id); - rte_bitset_clear(cfg->core_indices, runtime_state->lcore_cfg[lcore_id].core_index); + 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--; diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 4011d5d696..bc18374377 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -864,6 +864,7 @@ 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; char c; @@ -920,7 +921,7 @@ eal_parse_service_coremask(const char *coremask) if (coremask[i] != '0') return -1; - rte_bitset_clear_all(cfg->core_indices, RTE_MAX_LCORE); + rte_bitset_clear_all(runtime_state->core_indices, RTE_MAX_LCORE); if (count == 0) return -1; @@ -946,7 +947,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) int ret = 0; /* set everything to disabled first, then set up values */ - rte_bitset_clear_all(cfg->core_indices, RTE_MAX_LCORE); + 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_cfg[i].core_index = -1; @@ -976,7 +977,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) continue; } - rte_bitset_set(cfg->core_indices, count); + rte_bitset_set(runtime_state->core_indices, count); cfg->lcore_role[lcore_id] = ROLE_RTE; runtime_state->lcore_cfg[lcore_id].core_index = count; CPU_ZERO(&runtime_state->lcore_cfg[lcore_id].cpuset); @@ -1400,7 +1401,7 @@ eal_parse_lcores(const char *lcores) CPU_ZERO(&cpuset); /* Reset lcore config */ - rte_bitset_clear_all(cfg->core_indices, RTE_MAX_LCORE); + 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_cfg[idx].core_index = -1; @@ -1466,7 +1467,7 @@ eal_parse_lcores(const char *lcores) set_count--; if (cfg->lcore_role[idx] != ROLE_RTE) { - rte_bitset_set(cfg->core_indices, count); + rte_bitset_set(runtime_state->core_indices, count); runtime_state->lcore_cfg[idx].core_index = count; cfg->lcore_role[idx] = ROLE_RTE; count++; diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index 218038b8dc..35760fee6f 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -16,6 +16,7 @@ #include <stdint.h> #include <stdbool.h> +#include <rte_bitset.h> #include <rte_stdatomic.h> #include "eal_thread.h" @@ -145,6 +146,7 @@ struct eal_runtime_state { volatile unsigned int init_complete; /**< indicates whether EAL has completed initialization */ struct lcore_cfg lcore_cfg[RTE_MAX_LCORE]; + RTE_BITSET_DECLARE(core_indices, RTE_MAX_LCORE); /**< currently allocated core_indices */ }; struct eal_user_cfg *eal_get_user_configuration(void); diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index b0961304ed..65ae4df27c 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -11,7 +11,6 @@ #include <sys/queue.h> #include <dev_driver.h> -#include <rte_bitset.h> #include <rte_lcore.h> #include <rte_log.h> #include <rte_memory.h> @@ -22,8 +21,6 @@ * The global RTE configuration structure. */ struct rte_config { - RTE_BITSET_DECLARE(core_indices, - RTE_MAX_LCORE); /**< bitset of currently allocated core_indices */ uint32_t main_lcore; /**< Id of the main lcore */ uint32_t lcore_count; /**< Number of available logical cores. */ uint32_t numa_node_count; /**< Number of detected NUMA nodes. */ -- 2.53.0
