Merge branch 'mainstream'

[sliver-openvswitch.git] / lib / netdev-dummy.c

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index 7c43f12..8f3deb2 100644 (file)
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -44,28 +44,36 @@ 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;
 
+    /* In dummy_list. */
+    struct list list_node OVS_GUARDED_BY(dummy_list_mutex);
+
     /* Protects all members below. */
-    struct ovs_mutex mutex;
+    struct ovs_mutex mutex OVS_ACQ_AFTER(dummy_list_mutex);
 
-    uint8_t hwaddr[ETH_ADDR_LEN];
-    int mtu;
-    struct netdev_stats stats;
-    enum netdev_flags flags;
-    unsigned int change_seq;
-    int ifindex;
+    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;
-    struct dummy_stream *streams;
-    size_t n_streams;
+    struct pstream *pstream OVS_GUARDED;
+    struct dummy_stream *streams OVS_GUARDED;
+    size_t n_streams OVS_GUARDED;
 
-    struct list rxes;           /* List of child "netdev_rx_dummy"s. */
+    struct list rxes OVS_GUARDED; /* List of child "netdev_rx_dummy"s. */
 };
 
-static const struct netdev_class dummy_class;
-
 /* Max 'recv_queue_len' in struct netdev_dummy. */
 #define NETDEV_DUMMY_MAX_QUEUE 100
 
@@ -108,13 +116,10 @@ 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);
@@ -211,9 +216,8 @@ netdev_dummy_run(void)
         }
 
         ovs_mutex_unlock(&dev->mutex);
-        netdev_close(&dev->up);
     }
-    shash_destroy(&dummy_netdevs);
+    ovs_mutex_unlock(&dummy_list_mutex);
 }
 
 static void
@@ -227,13 +231,10 @@ 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);
@@ -250,9 +251,8 @@ netdev_dummy_wait(void)
             stream_recv_wait(s->stream);
         }
         ovs_mutex_unlock(&dev->mutex);
-        netdev_close(&dev->up);
     }
-    shash_destroy(&dummy_netdevs);
+    ovs_mutex_unlock(&dummy_list_mutex);
 }
 
 static struct netdev *
@@ -271,7 +271,8 @@ netdev_dummy_construct(struct netdev *netdev_)
 
     atomic_add(&next_n, 1, &n);
 
-    ovs_mutex_init(&netdev->mutex, PTHREAD_MUTEX_NORMAL);
+    ovs_mutex_init(&netdev->mutex);
+    ovs_mutex_lock(&netdev->mutex);
     netdev->hwaddr[0] = 0xaa;
     netdev->hwaddr[1] = 0x55;
     netdev->hwaddr[2] = n >> 24;
@@ -288,6 +289,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;
 }
@@ -298,11 +304,17 @@ 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);
 }
 
@@ -319,12 +331,15 @@ 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;
 }
 
@@ -472,7 +487,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;
         }
@@ -690,7 +708,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 */
@@ -863,22 +883,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;
-            struct netdev_dummy *netdev = netdev_dummy_cast(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);
-
-            netdev_close(netdev_);
         }
-        shash_destroy(&dummy_netdevs);
+        ovs_mutex_unlock(&dummy_list_mutex);
     }
     unixctl_command_reply(conn, "OK");
 }
@@ -899,6 +912,9 @@ 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;