eal: set affinity for control threads

[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 f0c3291..6ac88d6 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -40,7 +40,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <rte_dev.h>
 #include <rte_devargs.h>
+#include <rte_tailq.h>
 #include "eal_private.h"
 
 /** Global list of user devices */
@@ -83,71 +85,101 @@ 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)
+rte_eal_devargs_parse(const char *dev, struct rte_devargs *da)
 {
-       struct rte_devargs *devargs = NULL;
        struct rte_bus *bus = NULL;
-       char *dev = NULL;
        const char *devname;
-       int ret;
+       const size_t maxlen = sizeof(da->name);
+       size_t i;
 
-       /* 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;
-
-       if (rte_eal_parse_devargs_str(devargs_str, &dev, &devargs->args))
-               goto fail;
-       devname = dev;
+       if (dev == NULL || da == NULL)
+               return -EINVAL;
+       /* Retrieve eventual bus info */
        do {
+               devname = dev;
                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);
+       /* Store device name */
+       i = 0;
+       while (devname[i] != '\0' && devname[i] != ',') {
+               da->name[i] = devname[i];
+               i++;
+               if (i == maxlen) {
+                       fprintf(stderr, "WARNING: Parsing \"%s\": device name should be shorter than %zu\n",
+                               dev, maxlen);
+                       da->name[i - 1] = '\0';
+                       return -EINVAL;
+               }
+       }
+       da->name[i] = '\0';
        if (bus == NULL) {
-               bus = rte_bus_find_by_device_name(devname);
+               bus = rte_bus_find_by_device_name(da->name);
                if (bus == NULL) {
-                       fprintf(stderr, "ERROR: failed to parse bus info from device declaration\n");
-                       goto fail;
+                       fprintf(stderr, "ERROR: failed to parse device \"%s\"\n",
+                               da->name);
+                       return -EFAULT;
                }
        }
-       devargs->bus = bus;
+       da->bus = bus;
+       /* Parse eventual device arguments */
+       if (devname[i] == ',')
+               da->args = strdup(&devname[i + 1]);
+       else
+               da->args = strdup("");
+       if (da->args == NULL) {
+               fprintf(stderr, "ERROR: not enough memory to parse arguments\n");
+               return -ENOMEM;
+       }
+       return 0;
+}
+
+int
+rte_eal_devargs_insert(struct rte_devargs *da)
+{
+       int ret;
+
+       ret = rte_eal_devargs_remove(da->bus->name, da->name);
+       if (ret < 0)
+               return ret;
+       TAILQ_INSERT_TAIL(&devargs_list, da, next);
+       return 0;
+}
+
+/* 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;
+       const char *dev = devargs_str;
+
+       /* use calloc instead of rte_zmalloc as it's called early at init */
+       devargs = calloc(1, sizeof(*devargs));
+       if (devargs == NULL)
+               goto fail;
 
-       /* save device name. */
-       ret = snprintf(devargs->name, sizeof(devargs->name), "%s", devname);
-       if (ret < 0 || ret >= (int)sizeof(devargs->name))
+       if (rte_eal_devargs_parse(dev, devargs))
                goto fail;
-       if (devargs->type == RTE_DEVTYPE_WHITELISTED) {
-               if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+       devargs->type = devtype;
+       bus = devargs->bus;
+       if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI)
+               devargs->policy = RTE_DEV_BLACKLISTED;
+       if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+               if (devargs->policy == RTE_DEV_WHITELISTED)
                        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;
-               }
-       } else if (devargs->type == RTE_DEVTYPE_BLACKLISTED) {
-               if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) {
+               else if (devargs->policy == RTE_DEV_BLACKLISTED)
                        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;
-               }
        }
-
-       free(dev);
        TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
        return 0;
 
 fail:
-       free(dev);
        if (devargs) {
                free(devargs->args);
                free(devargs);
@@ -156,6 +188,24 @@ fail:
        return -1;
 }
 
+int
+rte_eal_devargs_remove(const char *busname, const char *devname)
+{
+       struct rte_devargs *d;
+       void *tmp;
+
+       TAILQ_FOREACH_SAFE(d, &devargs_list, next, tmp) {
+               if (strcmp(d->bus->name, busname) == 0 &&
+                   strcmp(d->name, devname) == 0) {
+                       TAILQ_REMOVE(&devargs_list, d, next);
+                       free(d->args);
+                       free(d);
+                       return 0;
+               }
+       }
+       return 1;
+}
+
 /* count the number of devices of a specified type */
 unsigned int
 rte_eal_devargs_type_count(enum rte_devtype devtype)