New upstream version 18.11-rc1

[deb_dpdk.git] / lib / librte_eal / common / eal_common_bus.c

diff --git a/lib/librte_eal/common/eal_common_bus.c b/lib/librte_eal/common/eal_common_bus.c
index 08bec2d..c8f1901 100644 (file)
--- a/lib/librte_eal/common/eal_common_bus.c
+++ b/lib/librte_eal/common/eal_common_bus.c
@@ -35,10 +35,13 @@
 #include <sys/queue.h>
 
 #include <rte_bus.h>
+#include <rte_debug.h>
+#include <rte_string_fns.h>
+#include <rte_errno.h>
 
 #include "eal_private.h"
 
-struct rte_bus_list rte_bus_list =
+static struct rte_bus_list rte_bus_list =
        TAILQ_HEAD_INITIALIZER(rte_bus_list);
 
 void
@@ -73,11 +76,9 @@ rte_bus_scan(void)
 
        TAILQ_FOREACH(bus, &rte_bus_list, next) {
                ret = bus->scan();
-               if (ret) {
+               if (ret)
                        RTE_LOG(ERR, EAL, "Scan for (%s) bus failed.\n",
                                bus->name);
-                       return ret;
-               }
        }
 
        return 0;
@@ -97,20 +98,16 @@ rte_bus_probe(void)
                }
 
                ret = bus->probe();
-               if (ret) {
+               if (ret)
                        RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
                                bus->name);
-                       return ret;
-               }
        }
 
        if (vbus) {
                ret = vbus->probe();
-               if (ret) {
+               if (ret)
                        RTE_LOG(ERR, EAL, "Bus (%s) probe failed.\n",
                                vbus->name);
-                       return ret;
-               }
        }
 
        return 0;
@@ -152,15 +149,16 @@ struct rte_bus *
 rte_bus_find(const struct rte_bus *start, rte_bus_cmp_t cmp,
             const void *data)
 {
-       struct rte_bus *bus = NULL;
+       struct rte_bus *bus;
 
-       TAILQ_FOREACH(bus, &rte_bus_list, next) {
-               if (start && bus == start) {
-                       start = NULL; /* starting point found */
-                       continue;
-               }
+       if (start != NULL)
+               bus = TAILQ_NEXT(start, next);
+       else
+               bus = TAILQ_FIRST(&rte_bus_list);
+       while (bus != NULL) {
                if (cmp(bus, data) == 0)
                        break;
+               bus = TAILQ_NEXT(bus, next);
        }
        return bus;
 }
@@ -216,9 +214,74 @@ rte_bus_find_by_device_name(const char *str)
        char name[RTE_DEV_NAME_MAX_LEN];
        char *c;
 
-       snprintf(name, sizeof(name), "%s", str);
+       strlcpy(name, str, sizeof(name));
        c = strchr(name, ',');
        if (c != NULL)
                c[0] = '\0';
        return rte_bus_find(NULL, bus_can_parse, name);
 }
+
+
+/*
+ * Get iommu class of devices on the bus.
+ */
+enum rte_iova_mode
+rte_bus_get_iommu_class(void)
+{
+       int mode = RTE_IOVA_DC;
+       struct rte_bus *bus;
+
+       TAILQ_FOREACH(bus, &rte_bus_list, next) {
+
+               if (bus->get_iommu_class)
+                       mode |= bus->get_iommu_class();
+       }
+
+       if (mode != RTE_IOVA_VA) {
+               /* Use default IOVA mode */
+               mode = RTE_IOVA_PA;
+       }
+       return mode;
+}
+
+static int
+bus_handle_sigbus(const struct rte_bus *bus,
+                       const void *failure_addr)
+{
+       int ret;
+
+       if (!bus->sigbus_handler)
+               return -1;
+
+       ret = bus->sigbus_handler(failure_addr);
+
+       /* find bus but handle failed, keep the errno be set. */
+       if (ret < 0 && rte_errno == 0)
+               rte_errno = ENOTSUP;
+
+       return ret > 0;
+}
+
+int
+rte_bus_sigbus_handler(const void *failure_addr)
+{
+       struct rte_bus *bus;
+
+       int ret = 0;
+       int old_errno = rte_errno;
+
+       rte_errno = 0;
+
+       bus = rte_bus_find(NULL, bus_handle_sigbus, failure_addr);
+       /* can not find bus. */
+       if (!bus)
+               return 1;
+       /* find bus but handle failed, pass on the new errno. */
+       else if (rte_errno != 0)
+               return -1;
+
+       /* restore the old errno. */
+       rte_errno = old_errno;
+
+       return ret;
+}