Remove the standalone lcore_config array and instead manage the lcore configuration as part of the runtime state.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_launch.c | 25 +++++++++++------ lib/eal/common/eal_common_lcore.c | 43 +++++++++++++++++------------ lib/eal/common/eal_common_options.c | 38 +++++++++++++------------ lib/eal/common/eal_common_thread.c | 24 +++++++++------- lib/eal/common/eal_internal_cfg.h | 19 +++++++++++++ lib/eal/common/eal_private.h | 21 -------------- lib/eal/common/rte_service.c | 8 ++---- lib/eal/freebsd/eal.c | 23 +++++++-------- lib/eal/linux/eal.c | 24 ++++++++-------- lib/eal/unix/eal_unix_thread.c | 11 +++++--- lib/eal/windows/eal.c | 22 +++++++-------- lib/eal/windows/eal_thread.c | 11 +++++--- 12 files changed, 142 insertions(+), 127 deletions(-) diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c index a7deac6ecd..a0f2a43b2a 100644 --- a/lib/eal/common/eal_common_launch.c +++ b/lib/eal/common/eal_common_launch.c @@ -20,11 +20,13 @@ RTE_EXPORT_SYMBOL(rte_eal_wait_lcore) int rte_eal_wait_lcore(unsigned worker_id) { - while (rte_atomic_load_explicit(&lcore_config[worker_id].state, + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + + while (rte_atomic_load_explicit(&runtime_state->lcore_cfg[worker_id].state, rte_memory_order_acquire) != WAIT) rte_pause(); - return lcore_config[worker_id].ret; + return runtime_state->lcore_cfg[worker_id].ret; } /* @@ -36,21 +38,23 @@ RTE_EXPORT_SYMBOL(rte_eal_remote_launch) int rte_eal_remote_launch(lcore_function_t *f, void *arg, unsigned int worker_id) { + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int rc = -EBUSY; /* Check if the worker is in 'WAIT' state. Use acquire order * since 'state' variable is used as the guard variable. */ - if (rte_atomic_load_explicit(&lcore_config[worker_id].state, + if (rte_atomic_load_explicit(&runtime_state->lcore_cfg[worker_id].state, rte_memory_order_acquire) != WAIT) goto finish; - lcore_config[worker_id].arg = arg; + runtime_state->lcore_cfg[worker_id].arg = arg; /* Ensure that all the memory operations are completed * before the worker thread starts running the function. * Use worker thread function as the guard variable. */ - rte_atomic_store_explicit(&lcore_config[worker_id].f, f, rte_memory_order_release); + rte_atomic_store_explicit(&runtime_state->lcore_cfg[worker_id].f, f, + rte_memory_order_release); rc = eal_thread_wake_worker(worker_id); @@ -69,12 +73,13 @@ int rte_eal_mp_remote_launch(int (*f)(void *), void *arg, enum rte_rmt_call_main_t call_main) { + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int lcore_id; int main_lcore = rte_get_main_lcore(); /* check state of lcores */ RTE_LCORE_FOREACH_WORKER(lcore_id) { - if (lcore_config[lcore_id].state != WAIT) + if (runtime_state->lcore_cfg[lcore_id].state != WAIT) return -EBUSY; } @@ -84,8 +89,8 @@ rte_eal_mp_remote_launch(int (*f)(void *), void *arg, } if (call_main == CALL_MAIN) { - lcore_config[main_lcore].ret = f(arg); - lcore_config[main_lcore].state = WAIT; + runtime_state->lcore_cfg[main_lcore].ret = f(arg); + runtime_state->lcore_cfg[main_lcore].state = WAIT; } return 0; @@ -98,7 +103,9 @@ RTE_EXPORT_SYMBOL(rte_eal_get_lcore_state) enum rte_lcore_state_t rte_eal_get_lcore_state(unsigned lcore_id) { - return lcore_config[lcore_id].state; + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + + return runtime_state->lcore_cfg[lcore_id].state; } /* diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c index ba3a0c8a92..ca5106c623 100644 --- a/lib/eal/common/eal_common_lcore.c +++ b/lib/eal/common/eal_common_lcore.c @@ -34,6 +34,8 @@ unsigned int rte_lcore_count(void) RTE_EXPORT_SYMBOL(rte_lcore_index) int rte_lcore_index(int lcore_id) { + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + if (unlikely(lcore_id >= RTE_MAX_LCORE)) return -1; @@ -44,12 +46,13 @@ int rte_lcore_index(int lcore_id) lcore_id = (int)rte_lcore_id(); } - return lcore_config[lcore_id].core_index; + return runtime_state->lcore_cfg[lcore_id].core_index; } RTE_EXPORT_SYMBOL(rte_lcore_to_cpu_id) int rte_lcore_to_cpu_id(int lcore_id) { + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); const struct eal_platform_info *platform_info = eal_get_platform_info(); unsigned int cpu; @@ -63,17 +66,18 @@ int rte_lcore_to_cpu_id(int lcore_id) lcore_id = (int)rte_lcore_id(); } - for (cpu = 0; cpu < CPU_SETSIZE && cpu < platform_info->cpu_count; cpu++) { - if (CPU_ISSET(cpu, &lcore_config[lcore_id].cpuset)) - return (int)platform_info->cpu_info[cpu].core_id; - } + cpu = runtime_state->lcore_cfg[lcore_id].first_cpu; + if (cpu < platform_info->cpu_count) + return (int)platform_info->cpu_info[cpu].core_id; return -1; } RTE_EXPORT_SYMBOL(rte_lcore_cpuset) rte_cpuset_t rte_lcore_cpuset(unsigned int lcore_id) { - return lcore_config[lcore_id].cpuset; + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + + return runtime_state->lcore_cfg[lcore_id].cpuset; } RTE_EXPORT_SYMBOL(rte_eal_lcore_role) @@ -133,13 +137,12 @@ RTE_EXPORT_SYMBOL(rte_lcore_to_socket_id) unsigned int rte_lcore_to_socket_id(unsigned int lcore_id) { + const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); const struct eal_platform_info *platform_info = eal_get_platform_info(); - unsigned int cpu; + unsigned int cpu = runtime_state->lcore_cfg[lcore_id].first_cpu; - for (cpu = 0; cpu < CPU_SETSIZE && cpu < platform_info->cpu_count; cpu++) { - if (CPU_ISSET(cpu, &lcore_config[lcore_id].cpuset)) - return platform_info->cpu_info[cpu].numa_id; - } + if (cpu < platform_info->cpu_count) + return platform_info->cpu_info[cpu].numa_id; return 0; } @@ -167,6 +170,7 @@ rte_eal_cpu_init(void) /* pointer to global configuration */ struct rte_config *config = rte_eal_get_configuration(); struct eal_platform_info *platform_info = eal_get_platform_info(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); unsigned lcore_id; unsigned count = 0; unsigned int socket_id, prev_socket_id; @@ -199,14 +203,15 @@ rte_eal_cpu_init(void) * ones and enable them by default. */ for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) { - lcore_config[lcore_id].core_index = count; + runtime_state->lcore_cfg[lcore_id].core_index = count; /* init cpuset for per lcore config */ - CPU_ZERO(&lcore_config[lcore_id].cpuset); + CPU_ZERO(&runtime_state->lcore_cfg[lcore_id].cpuset); + runtime_state->lcore_cfg[lcore_id].first_cpu = UINT16_MAX; if (eal_cpu_detected(lcore_id) == 0) { config->lcore_role[lcore_id] = ROLE_OFF; - lcore_config[lcore_id].core_index = -1; + runtime_state->lcore_cfg[lcore_id].core_index = -1; continue; } @@ -215,11 +220,11 @@ rte_eal_cpu_init(void) lcore_to_socket_id[lcore_id] = socket_id; /* By default, lcore 1:1 map to cpu id */ - CPU_SET(lcore_id, &lcore_config[lcore_id].cpuset); + CPU_SET(lcore_id, &runtime_state->lcore_cfg[lcore_id].cpuset); + runtime_state->lcore_cfg[lcore_id].first_cpu = lcore_id; /* By default, each detected core is enabled */ config->lcore_role[lcore_id] = ROLE_RTE; - lcore_config[lcore_id].core_role = ROLE_RTE; EAL_LOG(DEBUG, "Detected lcore %u as " "core %u on NUMA node %u", lcore_id, @@ -513,6 +518,7 @@ calc_usage_ratio(const struct rte_lcore_usage *usage) 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; @@ -531,7 +537,7 @@ lcore_dump_cb(unsigned int lcore_id, void *arg) return -ENOMEM; } } - cpuset = eal_cpuset_to_str(&lcore_config[lcore_id].cpuset); + 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]), @@ -586,6 +592,7 @@ format_usage_ratio(char *buf, uint16_t size, const struct rte_lcore_usage *usage 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]; @@ -606,7 +613,7 @@ lcore_telemetry_info_cb(unsigned int lcore_id, void *arg) return -ENOMEM; rte_tel_data_start_array(cpuset, RTE_TEL_INT_VAL); for (cpu = 0; cpu < CPU_SETSIZE; cpu++) { - if (CPU_ISSET(cpu, &lcore_config[lcore_id].cpuset)) + if (CPU_ISSET(cpu, &runtime_state->lcore_cfg[lcore_id].cpuset)) rte_tel_data_add_array_int(cpuset, cpu); } rte_tel_data_add_dict_container(info->d, "cpuset", cpuset, 0); diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 2d6d4dc9bc..02c40e5ce1 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -888,7 +888,7 @@ eal_parse_service_coremask(const char *coremask) if (cfg->lcore_role[idx] == ROLE_RTE) taken_lcore_count++; - lcore_config[idx].core_role = ROLE_SERVICE; + cfg->lcore_role[idx] = ROLE_SERVICE; count++; } } @@ -898,9 +898,6 @@ eal_parse_service_coremask(const char *coremask) if (coremask[i] != '0') return -1; - for (; idx < RTE_MAX_LCORE; idx++) - lcore_config[idx].core_index = -1; - if (count == 0) return -1; @@ -918,6 +915,7 @@ 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; unsigned int i; @@ -926,7 +924,7 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) /* set everything to disabled first, then set up values */ for (i = 0; i < RTE_MAX_LCORE; i++) { cfg->lcore_role[i] = ROLE_OFF; - lcore_config[i].core_index = -1; + runtime_state->lcore_cfg[i].core_index = -1; } /* now go through the cpuset */ @@ -954,9 +952,10 @@ update_lcore_config(const rte_cpuset_t *cpuset, bool remap, uint16_t remap_base) } cfg->lcore_role[lcore_id] = ROLE_RTE; - lcore_config[lcore_id].core_index = count; - CPU_ZERO(&lcore_config[lcore_id].cpuset); - CPU_SET(i, &lcore_config[lcore_id].cpuset); + 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); + runtime_state->lcore_cfg[lcore_id].first_cpu = i; EAL_LOG(DEBUG, "lcore %u mapped to physical core %u", lcore_id, i); lcore_id++; count++; @@ -1129,8 +1128,7 @@ eal_parse_service_corelist(const char *corelist) if (cfg->lcore_role[idx] == ROLE_RTE) taken_lcore_count++; - lcore_config[idx].core_role = - ROLE_SERVICE; + cfg->lcore_role[idx] = ROLE_SERVICE; count++; } } @@ -1153,7 +1151,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 (lcore_config[i].core_role == ROLE_SERVICE) + if (cfg->lcore_role[i] == ROLE_SERVICE) CPU_SET(i, &service_cpuset); } if (CPU_COUNT(&service_cpuset) > 0) { @@ -1182,7 +1180,7 @@ eal_parse_main_lcore(const char *arg) return -1; /* ensure main core is not used as service core */ - if (lcore_config[cfg->main_lcore].core_role == ROLE_SERVICE) { + if (cfg->lcore_role[cfg->main_lcore] == ROLE_SERVICE) { EAL_LOG(ERR, "Error: Main lcore is used as a service core"); return -1; } @@ -1354,6 +1352,7 @@ 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; unsigned idx = 0; @@ -1377,8 +1376,9 @@ eal_parse_lcores(const char *lcores) /* Reset lcore config */ for (idx = 0; idx < RTE_MAX_LCORE; idx++) { cfg->lcore_role[idx] = ROLE_OFF; - lcore_config[idx].core_index = -1; - CPU_ZERO(&lcore_config[idx].cpuset); + 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; } /* Get list of cores */ @@ -1439,7 +1439,7 @@ eal_parse_lcores(const char *lcores) set_count--; if (cfg->lcore_role[idx] != ROLE_RTE) { - lcore_config[idx].core_index = count; + runtime_state->lcore_cfg[idx].core_index = count; cfg->lcore_role[idx] = ROLE_RTE; count++; } @@ -1451,8 +1451,10 @@ eal_parse_lcores(const char *lcores) if (check_cpuset(&cpuset) < 0) goto err; - rte_memcpy(&lcore_config[idx].cpuset, &cpuset, + rte_memcpy(&runtime_state->lcore_cfg[idx].cpuset, &cpuset, sizeof(rte_cpuset_t)); + runtime_state->lcore_cfg[idx].first_cpu = + (uint16_t)(RTE_CPU_FFS(&cpuset) - 1); } /* some cores from the lcore_set can't be handled by EAL */ @@ -2326,7 +2328,7 @@ compute_ctrl_threads_cpuset(void) 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, &lcore_config[lcore_id].cpuset); + RTE_CPU_OR(cpuset, cpuset, &runtime_state->lcore_cfg[lcore_id].cpuset); } RTE_CPU_NOT(cpuset, cpuset); @@ -2337,7 +2339,7 @@ compute_ctrl_threads_cpuset(void) /* if no remaining cpu, use main lcore cpu affinity */ if (!CPU_COUNT(cpuset)) { - memcpy(cpuset, &lcore_config[rte_get_main_lcore()].cpuset, + memcpy(cpuset, &runtime_state->lcore_cfg[rte_get_main_lcore()].cpuset, sizeof(*cpuset)); } diff --git a/lib/eal/common/eal_common_thread.c b/lib/eal/common/eal_common_thread.c index 774344013d..7256d06d0a 100644 --- a/lib/eal/common/eal_common_thread.c +++ b/lib/eal/common/eal_common_thread.c @@ -46,9 +46,12 @@ thread_update_affinity(rte_cpuset_t *cpusetp) memmove(&RTE_PER_LCORE(_cpuset), cpusetp, sizeof(rte_cpuset_t)); if (lcore_id != (unsigned)LCORE_ID_ANY) { - /* EAL thread: update lcore_config cpuset first then find numa based on that */ - memmove(&lcore_config[lcore_id].cpuset, cpusetp, + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + + /* EAL thread: update lcore_runtime cpuset first then find numa based on that */ + memmove(&runtime_state->lcore_cfg[lcore_id].cpuset, cpusetp, sizeof(rte_cpuset_t)); + runtime_state->lcore_cfg[lcore_id].first_cpu = (uint16_t)(RTE_CPU_FFS(cpusetp) - 1); RTE_PER_LCORE(_numa_id) = rte_lcore_to_socket_id(lcore_id); } else { /* Non-EAL thread: derive NUMA node from first CPU in cpuset. */ @@ -135,10 +138,11 @@ __rte_noreturn uint32_t eal_thread_loop(void *arg) { unsigned int lcore_id = (uintptr_t)arg; + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); char cpuset[RTE_CPU_AFFINITY_STR_LEN]; int ret; - __rte_thread_init(lcore_id, &lcore_config[lcore_id].cpuset); + __rte_thread_init(lcore_id, &runtime_state->lcore_cfg[lcore_id].cpuset); ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset)); EAL_LOG(DEBUG, "lcore %u is ready (tid=%zx;cpuset=[%s%s])", @@ -157,7 +161,7 @@ eal_thread_loop(void *arg) /* Set the state to 'RUNNING'. Use release order * since 'state' variable is used as the guard variable. */ - rte_atomic_store_explicit(&lcore_config[lcore_id].state, RUNNING, + rte_atomic_store_explicit(&runtime_state->lcore_cfg[lcore_id].state, RUNNING, rte_memory_order_release); eal_thread_ack_command(); @@ -167,25 +171,25 @@ eal_thread_loop(void *arg) * are accessed only after update to 'f' is visible. * Wait till the update to 'f' is visible to the worker. */ - while ((f = rte_atomic_load_explicit(&lcore_config[lcore_id].f, + while ((f = rte_atomic_load_explicit(&runtime_state->lcore_cfg[lcore_id].f, rte_memory_order_acquire)) == NULL) rte_pause(); rte_eal_trace_thread_lcore_running(lcore_id, f); /* call the function and store the return value */ - fct_arg = lcore_config[lcore_id].arg; + fct_arg = runtime_state->lcore_cfg[lcore_id].arg; ret = f(fct_arg); - lcore_config[lcore_id].ret = ret; - lcore_config[lcore_id].f = NULL; - lcore_config[lcore_id].arg = NULL; + runtime_state->lcore_cfg[lcore_id].ret = ret; + runtime_state->lcore_cfg[lcore_id].f = NULL; + runtime_state->lcore_cfg[lcore_id].arg = NULL; /* Store the state with release order to ensure that * the memory operations from the worker thread * are completed before the state is updated. * Use 'state' as the guard variable. */ - rte_atomic_store_explicit(&lcore_config[lcore_id].state, WAIT, + rte_atomic_store_explicit(&runtime_state->lcore_cfg[lcore_id].state, WAIT, rte_memory_order_release); rte_eal_trace_thread_lcore_stopped(lcore_id); diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index 8ed7171bdc..ef4bcfc01a 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_stdatomic.h> #include "eal_thread.h" #if defined(RTE_ARCH_ARM) @@ -108,6 +109,23 @@ struct eal_platform_info { struct hugepage_info hugepage_info[MAX_HUGEPAGE_SIZES]; }; +/** + * Per-lcore runtime state, owned by EAL. + */ +struct lcore_cfg { + int core_index; /**< relative index, starting from 0 */ + rte_cpuset_t cpuset; /**< cpu set which the lcore affinity to */ + uint16_t first_cpu; /**< lowest CPU set in cpuset, UINT16_MAX if none */ + /* Fields for executing code on a remote lcore */ + rte_thread_t thread_id; /**< thread identifier */ + int pipe_main2worker[2]; /**< communication pipe with main */ + int pipe_worker2main[2]; /**< communication pipe with main */ + RTE_ATOMIC(lcore_function_t *) volatile f; /**< function to call */ + void * volatile arg; /**< argument of function */ + volatile int ret; /**< return value of function */ + volatile RTE_ATOMIC(enum rte_lcore_state_t) state; /**< lcore state */ +}; + /** * Internal EAL runtime state * May be modified at runtime, so access must be protected by locks or atomic types @@ -117,6 +135,7 @@ struct eal_runtime_state { rte_cpuset_t ctrl_cpuset; /**< cpuset for ctrl threads */ volatile unsigned int init_complete; /**< indicates whether EAL has completed initialization */ + struct lcore_cfg lcore_cfg[RTE_MAX_LCORE]; }; 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 48569f2ed7..bd9c9f2b70 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -17,27 +17,6 @@ #include "eal_internal_cfg.h" -/** - * Structure storing internal configuration (per-lcore) - */ -struct lcore_config { - rte_thread_t thread_id; /**< thread identifier */ - int pipe_main2worker[2]; /**< communication pipe with main */ - int pipe_worker2main[2]; /**< communication pipe with main */ - - RTE_ATOMIC(lcore_function_t *) volatile f; /**< function to call */ - void * volatile arg; /**< argument of function */ - volatile int ret; /**< return value of function */ - - volatile RTE_ATOMIC(enum rte_lcore_state_t) state; /**< lcore state */ - int core_index; /**< relative index, starting from 0 */ - uint8_t core_role; /**< role of core eg: OFF, RTE, SERVICE */ - - rte_cpuset_t cpuset; /**< cpu set which the lcore affinity to */ -}; - -extern struct lcore_config lcore_config[RTE_MAX_LCORE]; - /** * The global RTE configuration structure. */ diff --git a/lib/eal/common/rte_service.c b/lib/eal/common/rte_service.c index d2ac9d3f14..dbf4fe153b 100644 --- a/lib/eal/common/rte_service.c +++ b/lib/eal/common/rte_service.c @@ -107,7 +107,7 @@ rte_service_init(void) int i; struct rte_config *cfg = rte_eal_get_configuration(); for (i = 0; i < RTE_MAX_LCORE; i++) { - if (lcore_config[i].core_role == ROLE_SERVICE) { + if (cfg->lcore_role[i] == ROLE_SERVICE) { if ((unsigned int)i == cfg->main_lcore) continue; rte_service_lcore_add(i); @@ -714,9 +714,6 @@ set_lcore_state(uint32_t lcore, int32_t state) struct core_state *cs = RTE_LCORE_VAR_LCORE(lcore, lcore_states); cfg->lcore_role[lcore] = state; - /* mark state in process local lcore_config */ - lcore_config[lcore].core_role = state; - /* update per-lcore optimized state tracking */ cs->is_service_core = (state == ROLE_SERVICE); @@ -1104,6 +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(); uint32_t i; int print_one = (id != UINT32_MAX); @@ -1126,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 (lcore_config[i].core_role != ROLE_SERVICE) + if (cfg->lcore_role[i] != ROLE_SERVICE) continue; service_dump_calls_per_lcore(f, i); diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index f41a700125..a75af85a7c 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -70,9 +70,6 @@ static struct flock wr_lock = { .l_len = RTE_SIZEOF_FIELD(struct rte_mem_config, memsegs), }; -/* internal configuration (per-core) */ -struct lcore_config lcore_config[RTE_MAX_LCORE]; - /* used by rte_rdtsc() */ RTE_EXPORT_SYMBOL(rte_cycles_vmware_tsc_map) int rte_cycles_vmware_tsc_map; @@ -408,7 +405,7 @@ rte_eal_init(int argc, char **argv) char thread_name[RTE_THREAD_NAME_SIZE]; const struct rte_config *config = rte_eal_get_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); - const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); bool has_phys_addr; enum rte_iova_mode iova_mode; @@ -650,13 +647,13 @@ rte_eal_init(int argc, char **argv) eal_check_mem_on_local_socket(); if (rte_thread_set_affinity_by_id(rte_thread_self(), - &lcore_config[config->main_lcore].cpuset) != 0) { + &runtime_state->lcore_cfg[config->main_lcore].cpuset) != 0) { rte_eal_init_alert("Cannot set affinity"); rte_errno = EINVAL; goto err_out; } __rte_thread_init(config->main_lcore, - &lcore_config[config->main_lcore].cpuset); + &runtime_state->lcore_cfg[config->main_lcore].cpuset); ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset)); @@ -670,15 +667,15 @@ rte_eal_init(int argc, char **argv) * create communication pipes between main thread * and children */ - if (pipe(lcore_config[i].pipe_main2worker) < 0) + if (pipe(runtime_state->lcore_cfg[i].pipe_main2worker) < 0) rte_panic("Cannot create pipe\n"); - if (pipe(lcore_config[i].pipe_worker2main) < 0) + if (pipe(runtime_state->lcore_cfg[i].pipe_worker2main) < 0) rte_panic("Cannot create pipe\n"); - lcore_config[i].state = WAIT; + runtime_state->lcore_cfg[i].state = WAIT; /* create a thread for each lcore */ - ret = rte_thread_create(&lcore_config[i].thread_id, NULL, + ret = rte_thread_create(&runtime_state->lcore_cfg[i].thread_id, NULL, eal_thread_loop, (void *)(uintptr_t)i); if (ret != 0) rte_panic("Cannot create thread\n"); @@ -688,10 +685,10 @@ rte_eal_init(int argc, char **argv) if (ret >= RTE_THREAD_NAME_SIZE) EAL_LOG(INFO, "Worker thread name %s truncated", thread_name); - rte_thread_set_name(lcore_config[i].thread_id, thread_name); + rte_thread_set_name(runtime_state->lcore_cfg[i].thread_id, thread_name); - ret = rte_thread_set_affinity_by_id(lcore_config[i].thread_id, - &lcore_config[i].cpuset); + ret = rte_thread_set_affinity_by_id(runtime_state->lcore_cfg[i].thread_id, + &runtime_state->lcore_cfg[i].cpuset); if (ret != 0) rte_panic("Cannot set affinity\n"); } diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index ffe930155a..9ef4b4e6f5 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -72,9 +72,6 @@ static struct flock wr_lock = { .l_len = RTE_SIZEOF_FIELD(struct rte_mem_config, memsegs), }; -/* internal configuration (per-core) */ -struct lcore_config lcore_config[RTE_MAX_LCORE]; - /* used by rte_rdtsc() */ RTE_EXPORT_SYMBOL(rte_cycles_vmware_tsc_map) int rte_cycles_vmware_tsc_map; @@ -519,6 +516,7 @@ eal_worker_thread_create(unsigned int lcore_id) size_t stack_size; int ret = -1; const struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); stack_size = user_cfg->huge_worker_stack_size; if (stack_size != 0) { @@ -545,7 +543,7 @@ eal_worker_thread_create(unsigned int lcore_id) } } - if (pthread_create((pthread_t *)&lcore_config[lcore_id].thread_id.opaque_id, + if (pthread_create((pthread_t *)&runtime_state->lcore_cfg[lcore_id].thread_id.opaque_id, attrp, eal_worker_thread_loop, (void *)(uintptr_t)lcore_id) == 0) ret = 0; @@ -570,7 +568,7 @@ rte_eal_init(int argc, char **argv) bool phys_addrs; const struct rte_config *config = rte_eal_get_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); - const struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + 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, @@ -825,13 +823,13 @@ rte_eal_init(int argc, char **argv) eal_check_mem_on_local_socket(); if (rte_thread_set_affinity_by_id(rte_thread_self(), - &lcore_config[config->main_lcore].cpuset) != 0) { + &runtime_state->lcore_cfg[config->main_lcore].cpuset) != 0) { rte_eal_init_alert("Cannot set affinity"); rte_errno = EINVAL; goto err_out; } __rte_thread_init(config->main_lcore, - &lcore_config[config->main_lcore].cpuset); + &runtime_state->lcore_cfg[config->main_lcore].cpuset); ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset)); EAL_LOG(DEBUG, "Main lcore %u is ready (tid=%zx;cpuset=[%s%s])", @@ -844,12 +842,12 @@ rte_eal_init(int argc, char **argv) * create communication pipes between main thread * and children */ - if (pipe(lcore_config[i].pipe_main2worker) < 0) + if (pipe(runtime_state->lcore_cfg[i].pipe_main2worker) < 0) rte_panic("Cannot create pipe\n"); - if (pipe(lcore_config[i].pipe_worker2main) < 0) + if (pipe(runtime_state->lcore_cfg[i].pipe_worker2main) < 0) rte_panic("Cannot create pipe\n"); - lcore_config[i].state = WAIT; + runtime_state->lcore_cfg[i].state = WAIT; /* create a thread for each lcore */ ret = eal_worker_thread_create(i); @@ -861,10 +859,10 @@ rte_eal_init(int argc, char **argv) if (ret >= RTE_THREAD_NAME_SIZE) EAL_LOG(INFO, "Worker thread name %s truncated", thread_name); - rte_thread_set_name(lcore_config[i].thread_id, thread_name); + rte_thread_set_name(runtime_state->lcore_cfg[i].thread_id, thread_name); - ret = rte_thread_set_affinity_by_id(lcore_config[i].thread_id, - &lcore_config[i].cpuset); + ret = rte_thread_set_affinity_by_id(runtime_state->lcore_cfg[i].thread_id, + &runtime_state->lcore_cfg[i].cpuset); if (ret != 0) rte_panic("Cannot set affinity\n"); } diff --git a/lib/eal/unix/eal_unix_thread.c b/lib/eal/unix/eal_unix_thread.c index ef6cbff0ee..1555078f96 100644 --- a/lib/eal/unix/eal_unix_thread.c +++ b/lib/eal/unix/eal_unix_thread.c @@ -12,8 +12,9 @@ int eal_thread_wake_worker(unsigned int worker_id) { - int m2w = lcore_config[worker_id].pipe_main2worker[1]; - int w2m = lcore_config[worker_id].pipe_worker2main[0]; + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + int m2w = runtime_state->lcore_cfg[worker_id].pipe_main2worker[1]; + int w2m = runtime_state->lcore_cfg[worker_id].pipe_worker2main[0]; char c = 0; int n; @@ -35,11 +36,12 @@ void eal_thread_wait_command(void) { unsigned int lcore_id = rte_lcore_id(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int m2w; char c; int n; - m2w = lcore_config[lcore_id].pipe_main2worker[0]; + m2w = runtime_state->lcore_cfg[lcore_id].pipe_main2worker[0]; do { n = read(m2w, &c, 1); } while (n < 0 && errno == EINTR); @@ -51,11 +53,12 @@ void eal_thread_ack_command(void) { unsigned int lcore_id = rte_lcore_id(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); char c = 0; int w2m; int n; - w2m = lcore_config[lcore_id].pipe_worker2main[1]; + w2m = runtime_state->lcore_cfg[lcore_id].pipe_worker2main[1]; do { n = write(w2m, &c, 1); } while (n == 0 || (n < 0 && errno == EINTR)); diff --git a/lib/eal/windows/eal.c b/lib/eal/windows/eal.c index 6e40c3d6d3..988352f867 100644 --- a/lib/eal/windows/eal.c +++ b/lib/eal/windows/eal.c @@ -39,9 +39,6 @@ */ static int mem_cfg_fd = -1; -/* internal configuration (per-core) */ -struct lcore_config lcore_config[RTE_MAX_LCORE]; - /* Detect if we are a primary or a secondary process */ enum rte_proc_type_t eal_proc_type_detect(void) @@ -159,6 +156,7 @@ rte_eal_init(int argc, char **argv) int i, fctret, bscan; const struct rte_config *config = rte_eal_get_configuration(); struct eal_user_cfg *user_cfg = eal_get_user_configuration(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); bool has_phys_addr; enum rte_iova_mode iova_mode; int ret; @@ -342,13 +340,13 @@ rte_eal_init(int argc, char **argv) eal_rand_init(); if (rte_thread_set_affinity_by_id(rte_thread_self(), - &lcore_config[config->main_lcore].cpuset) != 0) { + &runtime_state->lcore_cfg[config->main_lcore].cpuset) != 0) { rte_eal_init_alert("Cannot set affinity"); rte_errno = EINVAL; goto err_out; } __rte_thread_init(config->main_lcore, - &lcore_config[config->main_lcore].cpuset); + &runtime_state->lcore_cfg[config->main_lcore].cpuset); ret = eal_thread_dump_current_affinity(cpuset, sizeof(cpuset)); EAL_LOG(DEBUG, "Main lcore %u is ready (tid=%zx;cpuset=[%s%s])", @@ -361,17 +359,17 @@ rte_eal_init(int argc, char **argv) * create communication pipes between main thread * and children */ - if (_pipe(lcore_config[i].pipe_main2worker, + if (_pipe(runtime_state->lcore_cfg[i].pipe_main2worker, sizeof(char), _O_BINARY) < 0) rte_panic("Cannot create pipe\n"); - if (_pipe(lcore_config[i].pipe_worker2main, + if (_pipe(runtime_state->lcore_cfg[i].pipe_worker2main, sizeof(char), _O_BINARY) < 0) rte_panic("Cannot create pipe\n"); - lcore_config[i].state = WAIT; + runtime_state->lcore_cfg[i].state = WAIT; /* create a thread for each lcore */ - if (rte_thread_create(&lcore_config[i].thread_id, NULL, + if (rte_thread_create(&runtime_state->lcore_cfg[i].thread_id, NULL, eal_thread_loop, (void *)(uintptr_t)i) != 0) rte_panic("Cannot create thread\n"); @@ -380,10 +378,10 @@ rte_eal_init(int argc, char **argv) if (ret >= RTE_THREAD_NAME_SIZE) EAL_LOG(INFO, "Worker thread name %s truncated", thread_name); - rte_thread_set_name(lcore_config[i].thread_id, thread_name); + rte_thread_set_name(runtime_state->lcore_cfg[i].thread_id, thread_name); - ret = rte_thread_set_affinity_by_id(lcore_config[i].thread_id, - &lcore_config[i].cpuset); + ret = rte_thread_set_affinity_by_id(runtime_state->lcore_cfg[i].thread_id, + &runtime_state->lcore_cfg[i].cpuset); if (ret != 0) EAL_LOG(DEBUG, "Cannot set affinity"); } diff --git a/lib/eal/windows/eal_thread.c b/lib/eal/windows/eal_thread.c index 3eeb94a589..7dbba48ecb 100644 --- a/lib/eal/windows/eal_thread.c +++ b/lib/eal/windows/eal_thread.c @@ -20,8 +20,9 @@ int eal_thread_wake_worker(unsigned int worker_id) { - int m2w = lcore_config[worker_id].pipe_main2worker[1]; - int w2m = lcore_config[worker_id].pipe_worker2main[0]; + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); + int m2w = runtime_state->lcore_cfg[worker_id].pipe_main2worker[1]; + int w2m = runtime_state->lcore_cfg[worker_id].pipe_worker2main[0]; char c = 0; int n; @@ -43,11 +44,12 @@ void eal_thread_wait_command(void) { unsigned int lcore_id = rte_lcore_id(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int m2w; char c; int n; - m2w = lcore_config[lcore_id].pipe_main2worker[0]; + m2w = runtime_state->lcore_cfg[lcore_id].pipe_main2worker[0]; do { n = _read(m2w, &c, 1); } while (n < 0 && errno == EINTR); @@ -59,11 +61,12 @@ void eal_thread_ack_command(void) { unsigned int lcore_id = rte_lcore_id(); + struct eal_runtime_state *runtime_state = eal_get_runtime_state(); char c = 0; int w2m; int n; - w2m = lcore_config[lcore_id].pipe_worker2main[1]; + w2m = runtime_state->lcore_cfg[lcore_id].pipe_worker2main[1]; do { n = _write(w2m, &c, 1); } while (n == 0 || (n < 0 && errno == EINTR)); -- 2.51.0
