devargs: make device representation generic

[dpdk.git] / lib / librte_eal / common / eal_common_devargs.c

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 9b110f7..f668946 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -31,12 +31,15 @@
  */
 
 /* 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"
 
@@ -54,11 +57,8 @@ rte_eal_parse_devargs_str(const char *devargs_str,
                return -1;
 
        *drvname = strdup(devargs_str);
-       if (drvname == NULL) {
-               RTE_LOG(ERR, EAL,
-                       "cannot allocate temp memory for driver name\n");
+       if (*drvname == NULL)
                return -1;
-       }
 
        /* set the first ',' to '\0' to split name and arguments */
        sep = strchr(*drvname, ',');
@@ -70,66 +70,89 @@ rte_eal_parse_devargs_str(const char *devargs_str,
        }
 
        if (*drvargs == NULL) {
-               RTE_LOG(ERR, EAL,
-                       "cannot allocate temp memory for driver arguments\n");
                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;
-       char *buf = 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) {
-               RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
+       if (devargs == NULL)
                goto fail;
-       }
+
        memset(devargs, 0, sizeof(*devargs));
        devargs->type = devtype;
 
-       if (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))
+       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);
+       /* 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);
+       } 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(buf);
+       free(dev);
        TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
        return 0;
 
 fail:
-       if (devargs->args)
+       free(dev);
+       if (devargs) {
                free(devargs->args);
-       if (buf)
-               free(buf);
-       if (devargs)
                free(devargs);
+       }
+
        return -1;
 }
 
@@ -154,27 +177,10 @@ rte_eal_devargs_dump(FILE *f)
 {
        struct rte_devargs *devargs;
 
-       fprintf(f, "User device white list:\n");
+       fprintf(f, "User device list:\n");
        TAILQ_FOREACH(devargs, &devargs_list, next) {
-               if (devargs->type == RTE_DEVTYPE_WHITELISTED_PCI)
-                       fprintf(f, "  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)
-                       fprintf(f, "  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)
-                       fprintf(f, "  VIRTUAL %s %s\n",
-                              devargs->virtual.drv_name,
-                              devargs->args);
-               else
-                       fprintf(f, "  UNKNOWN %s\n", devargs->args);
+               fprintf(f, "  [%s]: %s %s\n",
+                       (devargs->bus ? devargs->bus->name : "??"),
+                       devargs->name, devargs->args);
        }
 }