ofpbuf: Add ofpbuf_new_with_headroom(), ofpbuf_clone_with_headroom().

[sliver-openvswitch.git] / lib / dpif-linux.c

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index 593127f..2c688e3 100644 (file)
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -23,22 +23,27 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <net/if.h>
+#include <linux/types.h>
 #include <linux/ethtool.h>
+#include <linux/pkt_sched.h>
 #include <linux/rtnetlink.h>
 #include <linux/sockios.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "dpif-provider.h"
+#include "netdev.h"
 #include "ofpbuf.h"
 #include "poll-loop.h"
 #include "rtnetlink.h"
+#include "shash.h"
 #include "svec.h"
 #include "util.h"
-
 #include "vlog.h"
-#define THIS_MODULE VLM_dpif_linux
+
+VLOG_DEFINE_THIS_MODULE(dpif_linux)
 
 /* Datapath interface for the openvswitch Linux kernel module. */
 struct dpif_linux {
@@ -51,7 +56,7 @@ struct dpif_linux {
 
     /* Change notification. */
     int local_ifindex;          /* Ifindex of local port. */
-    struct svec changed_ports;  /* Ports that have changed. */
+    struct shash changed_ports;  /* Ports that have changed. */
     struct rtnetlink_notifier port_notifier;
     bool change_error;
 };
@@ -171,7 +176,7 @@ dpif_linux_close(struct dpif *dpif_)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
     rtnetlink_notifier_unregister(&dpif->port_notifier);
-    svec_destroy(&dpif->changed_ports);
+    shash_destroy(&dpif->changed_ports);
     free(dpif->local_ifname);
     close(dpif->fd);
     free(dpif);
@@ -190,6 +195,28 @@ dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names)
 static int
 dpif_linux_destroy(struct dpif *dpif_)
 {
+    struct odp_port *ports;
+    size_t n_ports;
+    int err;
+    int i;
+
+    err = dpif_port_list(dpif_, &ports, &n_ports);
+    if (err) {
+        return err;
+    }
+
+    for (i = 0; i < n_ports; i++) {
+        if (ports[i].port != ODPP_LOCAL) {
+            err = do_ioctl(dpif_, ODP_VPORT_DEL, ports[i].devname);
+            if (err) {
+                VLOG_WARN_RL(&error_rl, "%s: error deleting port %s (%s)",
+                             dpif_name(dpif_), ports[i].devname, strerror(err));
+            }
+        }
+    }
+
+    free(ports);
+
     return do_ioctl(dpif_, ODP_DP_DESTROY, NULL);
 }
 
@@ -241,7 +268,27 @@ static int
 dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no)
 {
     int tmp = port_no;
-    return do_ioctl(dpif_, ODP_PORT_DETACH, &tmp);
+    int err;
+    struct odp_port port;
+
+    err = dpif_port_query_by_number(dpif_, port_no, &port);
+    if (err) {
+        return err;
+    }
+
+    err = do_ioctl(dpif_, ODP_PORT_DETACH, &tmp);
+    if (err) {
+        return err;
+    }
+
+    if (!netdev_is_open(port.devname)) {
+        /* Try deleting the port if no one has it open.  This shouldn't
+         * actually be necessary unless the config changed while we weren't
+         * running but it won't hurt anything if the port is already gone. */
+        do_ioctl(dpif_, ODP_VPORT_DEL, port.devname);
+    }
+
+    return 0;
 }
 
 static int
@@ -287,10 +334,12 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep)
 
     if (dpif->change_error) {
         dpif->change_error = false;
-        svec_clear(&dpif->changed_ports);
+        shash_clear(&dpif->changed_ports);
         return ENOBUFS;
-    } else if (dpif->changed_ports.n) {
-        *devnamep = dpif->changed_ports.names[--dpif->changed_ports.n];
+    } else if (!shash_is_empty(&dpif->changed_ports)) {
+        struct shash_node *node = shash_first(&dpif->changed_ports);
+        *devnamep = xstrdup(node->name);
+        shash_delete(&dpif->changed_ports, node);
         return 0;
     } else {
         return EAGAIN;
@@ -301,7 +350,7 @@ static void
 dpif_linux_port_poll_wait(const struct dpif *dpif_)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
-    if (dpif->changed_ports.n || dpif->change_error) {
+    if (!shash_is_empty(&dpif->changed_ports) || dpif->change_error) {
         poll_immediate_wake();
     } else {
         rtnetlink_notifier_wait();
@@ -409,6 +458,18 @@ dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability)
     return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability);
 }
 
+static int
+dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED,
+                             uint32_t queue_id, uint32_t *priority)
+{
+    if (queue_id < 0xf000) {
+        *priority = TC_H_MAKE(1 << 16, queue_id + 1);
+        return 0;
+    } else {
+        return EINVAL;
+    }
+}
+
 static int
 dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
 {
@@ -417,7 +478,7 @@ dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
     int retval;
     int error;
 
-    buf = ofpbuf_new(65536);
+    buf = ofpbuf_new_with_headroom(65536, DPIF_RECV_MSG_PADDING);
     retval = read(dpif->fd, ofpbuf_tail(buf), ofpbuf_tailroom(buf));
     if (retval < 0) {
         error = errno;
@@ -490,6 +551,7 @@ const struct dpif_class dpif_linux_class = {
     dpif_linux_recv_set_mask,
     dpif_linux_get_sflow_probability,
     dpif_linux_set_sflow_probability,
+    dpif_linux_queue_to_priority,
     dpif_linux_recv,
     dpif_linux_recv_wait,
 };
@@ -742,7 +804,7 @@ open_minor(int minor, struct dpif **dpifp)
             dpif->local_ifname = NULL;
             dpif->minor = minor;
             dpif->local_ifindex = 0;
-            svec_init(&dpif->changed_ports);
+            shash_init(&dpif->changed_ports);
             dpif->change_error = false;
             *dpifp = &dpif->dpif;
         } else {
@@ -769,10 +831,7 @@ dpif_linux_port_changed(const struct rtnetlink_change *change, void *dpif_)
         {
             /* 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);
-            }
+            shash_add_once(&dpif->changed_ports, change->ifname, NULL);
         }
     } else {
         dpif->change_error = true;