Add the new "--remap-lcore-ids" or "-R" option to signify that lcore ids are to start at a low range. This takes an optional parameter to specify the value to start from. Initially, use this to adjust the core mappings when using a coremask.
As well as remapping within the range of RTE_MAX_LCORE, to allow use of cores >=RTE_MAX_LCORE we need to expand the internal arrays of cores to be CPU_SETSIZE big, and limit the checks for RTE_MAX_LCORE to only cases where we are not remapping. This requires an additional parameter to the internal API rte_eal_parse_coremask, having a small knock-on effect on DLB driver as the only other user of this API. Signed-off-by: Bruce Richardson <[email protected]> --- drivers/event/dlb2/dlb2_priv.h | 2 +- drivers/event/dlb2/pf/base/dlb2_resource.c | 4 +- lib/eal/common/eal_common_options.c | 54 +++++++++++++++++----- lib/eal/common/eal_option_list.h | 1 + lib/eal/include/rte_eal.h | 6 ++- 5 files changed, 50 insertions(+), 17 deletions(-) diff --git a/drivers/event/dlb2/dlb2_priv.h b/drivers/event/dlb2/dlb2_priv.h index 7a5cbcca1e..6e0a5bc936 100644 --- a/drivers/event/dlb2/dlb2_priv.h +++ b/drivers/event/dlb2/dlb2_priv.h @@ -750,7 +750,7 @@ void dlb2_event_build_hcws(struct dlb2_port *qm_port, uint8_t *queue_id); /* Extern functions */ -extern int rte_eal_parse_coremask(const char *coremask, int *cores); +extern int rte_eal_parse_coremask(const char *coremask, int *cores, bool limit_range); /* Extern globals */ extern struct process_local_port_data dlb2_port[][DLB2_NUM_PORT_TYPES]; diff --git a/drivers/event/dlb2/pf/base/dlb2_resource.c b/drivers/event/dlb2/pf/base/dlb2_resource.c index 98f2f5ef92..6742c470f1 100644 --- a/drivers/event/dlb2/pf/base/dlb2_resource.c +++ b/drivers/event/dlb2/pf/base/dlb2_resource.c @@ -922,13 +922,13 @@ dlb2_resource_probe(struct dlb2_hw *hw, const void *probe_args) { const struct dlb2_devargs *args = (const struct dlb2_devargs *)probe_args; const char *mask = args ? args->producer_coremask : NULL; - int cpu = 0, cnt = 0, cores[RTE_MAX_LCORE], i; + int cpu = 0, cnt = 0, cores[CPU_SETSIZE], i; if (args) { mask = (const char *)args->producer_coremask; } - if (mask && rte_eal_parse_coremask(mask, cores)) { + if (mask && rte_eal_parse_coremask(mask, cores, true)) { DLB2_HW_ERR(hw, ": Invalid producer coremask=%s\n", mask); return -1; } diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index 1faad61e37..139f116d1b 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -842,26 +842,38 @@ eal_parse_service_coremask(const char *coremask) } static int -update_lcore_config(int *cores) +update_lcore_config(int *cores, bool remap, uint16_t remap_base) { struct rte_config *cfg = rte_eal_get_configuration(); unsigned int count = 0; unsigned int i; + unsigned int lcore_id = remap_base; int ret = 0; + /* 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; + } + + /* now go through the core mask */ + for (i = 0; i < CPU_SETSIZE; i++) { if (cores[i] != -1) { if (eal_cpu_detected(i) == 0) { EAL_LOG(ERR, "lcore %u unavailable", i); ret = -1; continue; } - cfg->lcore_role[i] = ROLE_RTE; + if (!remap) + lcore_id = i; + cfg->lcore_role[lcore_id] = ROLE_RTE; + lcore_config[lcore_id].core_index = cores[i]; + CPU_ZERO(&lcore_config[lcore_id].cpuset); + CPU_SET(i, &lcore_config[lcore_id].cpuset); + EAL_LOG(DEBUG, "lcore %u mapped to physical core %u", lcore_id, i); + lcore_id++; count++; - } else { - cfg->lcore_role[i] = ROLE_OFF; } - lcore_config[i].core_index = cores[i]; } if (!ret) cfg->lcore_count = count; @@ -908,16 +920,16 @@ check_core_list(int *lcores, unsigned int count) RTE_EXPORT_INTERNAL_SYMBOL(rte_eal_parse_coremask) int -rte_eal_parse_coremask(const char *coremask, int *cores) +rte_eal_parse_coremask(const char *coremask, int *cores, bool limit_range) { const char *coremask_orig = coremask; - int lcores[RTE_MAX_LCORE]; + int lcores[CPU_SETSIZE]; unsigned int count = 0; int i, j, idx; int val; char c; - for (idx = 0; idx < RTE_MAX_LCORE; idx++) + for (idx = 0; idx < CPU_SETSIZE; idx++) cores[idx] = -1; idx = 0; @@ -958,6 +970,11 @@ rte_eal_parse_coremask(const char *coremask, int *cores) RTE_MAX_LCORE); return -1; } + if (idx >= CPU_SETSIZE) { + EAL_LOG(ERR, "lcore %d >= CPU_SETSIZE (%d), cannot use.", + idx, CPU_SETSIZE); + return -1; + } lcores[count++] = idx; } } @@ -968,7 +985,8 @@ rte_eal_parse_coremask(const char *coremask, int *cores) return -1; } - if (check_core_list(lcores, count)) + /* if we are asked to, we need to check that cores < RTE_MAX_LCORE */ + if (limit_range && check_core_list(lcores, count) != 0) return -1; /* @@ -1867,6 +1885,8 @@ eal_parse_args(void) struct internal_config *int_cfg = eal_get_internal_configuration(); struct rte_config *rte_cfg = rte_eal_get_configuration(); struct arg_list_elem *arg; + bool remap_lcores = (args.remap_lcore_ids != NULL); + uint16_t lcore_id_base = 0; /* print version before anything else */ /* since message is explicitly requested by user, we write message @@ -1900,15 +1920,25 @@ eal_parse_args(void) if (eal_plugin_add(arg->arg) < 0) return -1; + if (remap_lcores && args.remap_lcore_ids != (void *)1) { + char *endp; + errno = 0; + lcore_id_base = (uint16_t)strtoul(args.remap_lcore_ids, &endp, 0); + if (errno != 0 || lcore_id_base >= RTE_MAX_LCORE || *endp != '\0') { + EAL_LOG(ERR, "invalid lcore base id: %s", args.remap_lcore_ids); + return -1; + } + } + /* parse the core list arguments */ if (args.coremask != NULL) { - int lcore_indexes[RTE_MAX_LCORE]; + int lcore_indexes[CPU_SETSIZE]; - if (rte_eal_parse_coremask(args.coremask, lcore_indexes) < 0) { + if (rte_eal_parse_coremask(args.coremask, lcore_indexes, !remap_lcores) < 0) { EAL_LOG(ERR, "invalid coremask syntax"); return -1; } - if (update_lcore_config(lcore_indexes) < 0) { + if (update_lcore_config(lcore_indexes, remap_lcores, lcore_id_base) < 0) { char *available = available_cores(); EAL_LOG(ERR, "invalid coremask '%s', please check specified cores are part of %s", diff --git a/lib/eal/common/eal_option_list.h b/lib/eal/common/eal_option_list.h index f5c21c8376..e4a849e78e 100644 --- a/lib/eal/common/eal_option_list.h +++ b/lib/eal/common/eal_option_list.h @@ -57,6 +57,7 @@ BOOL_ARG("--no-pci", NULL, "Disable all PCI devices", no_pci) BOOL_ARG("--no-shconf", NULL, "Disable shared config file generation", no_shconf) BOOL_ARG("--no-telemetry", NULL, "Disable telemetry", no_telemetry) STR_ARG("--proc-type", NULL, "Type of process (primary|secondary|auto)", proc_type) +OPT_STR_ARG("--remap-lcore-ids", "-R", "Remap lcore IDs to be contiguous starting from 0, or supplied value", remap_lcore_ids) STR_ARG("--service-corelist", "-S", "List of cores to use for service threads", service_corelist) STR_ARG("--service-coremask", "-s", "[Deprecated] Bitmask of cores to use for service threads", service_coremask) BOOL_ARG("--single-file-segments", NULL, "Store all pages within single files (per-page-size, per-node)", single_file_segments) diff --git a/lib/eal/include/rte_eal.h b/lib/eal/include/rte_eal.h index 08977c61d3..bc58254ece 100644 --- a/lib/eal/include/rte_eal.h +++ b/lib/eal/include/rte_eal.h @@ -503,13 +503,15 @@ rte_eal_get_runtime_dir(void); * A string describing a mask of core ids. * @param cores * An array where to store the core ids orders. - * This array must be at least RTE_MAX_LCORE large. + * This array must be at least CPU_SETSIZE large. + * @param limit_range + * If set, return an error if any cores in the mask are >= RTE_MAX_LCORE. * @return * 0 on success, -1 if the string content was invalid. */ __rte_internal int -rte_eal_parse_coremask(const char *coremask, int *cores); +rte_eal_parse_coremask(const char *coremask, int *cores, bool limit_range); #ifdef __cplusplus } -- 2.48.1
