The file-static devopt_list in eal_common_options.c holds device options (-a/-b/--vdev) staged during arg parsing for later consumption by eal_option_device_parse(). Rather than holding this data as statics, store it in the user_cfg struct.
Signed-off-by: Bruce Richardson <[email protected]> --- lib/eal/common/eal_common_options.c | 21 ++++++--------------- lib/eal/common/eal_internal_cfg.h | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index dc6f4643c4..71fc69e80d 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -289,18 +289,6 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH; RTE_PMD_EXPORT_SYMBOL(const char, dpdk_solib_path)[] = "DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH; -TAILQ_HEAD(device_option_list, device_option); - -struct device_option { - TAILQ_ENTRY(device_option) next; - - enum rte_devtype type; - char arg[]; -}; - -static struct device_option_list devopt_list = -TAILQ_HEAD_INITIALIZER(devopt_list); - /* Returns rte_usage_hook_t */ rte_usage_hook_t eal_get_application_usage_hook(void) @@ -438,6 +426,7 @@ eal_clean_saved_args(void) static int eal_option_device_add(enum rte_devtype type, const char *arg) { + struct eal_user_cfg *user_cfg = eal_get_user_configuration(); struct device_option *devopt; size_t arglen; int ret; @@ -456,25 +445,26 @@ eal_option_device_add(enum rte_devtype type, const char *arg) free(devopt); return -EINVAL; } - TAILQ_INSERT_TAIL(&devopt_list, devopt, next); + TAILQ_INSERT_TAIL(&user_cfg->devopt_list, devopt, next); return 0; } int eal_option_device_parse(void) { + struct eal_user_cfg *user_cfg = eal_get_user_configuration(); struct device_option *devopt; void *tmp; int ret = 0; - RTE_TAILQ_FOREACH_SAFE(devopt, &devopt_list, next, tmp) { + RTE_TAILQ_FOREACH_SAFE(devopt, &user_cfg->devopt_list, next, tmp) { if (ret == 0) { ret = rte_devargs_add(devopt->type, devopt->arg); if (ret) EAL_LOG(ERR, "Unable to parse device '%s'", devopt->arg); } - TAILQ_REMOVE(&devopt_list, devopt, next); + TAILQ_REMOVE(&user_cfg->devopt_list, devopt, next); free(devopt); } return ret; @@ -498,6 +488,7 @@ eal_reset_internal_config(void) struct eal_runtime_state *runtime_state = eal_get_runtime_state(); int i; + TAILQ_INIT(&user_cfg->devopt_list); user_cfg->memory = 0; user_cfg->force_nrank = 0; user_cfg->force_nchannel = 0; diff --git a/lib/eal/common/eal_internal_cfg.h b/lib/eal/common/eal_internal_cfg.h index 47af403c27..4decc26d2c 100644 --- a/lib/eal/common/eal_internal_cfg.h +++ b/lib/eal/common/eal_internal_cfg.h @@ -10,6 +10,9 @@ #ifndef EAL_INTERNAL_CFG_H #define EAL_INTERNAL_CFG_H +#include <sys/queue.h> + +#include <rte_devargs.h> #include <rte_eal.h> #include <rte_os_shim.h> #include <rte_pci_dev_feature_defs.h> @@ -54,11 +57,23 @@ struct hugepage_file_discipline { bool unlink_existing; }; +/** + * A single device option (-a/-b/--vdev) staged during arg parsing. + * Lives in user_cfg->devopt_list; drained by eal_option_device_parse(). + */ +struct device_option { + TAILQ_ENTRY(device_option) next; + enum rte_devtype type; + char arg[]; +}; +TAILQ_HEAD(eal_devopt_list, device_option); + /** * User-provided EAL initialization configuration. * Immutable after initialization, so no need for atomic types or locks. */ struct eal_user_cfg { + struct eal_devopt_list devopt_list; /**< staged device options (-a/-b/--vdev) */ size_t memory; /**< amount of asked memory */ size_t huge_worker_stack_size; /**< worker thread stack size */ enum rte_proc_type_t process_type; /**< requested process type */ -- 2.51.0
