*/
/* This file manages the list of devices and their arguments, as given
- * by the user at startup */
+ * by the user at startup
+ *
+ * Code here should not call rte_log since the EAL environment
+ * may not be initialized.
+ */
+#include <stdio.h>
#include <string.h>
-#include <rte_log.h>
-#include <rte_pci.h>
#include <rte_devargs.h>
#include "eal_private.h"
struct rte_devargs_list devargs_list =
TAILQ_HEAD_INITIALIZER(devargs_list);
-/* store a whitelist parameter for later parsing */
int
-rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
+rte_eal_parse_devargs_str(const char *devargs_str,
+ char **drvname, char **drvargs)
{
- struct rte_devargs *devargs;
- char buf[RTE_DEVARGS_LEN];
char *sep;
- int ret;
- ret = snprintf(buf, sizeof(buf), "%s", devargs_str);
- if (ret < 0 || ret >= (int)sizeof(buf)) {
- RTE_LOG(ERR, EAL, "user device args too large: <%s>\n",
- devargs_str);
+ if ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))
+ return -1;
+
+ *drvname = strdup(devargs_str);
+ if (*drvname == NULL)
return -1;
+
+ /* set the first ',' to '\0' to split name and arguments */
+ sep = strchr(*drvname, ',');
+ if (sep != NULL) {
+ sep[0] = '\0';
+ *drvargs = strdup(sep + 1);
+ } else {
+ *drvargs = strdup("");
}
- /* use malloc instead of rte_malloc as it's called early at init */
- devargs = malloc(sizeof(*devargs));
- if (devargs == NULL) {
- RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
+ if (*drvargs == NULL) {
+ free(*drvname);
+ *drvname = NULL;
return -1;
}
+ return 0;
+}
+
+static int
+bus_name_cmp(const struct rte_bus *bus, const void *name)
+{
+ return strncmp(bus->name, name, strlen(bus->name));
+}
+
+/* store a whitelist parameter for later parsing */
+int
+rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
+{
+ struct rte_devargs *devargs = NULL;
+ struct rte_bus *bus = NULL;
+ char *dev = NULL;
+ const char *devname;
+ int ret;
+
+ /* use malloc instead of rte_malloc as it's called early at init */
+ devargs = malloc(sizeof(*devargs));
+ if (devargs == NULL)
+ goto fail;
+
memset(devargs, 0, sizeof(*devargs));
devargs->type = devtype;
- /* set the first ';' to '\0' to split name and arguments */
- sep = strchr(buf, ';');
- if (sep != NULL) {
- sep[0] = '\0';
- snprintf(devargs->args, sizeof(devargs->args), "%s", sep + 1);
+ if (rte_eal_parse_devargs_str(devargs_str, &dev, &devargs->args))
+ goto fail;
+ devname = dev;
+ do {
+ bus = rte_bus_find(bus, bus_name_cmp, dev);
+ if (bus == NULL)
+ break;
+ devname = dev + strlen(bus->name) + 1;
+ if (rte_bus_find_by_device_name(devname) == bus)
+ break;
+ devname = dev;
+ } while (1);
+ if (bus == NULL) {
+ bus = rte_bus_find_by_device_name(devname);
+ if (bus == NULL) {
+ fprintf(stderr, "ERROR: failed to parse bus info from device declaration\n");
+ goto fail;
+ }
}
+ devargs->bus = bus;
- switch (devargs->type) {
- case RTE_DEVTYPE_WHITELISTED_PCI:
- case RTE_DEVTYPE_BLACKLISTED_PCI:
- /* try to parse pci identifier */
- if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
- eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
- RTE_LOG(ERR, EAL,
- "invalid PCI identifier <%s>\n", buf);
- free(devargs);
- return -1;
+ /* save device name. */
+ ret = snprintf(devargs->name, sizeof(devargs->name), "%s", devname);
+ if (ret < 0 || ret >= (int)sizeof(devargs->name))
+ goto fail;
+ if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) {
+ if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+ bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST;
+ } else if (bus->conf.scan_mode == RTE_BUS_SCAN_BLACKLIST) {
+ fprintf(stderr, "ERROR: incompatible device type and bus scan mode\n");
+ goto fail;
}
- break;
- case RTE_DEVTYPE_VIRTUAL:
- /* save driver name */
- ret = snprintf(devargs->virtual.drv_name,
- sizeof(devargs->virtual.drv_name), "%s", buf);
- if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
- RTE_LOG(ERR, EAL,
- "driver name too large: <%s>\n", buf);
- free(devargs);
- return -1;
+ } else if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) {
+ if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+ bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST;
+ } else if (bus->conf.scan_mode == RTE_BUS_SCAN_WHITELIST) {
+ fprintf(stderr, "ERROR: incompatible device type and bus scan mode\n");
+ goto fail;
}
- break;
}
+ free(dev);
TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
return 0;
+
+fail:
+ free(dev);
+ if (devargs) {
+ free(devargs->args);
+ free(devargs);
+ }
+
+ return -1;
}
/* count the number of devices of a specified type */
/* dump the user devices on the console */
void
-rte_eal_devargs_dump(void)
+rte_eal_devargs_dump(FILE *f)
{
struct rte_devargs *devargs;
- printf("User device white list:\n");
+ fprintf(f, "User device list:\n");
TAILQ_FOREACH(devargs, &devargs_list, next) {
- if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
- printf(" PCI whitelist " PCI_PRI_FMT " %s\n",
- devargs->pci.addr.domain,
- devargs->pci.addr.bus,
- devargs->pci.addr.devid,
- devargs->pci.addr.function,
- devargs->args);
- else if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
- printf(" PCI blacklist " PCI_PRI_FMT " %s\n",
- devargs->pci.addr.domain,
- devargs->pci.addr.bus,
- devargs->pci.addr.devid,
- devargs->pci.addr.function,
- devargs->args);
- else if (devargs->type == RTE_DEVTYPE_VIRTUAL)
- printf(" VIRTUAL %s %s\n",
- devargs->virtual.drv_name,
- devargs->args);
- else
- printf(" UNKNOWN %s\n", devargs->args);
+ fprintf(f, " [%s]: %s %s\n",
+ (devargs->bus ? devargs->bus->name : "??"),
+ devargs->name, devargs->args);
}
}