[dpdk-dev,v2] eal: read and parse device option separately
Checks
Commit Message
When the EAL parses the common options given to the application,
not all subsystems are available. Some device drivers are registered
afterward upon dynamic plugin loading.
Devices using those drivers are thus unable to be parsed by any drivers
and are rejected.
Store the device options first and keep them for later processing.
Parse these right before initializing the buses, the drivers must have
been stabilized at this point.
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
v2:
- Fix the -w / -b incompatibility check.
It was checking that no two incompatible rte_devargs were inserted.
As rte_devargs are now generated right before buses scan, this check
was always correct, even when it should have failed.
lib/librte_eal/bsdapp/eal/eal.c | 5 ++
lib/librte_eal/common/eal_common_options.c | 79 ++++++++++++++++++++++++++++--
lib/librte_eal/common/eal_options.h | 1 +
lib/librte_eal/linuxapp/eal/eal.c | 5 ++
4 files changed, 85 insertions(+), 5 deletions(-)
Comments
Hi Gaetan
02/08/2017 10:56, Gaetan Rivet:
> When the EAL parses the common options given to the application,
> not all subsystems are available. Some device drivers are registered
> afterward upon dynamic plugin loading.
>
> Devices using those drivers are thus unable to be parsed by any drivers
> and are rejected.
>
> Store the device options first and keep them for later processing.
> Parse these right before initializing the buses, the drivers must have
> been stabilized at this point.
>
> Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
> ---
>
> v2:
>
> - Fix the -w / -b incompatibility check.
> It was checking that no two incompatible rte_devargs were inserted.
> As rte_devargs are now generated right before buses scan, this check
> was always correct, even when it should have failed.
You are doing this check in eal_check_common_options().
I think you can do the check earlier in eal_parse_common_option()
with 2 static variables, instead of implementing the
new function eal_option_device_type_count().
> +static unsigned int
> +eal_option_device_type_count(enum rte_devtype type)
[...]
> @@ -944,14 +1013,14 @@ eal_parse_common_option(int opt, const char *optarg,
> switch (opt) {
> /* blacklist */
> case 'b':
> - if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
> + if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,
> optarg) < 0) {
> return -1;
> }
> break;
> /* whitelist */
> case 'w':
> - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI,
> + if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
> optarg) < 0) {
> return -1;
> }
> @@ -1061,7 +1130,7 @@ eal_parse_common_option(int opt, const char *optarg,
> break;
>
> case OPT_VDEV_NUM:
> - if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL,
> + if (eal_option_device_add(RTE_DEVTYPE_VIRTUAL,
> optarg) < 0) {
> return -1;
> }
> @@ -1187,8 +1256,8 @@ eal_check_common_options(struct internal_config *internal_cfg)
> return -1;
> }
>
> - if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
> - rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
> + if (eal_option_device_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
> + eal_option_device_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
> RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
> "cannot be used at the same time\n");
> return -1;
[...]
> +static int
> +eal_option_device_add(enum rte_devtype type, const char *optarg)
> +{
> + struct device_option *deo;
> + size_t optlen;
Just a last comment about variable name:
Instead of deo, opt or option would be more meaningful.
Thanks for the important fix!
On Wed, Aug 02, 2017 at 04:29:13PM +0200, Thomas Monjalon wrote:
> Hi Gaetan
>
> 02/08/2017 10:56, Gaetan Rivet:
> > When the EAL parses the common options given to the application,
> > not all subsystems are available. Some device drivers are registered
> > afterward upon dynamic plugin loading.
> >
> > Devices using those drivers are thus unable to be parsed by any drivers
> > and are rejected.
> >
> > Store the device options first and keep them for later processing.
> > Parse these right before initializing the buses, the drivers must have
> > been stabilized at this point.
> >
> > Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
> > ---
> >
> > v2:
> >
> > - Fix the -w / -b incompatibility check.
> > It was checking that no two incompatible rte_devargs were inserted.
> > As rte_devargs are now generated right before buses scan, this check
> > was always correct, even when it should have failed.
>
> You are doing this check in eal_check_common_options().
> I think you can do the check earlier in eal_parse_common_option()
> with 2 static variables, instead of implementing the
> new function eal_option_device_type_count().
>
Okay, will simplify.
> > +static unsigned int
> > +eal_option_device_type_count(enum rte_devtype type)
> [...]
> > @@ -944,14 +1013,14 @@ eal_parse_common_option(int opt, const char *optarg,
> > switch (opt) {
> > /* blacklist */
> > case 'b':
> > - if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
> > + if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,
> > optarg) < 0) {
> > return -1;
> > }
> > break;
> > /* whitelist */
> > case 'w':
> > - if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI,
> > + if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
> > optarg) < 0) {
> > return -1;
> > }
> > @@ -1061,7 +1130,7 @@ eal_parse_common_option(int opt, const char *optarg,
> > break;
> >
> > case OPT_VDEV_NUM:
> > - if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL,
> > + if (eal_option_device_add(RTE_DEVTYPE_VIRTUAL,
> > optarg) < 0) {
> > return -1;
> > }
> > @@ -1187,8 +1256,8 @@ eal_check_common_options(struct internal_config *internal_cfg)
> > return -1;
> > }
> >
> > - if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
> > - rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
> > + if (eal_option_device_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
> > + eal_option_device_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
> > RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
> > "cannot be used at the same time\n");
> > return -1;
>
> [...]
> > +static int
> > +eal_option_device_add(enum rte_devtype type, const char *optarg)
> > +{
> > + struct device_option *deo;
> > + size_t optlen;
>
> Just a last comment about variable name:
> Instead of deo, opt or option would be more meaningful.
>
Will do.
> Thanks for the important fix!
@@ -614,6 +614,11 @@ rte_eal_init(int argc, char **argv)
rte_config.master_lcore, thread_id, cpuset,
ret == 0 ? "" : "...");
+ if (eal_option_device_parse()) {
+ rte_errno = ENODEV;
+ return -1;
+ }
+
if (rte_bus_scan()) {
rte_eal_init_alert("Cannot scan the buses for devices\n");
rte_errno = ENODEV;
@@ -47,6 +47,7 @@
#include <rte_eal.h>
#include <rte_log.h>
#include <rte_lcore.h>
+#include <rte_tailq.h>
#include <rte_version.h>
#include <rte_devargs.h>
#include <rte_memcpy.h>
@@ -125,11 +126,79 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;
static const char dpdk_solib_path[] __attribute__((used)) =
"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 optarg[];
+};
+
+static struct device_option_list devopt_list =
+TAILQ_HEAD_INITIALIZER(devopt_list);
static int master_lcore_parsed;
static int mem_parsed;
static int core_parsed;
+static int
+eal_option_device_add(enum rte_devtype type, const char *optarg)
+{
+ struct device_option *deo;
+ size_t optlen;
+ int ret;
+
+ optlen = strlen(optarg) + 1;
+ deo = calloc(1, sizeof(*deo) + optlen);
+ if (deo == NULL) {
+ RTE_LOG(ERR, EAL, "Unable to allocate device option\n");
+ return -ENOMEM;
+ }
+
+ deo->type = type;
+ ret = snprintf(deo->optarg, optlen, "%s", optarg);
+ if (ret < 0) {
+ RTE_LOG(ERR, EAL, "Unable to copy device option\n");
+ free(deo);
+ return -EINVAL;
+ }
+ TAILQ_INSERT_TAIL(&devopt_list, deo, next);
+ return 0;
+}
+
+static unsigned int
+eal_option_device_type_count(enum rte_devtype type)
+{
+ struct device_option *deo;
+ unsigned int count = 0;
+
+ TAILQ_FOREACH(deo, &devopt_list, next)
+ if (deo->type == type)
+ count++;
+ return count;
+}
+
+int
+eal_option_device_parse(void)
+{
+ struct device_option *deo;
+ void *tmp;
+ int ret = 0;
+
+ TAILQ_FOREACH_SAFE(deo, &devopt_list, next, tmp) {
+ if (ret == 0) {
+ ret = rte_eal_devargs_add(deo->type, deo->optarg);
+ if (ret)
+ RTE_LOG(ERR, EAL, "Unable to parse device '%s'\n",
+ deo->optarg);
+ }
+ TAILQ_REMOVE(&devopt_list, deo, next);
+ free(deo);
+ }
+ return ret;
+}
+
void
eal_reset_internal_config(struct internal_config *internal_cfg)
{
@@ -944,14 +1013,14 @@ eal_parse_common_option(int opt, const char *optarg,
switch (opt) {
/* blacklist */
case 'b':
- if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
+ if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,
optarg) < 0) {
return -1;
}
break;
/* whitelist */
case 'w':
- if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI,
+ if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
optarg) < 0) {
return -1;
}
@@ -1061,7 +1130,7 @@ eal_parse_common_option(int opt, const char *optarg,
break;
case OPT_VDEV_NUM:
- if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL,
+ if (eal_option_device_add(RTE_DEVTYPE_VIRTUAL,
optarg) < 0) {
return -1;
}
@@ -1187,8 +1256,8 @@ eal_check_common_options(struct internal_config *internal_cfg)
return -1;
}
- if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
- rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
+ if (eal_option_device_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
+ eal_option_device_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
"cannot be used at the same time\n");
return -1;
@@ -91,6 +91,7 @@ extern const struct option eal_long_options[];
int eal_parse_common_option(int opt, const char *argv,
struct internal_config *conf);
+int eal_option_device_parse(void);
int eal_adjust_config(struct internal_config *internal_cfg);
int eal_check_common_options(struct internal_config *internal_cfg);
void eal_common_usage(void);
@@ -889,6 +889,11 @@ rte_eal_init(int argc, char **argv)
return -1;
}
+ if (eal_option_device_parse()) {
+ rte_errno = ENODEV;
+ return -1;
+ }
+
if (rte_bus_scan()) {
rte_eal_init_alert("Cannot scan the buses for devices\n");
rte_errno = ENODEV;