X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=e40c0995cd02d965b88f775864859f19a7c39d97;hb=093f56c5c5c8b0891e837beb1defd84bc165ac6a;hp=0560adecf66d192e6d50188a2be7601a9e8f09d3;hpb=b0fb94a346e52f36aeef238dd5f9bef9a10c14ef;p=sliver-openvswitch.git

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 0560adecf..e40c0995c 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -28,11 +28,13 @@
 #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"
 
@@ -44,23 +46,37 @@ struct dummy_stream {
     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 pstream *pstream;
-    struct dummy_stream *streams;
-    size_t n_streams;
+    /* In dummy_list. */
+    struct list list_node OVS_GUARDED_BY(dummy_list_mutex);
 
-    struct list rxes;           /* List of child "netdev_rx_dummy"s. */
-};
+    /* Protects all members below. */
+    struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex);
 
-static const struct netdev_class dummy_class;
+    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
@@ -75,7 +91,8 @@ struct netdev_rx_dummy {
 
 static unixctl_cb_func netdev_dummy_set_admin_state;
 static int netdev_dummy_construct(struct netdev *);
-static void netdev_dummy_poll_notify(struct netdev_dummy *);
+static void netdev_dummy_poll_notify(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 *);
@@ -103,15 +120,14 @@ netdev_rx_dummy_cast(const struct netdev_rx *rx)
 static void
 netdev_dummy_run(void)
 {
-    struct shash dummy_netdevs;
-    struct shash_node *node;
+    struct netdev_dummy *dev;
 
-    shash_init(&dummy_netdevs);
-    netdev_get_devices(&dummy_class, &dummy_netdevs);
-    SHASH_FOR_EACH (node, &dummy_netdevs) {
-        struct netdev_dummy *dev = node->data;
+    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;
@@ -203,9 +219,9 @@ netdev_dummy_run(void)
             }
         }
 
-        netdev_close(&dev->up);
+        ovs_mutex_unlock(&dev->mutex);
     }
-    shash_destroy(&dummy_netdevs);
+    ovs_mutex_unlock(&dummy_list_mutex);
 }
 
 static void
@@ -219,15 +235,13 @@ dummy_stream_close(struct dummy_stream *s)
 static void
 netdev_dummy_wait(void)
 {
-    struct shash dummy_netdevs;
-    struct shash_node *node;
+    struct netdev_dummy *dev;
 
-    shash_init(&dummy_netdevs);
-    netdev_get_devices(&dummy_class, &dummy_netdevs);
-    SHASH_FOR_EACH (node, &dummy_netdevs) {
-        struct netdev_dummy *dev = node->data;
+    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);
         }
@@ -240,9 +254,9 @@ netdev_dummy_wait(void)
             }
             stream_recv_wait(s->stream);
         }
-        netdev_close(&dev->up);
+        ovs_mutex_unlock(&dev->mutex);
     }
-    shash_destroy(&dummy_netdevs);
+    ovs_mutex_unlock(&dummy_list_mutex);
 }
 
 static struct netdev *
@@ -260,6 +274,9 @@ netdev_dummy_construct(struct netdev *netdev_)
     unsigned int n;
 
     atomic_add(&next_n, 1, &n);
+
+    ovs_mutex_init(&netdev->mutex);
+    ovs_mutex_lock(&netdev->mutex);
     netdev->hwaddr[0] = 0xaa;
     netdev->hwaddr[1] = 0x55;
     netdev->hwaddr[2] = n >> 24;
@@ -276,6 +293,11 @@ netdev_dummy_construct(struct netdev *netdev_)
     netdev->n_streams = 0;
 
     list_init(&netdev->rxes);
+    ovs_mutex_unlock(&netdev->mutex);
+
+    ovs_mutex_lock(&dummy_list_mutex);
+    list_push_back(&dummy_list, &netdev->list_node);
+    ovs_mutex_unlock(&dummy_list_mutex);
 
     return 0;
 }
@@ -286,11 +308,18 @@ 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
@@ -306,12 +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;
 }
 
@@ -320,7 +354,9 @@ 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");
@@ -340,6 +376,31 @@ netdev_dummy_set_config(struct netdev *netdev_, const struct smap *args)
             }
         }
     }
+
+    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;
 }
 
@@ -356,9 +417,11 @@ netdev_dummy_rx_construct(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_push_back(&netdev->rxes, &rx->node);
     list_init(&rx->recv_queue);
     rx->recv_queue_len = 0;
+    ovs_mutex_unlock(&netdev->mutex);
 
     return 0;
 }
@@ -367,9 +430,12 @@ 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
@@ -384,15 +450,23 @@ static int
 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;
     int retval;
 
-    if (list_is_empty(&rx->recv_queue)) {
+    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);
+
+    if (!packet) {
         return -EAGAIN;
     }
 
-    packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
-    rx->recv_queue_len--;
     if (packet->size <= size) {
         memcpy(buffer, packet->data, packet->size);
         retval = packet->size;
@@ -408,17 +482,26 @@ static void
 netdev_dummy_rx_wait(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);
     if (!list_is_empty(&rx->recv_queue)) {
         poll_immediate_wake();
     }
+    ovs_mutex_unlock(&netdev->mutex);
 }
 
 static int
 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;
 }
 
@@ -434,7 +517,10 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size)
         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;
         }
@@ -443,9 +529,18 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size)
         }
     }
 
+    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];
 
@@ -457,6 +552,7 @@ netdev_dummy_send(struct netdev *netdev, const void *buffer, size_t size)
             list_push_back(&s->txq, &b->list_node);
         }
     }
+    ovs_mutex_unlock(&dev->mutex);
 
     return 0;
 }
@@ -467,10 +563,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);
     }
+    ovs_mutex_unlock(&dev->mutex);
 
     return 0;
 }
@@ -479,18 +577,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;
 }
 
@@ -499,16 +603,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;
 }
 
@@ -517,7 +627,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;
 }
 
@@ -525,17 +638,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;
     }
@@ -546,13 +663,36 @@ netdev_dummy_update_flags(struct netdev *netdev_,
     if (*old_flagsp != netdev->flags) {
         netdev_dummy_poll_notify(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. */
@@ -606,7 +746,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 */
@@ -679,9 +821,14 @@ netdev_dummy_queue_packet__(struct netdev_rx_dummy *rx, struct ofpbuf *packet)
 
 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) {
@@ -722,10 +869,11 @@ netdev_dummy_receive(struct unixctl_conn *conn,
             goto exit;
         }
 
+        ovs_mutex_lock(&dummy_dev->mutex);
         dummy_dev->stats.rx_packets++;
         dummy_dev->stats.rx_bytes += packet->size;
-
         netdev_dummy_queue_packet(dummy_dev, packet);
+        ovs_mutex_unlock(&dummy_dev->mutex);
     }
 
     unixctl_command_reply(conn, NULL);
@@ -736,13 +884,14 @@ exit:
 
 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);
     }
 }
 
@@ -766,7 +915,10 @@ netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc,
         if (netdev && is_dummy_class(netdev->netdev_class)) {
             struct netdev_dummy *dummy_dev = netdev_dummy_cast(netdev);
 
+            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");
@@ -774,17 +926,15 @@ netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc,
             return;
         }
     } else {
-        struct shash dummy_netdevs;
-        struct shash_node *node;
-
-        shash_init(&dummy_netdevs);
-        netdev_get_devices(&dummy_class, &dummy_netdevs);
-        SHASH_FOR_EACH (node, &dummy_netdevs) {
-            struct netdev *netdev = node->data;
-            netdev_dummy_set_admin_state__(netdev_dummy_cast(netdev), up);
-            netdev_close(netdev);
+        struct netdev_dummy *netdev;
+
+        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);
         }
-        shash_destroy(&dummy_netdevs);
+        ovs_mutex_unlock(&dummy_list_mutex);
     }
     unixctl_command_reply(conn, "OK");
 }
@@ -805,13 +955,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);