X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=a1a666bddaa64aced1945007d2d390f08842db2c;hb=3f3879d205ab0df085c6d2ec13a39ee5d8b6242c;hp=417349d8d768dfac6c44bcefcb93594d0d904bbe;hpb=e9e28be359f64c03944c0a282c17e714fcb0afc4;p=openvswitch

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 417349d8..a1a666bd 100644
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -31,9 +31,9 @@
 #include <unistd.h>
 
 #include "dpif-provider.h"
-#include "netdev-linux.h"
 #include "ofpbuf.h"
 #include "poll-loop.h"
+#include "rtnetlink.h"
 #include "svec.h"
 #include "util.h"
 
@@ -45,10 +45,15 @@ struct dpif_linux {
     struct dpif dpif;
     int fd;
 
+    /* Used by dpif_linux_get_all_names(). */
+    char *local_ifname;
+    int minor;
+
     /* Change notification. */
     int local_ifindex;          /* Ifindex of local port. */
     struct svec changed_ports;  /* Ports that have changed. */
-    struct linux_netdev_notifier port_notifier;
+    struct rtnetlink_notifier port_notifier;
+    bool change_error;
 };
 
 static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5);
@@ -59,7 +64,7 @@ static int finish_open(struct dpif *, const char *local_ifname);
 static int create_minor(const char *name, int minor, struct dpif **dpifp);
 static int open_minor(int minor, struct dpif **dpifp);
 static int make_openvswitch_device(int minor, char **fnp);
-static void dpif_linux_port_changed(const struct linux_netdev_change *,
+static void dpif_linux_port_changed(const struct rtnetlink_change *,
                                     void *dpif);
 
 static struct dpif_linux *
@@ -69,16 +74,28 @@ dpif_linux_cast(const struct dpif *dpif)
     return CONTAINER_OF(dpif, struct dpif_linux, dpif);
 }
 
-static void
-dpif_linux_run(void)
-{
-    linux_netdev_notifier_run();
-}
-
-static void
-dpif_linux_wait(void)
+static int
+dpif_linux_enumerate(struct svec *all_dps)
 {
-    linux_netdev_notifier_wait();
+    int error;
+    int i;
+
+    error = 0;
+    for (i = 0; i < ODP_MAX; i++) {
+        struct dpif *dpif;
+        char devname[16];
+        int retval;
+
+        sprintf(devname, "dp%d", i);
+        retval = dpif_open(devname, &dpif);
+        if (!retval) {
+            svec_add(all_dps, devname);
+            dpif_close(dpif);
+        } else if (retval != ENODEV && !error) {
+            error = retval;
+        }
+    }
+    return error;
 }
 
 static int
@@ -87,7 +104,8 @@ dpif_linux_open(const char *name UNUSED, char *suffix, bool create,
 {
     int minor;
 
-    minor = !strncmp(name, "dp", 2) && isdigit(name[2]) ? atoi(name + 2) : -1;
+    minor = !strncmp(name, "dp", 2)
+            && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1;
     if (create) {
         if (minor >= 0) {
             return create_minor(suffix, minor, dpifp);
@@ -144,12 +162,23 @@ static void
 dpif_linux_close(struct dpif *dpif_)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
-    linux_netdev_notifier_unregister(&dpif->port_notifier);
+    rtnetlink_notifier_unregister(&dpif->port_notifier);
     svec_destroy(&dpif->changed_ports);
+    free(dpif->local_ifname);
     close(dpif->fd);
     free(dpif);
 }
 
+static int
+dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names)
+{
+    struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+
+    svec_add_nocopy(all_names, xasprintf("dp%d", dpif->minor));
+    svec_add(all_names, dpif->local_ifname);
+    return 0;
+}
+
 static int
 dpif_linux_delete(struct dpif *dpif_)
 {
@@ -246,29 +275,27 @@ static int
 dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
-    int error;
 
-    error = linux_netdev_notifier_get_error(&dpif->port_notifier);
-    if (!error) {
-        if (!dpif->changed_ports.n) {
-            return EAGAIN;
-        }
+    if (dpif->change_error) {
+        dpif->change_error = false;
+        svec_clear(&dpif->changed_ports);
+        return ENOBUFS;
+    } else if (dpif->changed_ports.n) {
         *devnamep = dpif->changed_ports.names[--dpif->changed_ports.n];
+        return 0;
     } else {
-        svec_clear(&dpif->changed_ports);
+        return EAGAIN;
     }
-    return error;
 }
 
 static void
 dpif_linux_port_poll_wait(const struct dpif *dpif_)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
-    if (dpif->changed_ports.n
-        || linux_netdev_notifier_peek_error(&dpif->port_notifier)) {
+    if (dpif->changed_ports.n || dpif->change_error) {
         poll_immediate_wake();
     } else {
-        linux_netdev_notifier_wait();
+        rtnetlink_notifier_wait();
     }
 }
 
@@ -413,10 +440,12 @@ dpif_linux_recv_wait(struct dpif *dpif_)
 const struct dpif_class dpif_linux_class = {
     "",                         /* This is the default class. */
     "linux",
-    dpif_linux_run,
-    dpif_linux_wait,
+    NULL,
+    NULL,
+    dpif_linux_enumerate,
     dpif_linux_open,
     dpif_linux_close,
+    dpif_linux_get_all_names,
     dpif_linux_delete,
     dpif_linux_get_stats,
     dpif_linux_get_drop_frags,
@@ -453,9 +482,10 @@ do_ioctl(const struct dpif *dpif_, int cmd, const void *arg)
 }
 
 static int
-lookup_minor(const char *name, int *minor)
+lookup_minor(const char *name, int *minorp)
 {
     struct ethtool_drvinfo drvinfo;
+    int minor, port_no;
     struct ifreq ifr;
     int error;
     int sock;
@@ -485,14 +515,20 @@ lookup_minor(const char *name, int *minor)
         goto error_close_sock;
     }
 
-    if (!isdigit(drvinfo.bus_info[0])) {
-        VLOG_WARN("%s ethtool info does not contain an openvswitch minor",
-                  name);
+    if (sscanf(drvinfo.bus_info, "%d.%d", &minor, &port_no) != 2) {
+        VLOG_WARN("%s ethtool bus_info has unexpected format", name);
         error = EPROTOTYPE;
         goto error_close_sock;
+    } else if (port_no != ODPP_LOCAL) {
+        /* This is an Open vSwitch device but not the local port.  We
+         * intentionally support only using the name of the local port as the
+         * name of a datapath; otherwise, it would be too difficult to
+         * enumerate all the names of a datapath. */
+        error = EOPNOTSUPP;
+        goto error_close_sock;
     }
 
-    *minor = atoi(drvinfo.bus_info);
+    *minorp = minor;
     close(sock);
     return 0;
 
@@ -621,6 +657,7 @@ static int
 finish_open(struct dpif *dpif_, const char *local_ifname)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+    dpif->local_ifname = strdup(local_ifname);
     dpif->local_ifindex = if_nametoindex(local_ifname);
     if (!dpif->local_ifindex) {
         int error = errno;
@@ -662,8 +699,8 @@ open_minor(int minor, struct dpif **dpifp)
     fd = open(fn, O_RDONLY | O_NONBLOCK);
     if (fd >= 0) {
         struct dpif_linux *dpif = xmalloc(sizeof *dpif);
-        error = linux_netdev_notifier_register(&dpif->port_notifier,
-                                               dpif_linux_port_changed, dpif);
+        error = rtnetlink_notifier_register(&dpif->port_notifier,
+                                           dpif_linux_port_changed, dpif);
         if (!error) {
             char *name;
 
@@ -672,8 +709,11 @@ open_minor(int minor, struct dpif **dpifp)
             free(name);
 
             dpif->fd = fd;
+            dpif->local_ifname = NULL;
+            dpif->minor = minor;
             dpif->local_ifindex = 0;
             svec_init(&dpif->changed_ports);
+            dpif->change_error = false;
             *dpifp = &dpif->dpif;
         } else {
             free(dpif);
@@ -688,19 +728,23 @@ open_minor(int minor, struct dpif **dpifp)
 }
 
 static void
-dpif_linux_port_changed(const struct linux_netdev_change *change, void *dpif_)
+dpif_linux_port_changed(const struct rtnetlink_change *change, void *dpif_)
 {
     struct dpif_linux *dpif = dpif_;
 
-    if (change->master_ifindex == dpif->local_ifindex
-        && (change->nlmsg_type == RTM_NEWLINK
-            || change->nlmsg_type == RTM_DELLINK))
-    {
-        /* Our datapath changed, either adding a new port or deleting an
-         * existing one. */
-        if (!svec_contains(&dpif->changed_ports, change->ifname)) {
-            svec_add(&dpif->changed_ports, change->ifname);
-            svec_sort(&dpif->changed_ports);
+    if (change) {
+        if (change->master_ifindex == dpif->local_ifindex
+            && (change->nlmsg_type == RTM_NEWLINK
+                || change->nlmsg_type == RTM_DELLINK))
+        {
+            /* Our datapath changed, either adding a new port or deleting an
+             * existing one. */
+            if (!svec_contains(&dpif->changed_ports, change->ifname)) {
+                svec_add(&dpif->changed_ports, change->ifname);
+                svec_sort(&dpif->changed_ports);
+            }
         }
+    } else {
+        dpif->change_error = true;
     }
 }