X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=fd30454d67b96863e767939890a2894785ecdaba;hb=ac60863f78e412004c5b69f5a64a49bc6f0bc46d;hp=14b286bb94485dc7f9afd731b8d9e8eaedbe9be8;hpb=7c54c27f204ac9c7870ffab81aeba4d02336553a;p=sliver-openvswitch.git

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 14b286bb9..fd30454d6 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -28,45 +28,79 @@
 #include "ofp-print.h"
 #include "ofpbuf.h"
 #include "packets.h"
+#include "pcap-file.h"
 #include "poll-loop.h"
 #include "shash.h"
 #include "sset.h"
+#include "stream.h"
+#include "unaligned.h"
+#include "timeval.h"
 #include "unixctl.h"
 #include "vlog.h"
 
 VLOG_DEFINE_THIS_MODULE(netdev_dummy);
 
+struct dummy_stream {
+    struct stream *stream;
+    struct ofpbuf rxbuf;
+    struct list txq;
+};
+
+/* Protects 'dummy_list'. */
+static struct ovs_mutex dummy_list_mutex = OVS_MUTEX_INITIALIZER;
+
+/* Contains all 'struct dummy_dev's. */
+static struct list dummy_list OVS_GUARDED_BY(dummy_list_mutex)
+    = LIST_INITIALIZER(&dummy_list);
+
 struct netdev_dummy {
     struct netdev up;
-    uint8_t hwaddr[ETH_ADDR_LEN];
-    int mtu;
-    struct netdev_stats stats;
-    enum netdev_flags flags;
-    unsigned int change_seq;
-    int ifindex;
 
-    struct list rxes;           /* List of child "netdev_rx_dummy"s. */
+    /* In dummy_list. */
+    struct list list_node OVS_GUARDED_BY(dummy_list_mutex);
+
+    /* Protects all members below. */
+    struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex);
+
+    uint8_t hwaddr[ETH_ADDR_LEN] OVS_GUARDED;
+    int mtu OVS_GUARDED;
+    struct netdev_stats stats OVS_GUARDED;
+    enum netdev_flags flags OVS_GUARDED;
+    unsigned int change_seq OVS_GUARDED;
+    int ifindex OVS_GUARDED;
+
+    struct pstream *pstream OVS_GUARDED;
+    struct dummy_stream *streams OVS_GUARDED;
+    size_t n_streams OVS_GUARDED;
+
+    FILE *tx_pcap, *rx_pcap OVS_GUARDED;
+
+    struct list rxes OVS_GUARDED; /* List of child "netdev_rx_dummy"s. */
 };
 
+/* Max 'recv_queue_len' in struct netdev_dummy. */
+#define NETDEV_DUMMY_MAX_QUEUE 100
+
 struct netdev_rx_dummy {
     struct netdev_rx up;
     struct list node;           /* In netdev_dummy's "rxes" list. */
     struct list recv_queue;
+    int recv_queue_len;         /* list_size(&recv_queue). */
+    bool listening;
 };
 
-static struct shash dummy_netdevs = SHASH_INITIALIZER(&dummy_netdevs);
-
-static const struct netdev_rx_class netdev_rx_dummy_class;
-
 static unixctl_cb_func netdev_dummy_set_admin_state;
-static int netdev_dummy_create(const struct netdev_class *, const char *,
-                               struct netdev **);
-static void netdev_dummy_poll_notify(struct netdev_dummy *);
+static int netdev_dummy_construct(struct netdev *);
+static void netdev_dummy_changed(struct netdev_dummy *netdev)
+    OVS_REQUIRES(netdev->mutex);
+static void netdev_dummy_queue_packet(struct netdev_dummy *, struct ofpbuf *);
+
+static void dummy_stream_close(struct dummy_stream *);
 
 static bool
 is_dummy_class(const struct netdev_class *class)
 {
-    return class->create == netdev_dummy_create;
+    return class->construct == netdev_dummy_construct;
 }
 
 static struct netdev_dummy *
@@ -79,19 +113,170 @@ netdev_dummy_cast(const struct netdev *netdev)
 static struct netdev_rx_dummy *
 netdev_rx_dummy_cast(const struct netdev_rx *rx)
 {
-    netdev_rx_assert_class(rx, &netdev_rx_dummy_class);
+    ovs_assert(is_dummy_class(netdev_get_class(rx->netdev)));
     return CONTAINER_OF(rx, struct netdev_rx_dummy, up);
 }
 
+static void
+netdev_dummy_run(void)
+{
+    struct netdev_dummy *dev;
+
+    ovs_mutex_lock(&dummy_list_mutex);
+    LIST_FOR_EACH (dev, list_node, &dummy_list) {
+        size_t i;
+
+        ovs_mutex_lock(&dev->mutex);
+
+        if (dev->pstream) {
+            struct stream *new_stream;
+            int error;
+
+            error = pstream_accept(dev->pstream, &new_stream);
+            if (!error) {
+                struct dummy_stream *s;
+
+                dev->streams = xrealloc(dev->streams,
+                                        ((dev->n_streams + 1)
+                                         * sizeof *dev->streams));
+                s = &dev->streams[dev->n_streams++];
+                s->stream = new_stream;
+                ofpbuf_init(&s->rxbuf, 2048);
+                list_init(&s->txq);
+            } else if (error != EAGAIN) {
+                VLOG_WARN("%s: accept failed (%s)",
+                          pstream_get_name(dev->pstream), ovs_strerror(error));
+                pstream_close(dev->pstream);
+                dev->pstream = NULL;
+            }
+        }
+
+        for (i = 0; i < dev->n_streams; i++) {
+            struct dummy_stream *s = &dev->streams[i];
+            int error = 0;
+            size_t n;
+
+            stream_run(s->stream);
+
+            if (!list_is_empty(&s->txq)) {
+                struct ofpbuf *txbuf;
+                int retval;
+
+                txbuf = ofpbuf_from_list(list_front(&s->txq));
+                retval = stream_send(s->stream, txbuf->data, txbuf->size);
+                if (retval > 0) {
+                    ofpbuf_pull(txbuf, retval);
+                    if (!txbuf->size) {
+                        list_remove(&txbuf->list_node);
+                        ofpbuf_delete(txbuf);
+                    }
+                } else if (retval != -EAGAIN) {
+                    error = -retval;
+                }
+            }
+
+            if (!error) {
+                if (s->rxbuf.size < 2) {
+                    n = 2 - s->rxbuf.size;
+                } else {
+                    uint16_t frame_len;
+
+                    frame_len = ntohs(get_unaligned_be16(s->rxbuf.data));
+                    if (frame_len < ETH_HEADER_LEN) {
+                        error = EPROTO;
+                        n = 0;
+                    } else {
+                        n = (2 + frame_len) - s->rxbuf.size;
+                    }
+                }
+            }
+            if (!error) {
+                int retval;
+
+                ofpbuf_prealloc_tailroom(&s->rxbuf, n);
+                retval = stream_recv(s->stream, ofpbuf_tail(&s->rxbuf), n);
+                if (retval > 0) {
+                    s->rxbuf.size += retval;
+                    if (retval == n && s->rxbuf.size > 2) {
+                        ofpbuf_pull(&s->rxbuf, 2);
+                        netdev_dummy_queue_packet(dev,
+                                                  ofpbuf_clone(&s->rxbuf));
+                        ofpbuf_clear(&s->rxbuf);
+                    }
+                } else if (retval != -EAGAIN) {
+                    error = (retval < 0 ? -retval
+                             : s->rxbuf.size ? EPROTO
+                             : EOF);
+                }
+            }
+
+            if (error) {
+                VLOG_DBG("%s: closing connection (%s)",
+                         stream_get_name(s->stream),
+                         ovs_retval_to_string(error));
+                dummy_stream_close(&dev->streams[i]);
+                dev->streams[i] = dev->streams[--dev->n_streams];
+            }
+        }
+
+        ovs_mutex_unlock(&dev->mutex);
+    }
+    ovs_mutex_unlock(&dummy_list_mutex);
+}
+
+static void
+dummy_stream_close(struct dummy_stream *s)
+{
+    stream_close(s->stream);
+    ofpbuf_uninit(&s->rxbuf);
+    ofpbuf_list_delete(&s->txq);
+}
+
+static void
+netdev_dummy_wait(void)
+{
+    struct netdev_dummy *dev;
+
+    ovs_mutex_lock(&dummy_list_mutex);
+    LIST_FOR_EACH (dev, list_node, &dummy_list) {
+        size_t i;
+
+        ovs_mutex_lock(&dev->mutex);
+        if (dev->pstream) {
+            pstream_wait(dev->pstream);
+        }
+        for (i = 0; i < dev->n_streams; i++) {
+            struct dummy_stream *s = &dev->streams[i];
+
+            stream_run_wait(s->stream);
+            if (!list_is_empty(&s->txq)) {
+                stream_send_wait(s->stream);
+            }
+            stream_recv_wait(s->stream);
+        }
+        ovs_mutex_unlock(&dev->mutex);
+    }
+    ovs_mutex_unlock(&dummy_list_mutex);
+}
+
+static struct netdev *
+netdev_dummy_alloc(void)
+{
+    struct netdev_dummy *netdev = xzalloc(sizeof *netdev);
+    return &netdev->up;
+}
+
 static int
-netdev_dummy_create(const struct netdev_class *class, const char *name,
-                    struct netdev **netdevp)
+netdev_dummy_construct(struct netdev *netdev_)
 {
-    static unsigned int n = 0xaa550000;
-    struct netdev_dummy *netdev;
+    static atomic_uint next_n = ATOMIC_VAR_INIT(0xaa550000);
+    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    unsigned int n;
+
+    atomic_add(&next_n, 1, &n);
 
-    netdev = xzalloc(sizeof *netdev);
-    netdev_init(&netdev->up, name, class);
+    ovs_mutex_init(&netdev->mutex);
+    ovs_mutex_lock(&netdev->mutex);
     netdev->hwaddr[0] = 0xaa;
     netdev->hwaddr[1] = 0x55;
     netdev->hwaddr[2] = n >> 24;
@@ -102,24 +287,46 @@ netdev_dummy_create(const struct netdev_class *class, const char *name,
     netdev->flags = 0;
     netdev->change_seq = 1;
     netdev->ifindex = -EOPNOTSUPP;
-    list_init(&netdev->rxes);
 
-    shash_add(&dummy_netdevs, name, netdev);
+    netdev->pstream = NULL;
+    netdev->streams = NULL;
+    netdev->n_streams = 0;
 
-    n++;
+    list_init(&netdev->rxes);
+    ovs_mutex_unlock(&netdev->mutex);
 
-    *netdevp = &netdev->up;
+    ovs_mutex_lock(&dummy_list_mutex);
+    list_push_back(&dummy_list, &netdev->list_node);
+    ovs_mutex_unlock(&dummy_list_mutex);
 
     return 0;
 }
 
 static void
-netdev_dummy_destroy(struct netdev *netdev_)
+netdev_dummy_destruct(struct netdev *netdev_)
+{
+    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    size_t i;
+
+    ovs_mutex_lock(&dummy_list_mutex);
+    list_remove(&netdev->list_node);
+    ovs_mutex_unlock(&dummy_list_mutex);
+
+    ovs_mutex_lock(&netdev->mutex);
+    pstream_close(netdev->pstream);
+    for (i = 0; i < netdev->n_streams; i++) {
+        dummy_stream_close(&netdev->streams[i]);
+    }
+    free(netdev->streams);
+    ovs_mutex_unlock(&netdev->mutex);
+    ovs_mutex_destroy(&netdev->mutex);
+}
+
+static void
+netdev_dummy_dealloc(struct netdev *netdev_)
 {
     struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
 
-    shash_find_and_delete(&dummy_netdevs,
-                          netdev_get_name(netdev_));
     free(netdev);
 }
 
@@ -128,9 +335,17 @@ netdev_dummy_get_config(const struct netdev *netdev_, struct smap *args)
 {
     struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
 
+    ovs_mutex_lock(&netdev->mutex);
+
     if (netdev->ifindex >= 0) {
         smap_add_format(args, "ifindex", "%d", netdev->ifindex);
     }
+
+    if (netdev->pstream) {
+        smap_add(args, "pstream", pstream_get_name(netdev->pstream));
+    }
+
+    ovs_mutex_unlock(&netdev->mutex);
     return 0;
 }
 
@@ -138,84 +353,212 @@ static int
 netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args)
 {
     struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    const char *pstream;
+    const char *pcap;
 
+    ovs_mutex_lock(&netdev->mutex);
     netdev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP);
+
+    pstream = smap_get(args, "pstream");
+    if (!pstream
+        || !netdev->pstream
+        || strcmp(pstream_get_name(netdev->pstream), pstream)) {
+        pstream_close(netdev->pstream);
+        netdev->pstream = NULL;
+
+        if (pstream) {
+            int error;
+
+            error = pstream_open(pstream, &netdev->pstream, DSCP_DEFAULT);
+            if (error) {
+                VLOG_WARN("%s: open failed (%s)",
+                          pstream, ovs_strerror(error));
+            }
+        }
+    }
+
+    if (netdev->rx_pcap) {
+        fclose(netdev->rx_pcap);
+    }
+    if (netdev->tx_pcap && netdev->tx_pcap != netdev->rx_pcap) {
+        fclose(netdev->tx_pcap);
+    }
+    netdev->rx_pcap = netdev->tx_pcap = NULL;
+    pcap = smap_get(args, "pcap");
+    if (pcap) {
+        netdev->rx_pcap = netdev->tx_pcap = pcap_open(pcap, "ab");
+    } else {
+        const char *rx_pcap = smap_get(args, "rx_pcap");
+        const char *tx_pcap = smap_get(args, "tx_pcap");
+
+        if (rx_pcap) {
+            netdev->rx_pcap = pcap_open(rx_pcap, "ab");
+        }
+        if (tx_pcap) {
+            netdev->tx_pcap = pcap_open(tx_pcap, "ab");
+        }
+    }
+
+    ovs_mutex_unlock(&netdev->mutex);
+
     return 0;
 }
 
+static struct netdev_rx *
+netdev_dummy_rx_alloc(void)
+{
+    struct netdev_rx_dummy *rx = xzalloc(sizeof *rx);
+    return &rx->up;
+}
+
 static int
-netdev_dummy_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
+netdev_dummy_rx_construct(struct netdev_rx *rx_)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-    struct netdev_rx_dummy *rx;
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
 
-    rx = xmalloc(sizeof *rx);
-    netdev_rx_init(&rx->up, &netdev->up, &netdev_rx_dummy_class);
+    ovs_mutex_lock(&netdev->mutex);
     list_push_back(&netdev->rxes, &rx->node);
     list_init(&rx->recv_queue);
+    rx->recv_queue_len = 0;
+    ovs_mutex_unlock(&netdev->mutex);
 
-    *rxp = &rx->up;
     return 0;
 }
 
+static void
+netdev_dummy_rx_destruct(struct netdev_rx *rx_)
+{
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
+
+    ovs_mutex_lock(&netdev->mutex);
+    list_remove(&rx->node);
+    ofpbuf_list_delete(&rx->recv_queue);
+    ovs_mutex_unlock(&netdev->mutex);
+}
+
+static void
+netdev_dummy_rx_dealloc(struct netdev_rx *rx_)
+{
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+
+    free(rx);
+}
+
 static int
-netdev_rx_dummy_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_dummy_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
 {
     struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
     struct ofpbuf *packet;
-    size_t packet_size;
+    int retval;
 
-    if (list_is_empty(&rx->recv_queue)) {
-        return -EAGAIN;
+    ovs_mutex_lock(&netdev->mutex);
+    if (!list_is_empty(&rx->recv_queue)) {
+        packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
+        rx->recv_queue_len--;
+    } else {
+        packet = NULL;
     }
+    ovs_mutex_unlock(&netdev->mutex);
 
-    packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
-    if (packet->size > size) {
-        return -EMSGSIZE;
+    if (!packet) {
+        return -EAGAIN;
     }
-    packet_size = packet->size;
 
-    memcpy(buffer, packet->data, packet->size);
+    if (packet->size <= size) {
+        memcpy(buffer, packet->data, packet->size);
+        retval = packet->size;
+
+        ovs_mutex_lock(&netdev->mutex);
+        netdev->stats.rx_packets++;
+        netdev->stats.rx_bytes += packet->size;
+        ovs_mutex_unlock(&netdev->mutex);
+    } else {
+        retval = -EMSGSIZE;
+    }
     ofpbuf_delete(packet);
 
-    return packet_size;
+    return retval;
 }
 
 static void
-netdev_rx_dummy_destroy(struct netdev_rx *rx_)
+netdev_dummy_rx_wait(struct netdev_rx *rx_)
 {
     struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
-    list_remove(&rx->node);
-    ofpbuf_list_delete(&rx->recv_queue);
-    free(rx);
-}
+    struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
 
-static void
-netdev_rx_dummy_wait(struct netdev_rx *rx_)
-{
-    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    ovs_mutex_lock(&netdev->mutex);
     if (!list_is_empty(&rx->recv_queue)) {
         poll_immediate_wake();
     }
+    ovs_mutex_unlock(&netdev->mutex);
 }
 
 static int
-netdev_rx_dummy_drain(struct netdev_rx *rx_)
+netdev_dummy_rx_drain(struct netdev_rx *rx_)
 {
     struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    struct netdev_dummy *netdev = netdev_dummy_cast(rx->up.netdev);
+
+    ovs_mutex_lock(&netdev->mutex);
     ofpbuf_list_delete(&rx->recv_queue);
+    rx->recv_queue_len = 0;
+    ovs_mutex_unlock(&netdev->mutex);
+
     return 0;
 }
 
 static int
-netdev_dummy_send(struct netdev *netdev, const void *buffer OVS_UNUSED,
-                  size_t size)
+netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size)
 {
     struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+    size_t i;
+
+    if (size < ETH_HEADER_LEN) {
+        return EMSGSIZE;
+    } else {
+        const struct eth_header *eth = buffer;
+        int max_size;
+
+        ovs_mutex_lock(&dev->mutex);
+        max_size = dev->mtu + ETH_HEADER_LEN;
+        ovs_mutex_unlock(&dev->mutex);
 
+        if (eth->eth_type == htons(ETH_TYPE_VLAN)) {
+            max_size += VLAN_HEADER_LEN;
+        }
+        if (size > max_size) {
+            return EMSGSIZE;
+        }
+    }
+
+    ovs_mutex_lock(&dev->mutex);
     dev->stats.tx_packets++;
     dev->stats.tx_bytes += size;
 
+    if (dev->tx_pcap) {
+        struct ofpbuf packet;
+
+        ofpbuf_use_const(&packet, buffer, size);
+        pcap_write(dev->tx_pcap, &packet);
+        fflush(dev->tx_pcap);
+    }
+
+    for (i = 0; i < dev->n_streams; i++) {
+        struct dummy_stream *s = &dev->streams[i];
+
+        if (list_size(&s->txq) < NETDEV_DUMMY_MAX_QUEUE) {
+            struct ofpbuf *b;
+
+            b = ofpbuf_clone_data_with_headroom(buffer, size, 2);
+            put_unaligned_be16(ofpbuf_push_uninit(b, 2), htons(size));
+            list_push_back(&s->txq, &b->list_node);
+        }
+    }
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
@@ -225,10 +568,12 @@ netdev_dummy_set_etheraddr(struct netdev *netdev,
 {
     struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     if (!eth_addr_equals(dev->hwaddr, mac)) {
         memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
-        netdev_dummy_poll_notify(dev);
+        netdev_dummy_changed(dev);
     }
+    ovs_mutex_unlock(&dev->mutex);
 
     return 0;
 }
@@ -237,18 +582,24 @@ static int
 netdev_dummy_get_etheraddr(const struct netdev *netdev,
                            uint8_t mac[ETH_ADDR_LEN])
 {
-    const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+    struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
 static int
 netdev_dummy_get_mtu(const struct netdev *netdev, int *mtup)
 {
-    const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+    struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     *mtup = dev->mtu;
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
@@ -257,16 +608,22 @@ netdev_dummy_set_mtu(const struct netdev *netdev, int mtu)
 {
     struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     dev->mtu = mtu;
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
 static int
 netdev_dummy_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
 {
-    const struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+    struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     *stats = dev->stats;
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
@@ -275,7 +632,10 @@ netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
 {
     struct netdev_dummy *dev = netdev_dummy_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     dev->stats = *stats;
+    ovs_mutex_unlock(&dev->mutex);
+
     return 0;
 }
 
@@ -283,17 +643,21 @@ static int
 netdev_dummy_get_ifindex(const struct netdev *netdev)
 {
     struct netdev_dummy *dev = netdev_dummy_cast(netdev);
+    int ifindex;
 
-    return dev->ifindex;
+    ovs_mutex_lock(&dev->mutex);
+    ifindex = dev->ifindex;
+    ovs_mutex_unlock(&dev->mutex);
+
+    return ifindex;
 }
 
 static int
-netdev_dummy_update_flags(struct netdev *netdev_,
-                          enum netdev_flags off, enum netdev_flags on,
-                          enum netdev_flags *old_flagsp)
+netdev_dummy_update_flags__(struct netdev_dummy *netdev,
+                            enum netdev_flags off, enum netdev_flags on,
+                            enum netdev_flags *old_flagsp)
+    OVS_REQUIRES(netdev->mutex)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-
     if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
         return EINVAL;
     }
@@ -302,21 +666,44 @@ netdev_dummy_update_flags(struct netdev *netdev_,
     netdev->flags |= on;
     netdev->flags &= ~off;
     if (*old_flagsp != netdev->flags) {
-        netdev_dummy_poll_notify(netdev);
+        netdev_dummy_changed(netdev);
     }
+
     return 0;
 }
 
+static int
+netdev_dummy_update_flags(struct netdev *netdev_,
+                          enum netdev_flags off, enum netdev_flags on,
+                          enum netdev_flags *old_flagsp)
+{
+    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    int error;
+
+    ovs_mutex_lock(&netdev->mutex);
+    error = netdev_dummy_update_flags__(netdev, off, on, old_flagsp);
+    ovs_mutex_unlock(&netdev->mutex);
+
+    return error;
+}
+
 static unsigned int
-netdev_dummy_change_seq(const struct netdev *netdev)
+netdev_dummy_change_seq(const struct netdev *netdev_)
 {
-    return netdev_dummy_cast(netdev)->change_seq;
+    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    unsigned int change_seq;
+
+    ovs_mutex_lock(&netdev->mutex);
+    change_seq = netdev->change_seq;
+    ovs_mutex_unlock(&netdev->mutex);
+
+    return change_seq;
 }
 
 /* Helper functions. */
 
 static void
-netdev_dummy_poll_notify(struct netdev_dummy *dev)
+netdev_dummy_changed(struct netdev_dummy *dev)
 {
     dev->change_seq++;
     if (!dev->change_seq) {
@@ -327,17 +714,17 @@ netdev_dummy_poll_notify(struct netdev_dummy *dev)
 static const struct netdev_class dummy_class = {
     "dummy",
     NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
+    netdev_dummy_run,
+    netdev_dummy_wait,
 
-    netdev_dummy_create,
-    netdev_dummy_destroy,
+    netdev_dummy_alloc,
+    netdev_dummy_construct,
+    netdev_dummy_destruct,
+    netdev_dummy_dealloc,
     netdev_dummy_get_config,
     netdev_dummy_set_config,
     NULL,                       /* get_tunnel_config */
 
-    netdev_dummy_rx_open,
-
     netdev_dummy_send,          /* send */
     NULL,                       /* send_wait */
 
@@ -364,7 +751,9 @@ static const struct netdev_class dummy_class = {
     NULL,                       /* set_queue */
     NULL,                       /* delete_queue */
     NULL,                       /* get_queue_stats */
-    NULL,                       /* dump_queues */
+    NULL,                       /* queue_dump_start */
+    NULL,                       /* queue_dump_next */
+    NULL,                       /* queue_dump_done */
     NULL,                       /* dump_queue_stats */
 
     NULL,                       /* get_in4 */
@@ -377,14 +766,15 @@ static const struct netdev_class dummy_class = {
 
     netdev_dummy_update_flags,
 
-    netdev_dummy_change_seq
-};
+    netdev_dummy_change_seq,
 
-static const struct netdev_rx_class netdev_rx_dummy_class = {
-    netdev_rx_dummy_destroy,
-    netdev_rx_dummy_recv,
-    netdev_rx_dummy_wait,
-    netdev_rx_dummy_drain,
+    netdev_dummy_rx_alloc,
+    netdev_dummy_rx_construct,
+    netdev_dummy_rx_destruct,
+    netdev_dummy_rx_dealloc,
+    netdev_dummy_rx_recv,
+    netdev_dummy_rx_wait,
+    netdev_dummy_rx_drain,
 };
 
 static struct ofpbuf *
@@ -407,7 +797,7 @@ eth_from_packet_or_flow(const char *s)
      * settle for parsing a datapath key for now.
      */
     ofpbuf_init(&odp_key, 0);
-    error = odp_flow_key_from_string(s, NULL, &odp_key);
+    error = odp_flow_from_string(s, NULL, &odp_key, NULL);
     if (error) {
         ofpbuf_uninit(&odp_key);
         return NULL;
@@ -427,59 +817,84 @@ eth_from_packet_or_flow(const char *s)
     return packet;
 }
 
+static void
+netdev_dummy_queue_packet__(struct netdev_rx_dummy *rx, struct ofpbuf *packet)
+{
+    list_push_back(&rx->recv_queue, &packet->list_node);
+    rx->recv_queue_len++;
+}
+
+static void
+netdev_dummy_queue_packet(struct netdev_dummy *dummy, struct ofpbuf *packet)
+    OVS_REQUIRES(dummy->mutex)
+{
+    struct netdev_rx_dummy *rx, *prev;
+
+    if (dummy->rx_pcap) {
+        pcap_write(dummy->rx_pcap, packet);
+        fflush(dummy->rx_pcap);
+    }
+    prev = NULL;
+    LIST_FOR_EACH (rx, node, &dummy->rxes) {
+        if (rx->recv_queue_len < NETDEV_DUMMY_MAX_QUEUE) {
+            if (prev) {
+                netdev_dummy_queue_packet__(prev, ofpbuf_clone(packet));
+            }
+            prev = rx;
+        }
+    }
+    if (prev) {
+        netdev_dummy_queue_packet__(prev, packet);
+    } else {
+        ofpbuf_delete(packet);
+    }
+}
+
 static void
 netdev_dummy_receive(struct unixctl_conn *conn,
                      int argc, const char *argv[], void *aux OVS_UNUSED)
 {
     struct netdev_dummy *dummy_dev;
-    int n_listeners;
+    struct netdev *netdev;
     int i;
 
-    dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
-    if (!dummy_dev) {
+    netdev = netdev_from_name(argv[1]);
+    if (!netdev || !is_dummy_class(netdev->netdev_class)) {
         unixctl_command_reply_error(conn, "no such dummy netdev");
-        return;
+        goto exit;
     }
+    dummy_dev = netdev_dummy_cast(netdev);
 
-    n_listeners = 0;
     for (i = 2; i < argc; i++) {
-        struct netdev_rx_dummy *rx;
         struct ofpbuf *packet;
 
         packet = eth_from_packet_or_flow(argv[i]);
         if (!packet) {
             unixctl_command_reply_error(conn, "bad packet syntax");
-            return;
+            goto exit;
         }
 
-        dummy_dev->stats.rx_packets++;
-        dummy_dev->stats.rx_bytes += packet->size;
-
-        n_listeners = 0;
-        LIST_FOR_EACH (rx, node, &dummy_dev->rxes) {
-            struct ofpbuf *copy = ofpbuf_clone(packet);
-            list_push_back(&rx->recv_queue, &copy->list_node);
-            n_listeners++;
-        }
-        ofpbuf_delete(packet);
+        ovs_mutex_lock(&dummy_dev->mutex);
+        netdev_dummy_queue_packet(dummy_dev, packet);
+        ovs_mutex_unlock(&dummy_dev->mutex);
     }
 
-    if (!n_listeners) {
-        unixctl_command_reply(conn, "packets queued but nobody listened");
-    } else {
-        unixctl_command_reply(conn, "success");
-    }
+    unixctl_command_reply(conn, NULL);
+
+exit:
+    netdev_close(netdev);
 }
 
 static void
 netdev_dummy_set_admin_state__(struct netdev_dummy *dev, bool admin_state)
+    OVS_REQUIRES(dev->mutex)
 {
     enum netdev_flags old_flags;
 
     if (admin_state) {
-        netdev_dummy_update_flags(&dev->up, 0, NETDEV_UP, &old_flags);
+        netdev_dummy_update_flags__(dev, 0, NETDEV_UP, &old_flags);
     } else {
-        netdev_dummy_update_flags(&dev->up, NETDEV_UP, 0, &old_flags);
+        netdev_dummy_update_flags__(dev, NETDEV_UP, 0, &old_flags);
     }
 }
 
@@ -499,21 +914,30 @@ netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc,
     }
 
     if (argc > 2) {
-        struct netdev_dummy *dummy_dev;
+        struct netdev *netdev = netdev_from_name(argv[1]);
+        if (netdev && is_dummy_class(netdev->netdev_class)) {
+            struct netdev_dummy *dummy_dev = netdev_dummy_cast(netdev);
 
-        dummy_dev = shash_find_data(&dummy_netdevs, argv[1]);
-        if (dummy_dev) {
+            ovs_mutex_lock(&dummy_dev->mutex);
             netdev_dummy_set_admin_state__(dummy_dev, up);
+            ovs_mutex_unlock(&dummy_dev->mutex);
+
+            netdev_close(netdev);
         } else {
             unixctl_command_reply_error(conn, "Unknown Dummy Interface");
+            netdev_close(netdev);
             return;
         }
     } else {
-        struct shash_node *node;
+        struct netdev_dummy *netdev;
 
-        SHASH_FOR_EACH (node, &dummy_netdevs) {
-            netdev_dummy_set_admin_state__(node->data, up);
+        ovs_mutex_lock(&dummy_list_mutex);
+        LIST_FOR_EACH (netdev, list_node, &dummy_list) {
+            ovs_mutex_lock(&netdev->mutex);
+            netdev_dummy_set_admin_state__(netdev, up);
+            ovs_mutex_unlock(&netdev->mutex);
         }
+        ovs_mutex_unlock(&dummy_list_mutex);
     }
     unixctl_command_reply(conn, "OK");
 }
@@ -534,13 +958,22 @@ netdev_dummy_register(bool override)
         sset_init(&types);
         netdev_enumerate_types(&types);
         SSET_FOR_EACH (type, &types) {
+            if (!strcmp(type, "patch")) {
+                continue;
+            }
             if (!netdev_unregister_provider(type)) {
                 struct netdev_class *class;
+                int error;
 
-                class = xmalloc(sizeof *class);
-                *class = dummy_class;
+                class = xmemdup(&dummy_class, sizeof dummy_class);
                 class->type = xstrdup(type);
-                netdev_register_provider(class);
+                error = netdev_register_provider(class);
+                if (error) {
+                    VLOG_ERR("%s: failed to register netdev provider (%s)",
+                             type, ovs_strerror(error));
+                    free(CONST_CAST(char *, class->type));
+                    free(class);
+                }
             }
         }
         sset_destroy(&types);