X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=6b54697536aa6fa6b0dc4aaa391b716f1b60eff9;hb=90b4feffb9a9031775b949090db6c1c3f963779a;hp=f8bc74bb18fcc15d20dbd85f2a0a8cba8cbc7ed5;hpb=b0fb94a346e52f36aeef238dd5f9bef9a10c14ef;p=sliver-openvswitch.git

diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
index f8bc74bb1..6b5469753 100644
--- a/lib/netdev-tunnel.c
+++ b/lib/netdev-tunnel.c
@@ -40,6 +40,10 @@ VLOG_DEFINE_THIS_MODULE(netdev_tunnel);
 
 struct netdev_tunnel {
     struct netdev up;
+
+    /* Protects all members below. */
+    struct ovs_mutex mutex;
+
     uint8_t hwaddr[ETH_ADDR_LEN];
     struct netdev_stats stats;
     enum netdev_flags flags;
@@ -57,20 +61,19 @@ struct netdev_rx_tunnel {
     int fd;
 };
 
-static const struct netdev_rx_class netdev_rx_tunnel_class;
-
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
-static struct shash tunnel_netdevs = SHASH_INITIALIZER(&tunnel_netdevs);
+static struct ovs_mutex tunnel_netdevs_mutex = OVS_MUTEX_INITIALIZER;
+static struct shash tunnel_netdevs OVS_GUARDED_BY(tunnel_netdevs_mutex)
+    = SHASH_INITIALIZER(&tunnel_netdevs);
 
-static int netdev_tunnel_create(const struct netdev_class *, const char *,
-                               struct netdev **);
+static int netdev_tunnel_construct(struct netdev *netdevp_);
 static void netdev_tunnel_update_seq(struct netdev_tunnel *);
 
 static bool
 is_netdev_tunnel_class(const struct netdev_class *class)
 {
-    return class->create == netdev_tunnel_create;
+    return class->construct == netdev_tunnel_construct;
 }
 
 static struct netdev_tunnel *
@@ -83,20 +86,27 @@ netdev_tunnel_cast(const struct netdev *netdev)
 static struct netdev_rx_tunnel *
 netdev_rx_tunnel_cast(const struct netdev_rx *rx)
 {
-    netdev_rx_assert_class(rx, &netdev_rx_tunnel_class);
+    ovs_assert(is_netdev_tunnel_class(netdev_get_class(rx->netdev)));
     return CONTAINER_OF(rx, struct netdev_rx_tunnel, up);
 }
 
+static struct netdev *
+netdev_tunnel_alloc(void)
+{
+    struct netdev_tunnel *netdev = xzalloc(sizeof *netdev);
+    return &netdev->up;
+}
+
 static int
-netdev_tunnel_create(const struct netdev_class *class, const char *name,
-                    struct netdev **netdevp)
+netdev_tunnel_construct(struct netdev *netdev_)
 {
-    static unsigned int n = 0;
-    struct netdev_tunnel *netdev;
-    int error;
+    static atomic_uint next_n = ATOMIC_VAR_INIT(0);
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+    unsigned int n;
 
-    netdev = xzalloc(sizeof *netdev);
-    netdev_init(&netdev->up, name, class);
+    atomic_add(&next_n, 1, &n);
+
+    ovs_mutex_init(&netdev->mutex);
     netdev->hwaddr[0] = 0xfe;
     netdev->hwaddr[1] = 0xff;
     netdev->hwaddr[2] = 0xff;
@@ -113,36 +123,42 @@ netdev_tunnel_create(const struct netdev_class *class, const char *name,
 
     netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev->local_addr, 0);
     if (netdev->sockfd < 0) {
-    	error = netdev->sockfd;
-        goto error;
+    	return netdev->sockfd;
     }
 
 
-    shash_add(&tunnel_netdevs, name, netdev);
+    shash_add(&tunnel_netdevs, netdev_get_name(netdev_), netdev);
 
     n++;
 
-    *netdevp = &netdev->up;
-
-    VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d", name, netdev->sockfd, netdev->local_addr.sin_port);
+    VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d",
+        netdev_get_name(netdev_), netdev->sockfd, netdev->local_addr.sin_port);
 
     return 0;
 
-error:
-    free(netdev);
-    return error;
 }
 
 static void
-netdev_tunnel_destroy(struct netdev *netdev_)
+netdev_tunnel_destruct(struct netdev *netdev_)
 {
     struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
 
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
+
     if (netdev->sockfd != -1)
     	close(netdev->sockfd);
 
     shash_find_and_delete(&tunnel_netdevs,
                           netdev_get_name(netdev_));
+
+    ovs_mutex_destroy(&netdev->mutex);
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
+}
+
+static void
+netdev_tunnel_dealloc(struct netdev *netdev_)
+{
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
     free(netdev);
 }
 
@@ -151,17 +167,20 @@ netdev_tunnel_get_config(const struct netdev *dev_, struct smap *args)
 {
     struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
 
+    ovs_mutex_lock(&netdev->mutex);
     if (netdev->valid_remote_ip)
     	smap_add_format(args, "remote_ip", IP_FMT,
 		IP_ARGS(netdev->remote_addr.sin_addr.s_addr));
     if (netdev->valid_remote_port)
         smap_add_format(args, "remote_port", "%"PRIu16,
 		ntohs(netdev->remote_addr.sin_port));
+    ovs_mutex_unlock(&netdev->mutex);
     return 0;
 }
 
 static int
 netdev_tunnel_connect(struct netdev_tunnel *dev)
+    OVS_REQUIRES(dev->mutex)
 {
     char buf[1024];
     if (dev->sockfd < 0)
@@ -184,7 +203,9 @@ netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
 {
     struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
     struct shash_node *node;
+    int error;
 
+    ovs_mutex_lock(&netdev->mutex);
     VLOG_DBG("tunnel_set_config(%s)", netdev_get_name(dev_));
     SMAP_FOR_EACH(node, args) {
         VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
@@ -204,51 +225,68 @@ netdev_tunnel_set_config(struct netdev *dev_, const struct smap *args)
 	    	netdev_get_name(dev_), node->name);
 	}
     }
-    return netdev_tunnel_connect(netdev);        
+    error = netdev_tunnel_connect(netdev);        
+    ovs_mutex_unlock(&netdev->mutex);
+    return error;
+}
+
+static struct netdev_rx *
+netdev_tunnel_rx_alloc(void)
+{
+    struct netdev_rx_tunnel *rx = xzalloc(sizeof *rx);
+    return &rx->up;
 }
 
 static int
-netdev_tunnel_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
+netdev_tunnel_rx_construct(struct netdev_rx *rx_)
 {   
-    struct netdev_tunnel *netdev =
-        netdev_tunnel_cast(netdev_);
-    struct netdev_rx_tunnel *rx;
-    rx = xmalloc(sizeof *rx);
-    netdev_rx_init(&rx->up, netdev_, &netdev_rx_tunnel_class);
+    struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
+    struct netdev *netdev_ = rx->up.netdev;
+    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+
+    ovs_mutex_lock(&netdev->mutex);
     rx->fd = netdev->sockfd;
-    *rxp = &rx->up;
+    ovs_mutex_unlock(&netdev->mutex);
     return 0;
 }
 
 static void
-netdev_rx_tunnel_destroy(struct netdev_rx *rx_)
+netdev_tunnel_rx_destruct(struct netdev_rx *rx_ OVS_UNUSED)
+{
+}
+
+static void
+netdev_tunnel_rx_dealloc(struct netdev_rx *rx_)
 {
     struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
+
     free(rx);
 }
 
 static int
-netdev_rx_tunnel_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
 {
+    size_t size = ofpbuf_tailroom(buffer);
     struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(rx_->netdev);
     if (!netdev->connected)
-        return -EAGAIN;
+        return EAGAIN;
     for (;;) {
         ssize_t retval;
-        retval = recv(rx->fd, buffer, size, MSG_TRUNC);
-	    VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd",
-		    netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval);
+        retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
+	    VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
+		    netdev_rx_get_name(rx_), (uintptr_t)buffer->data, size, retval);
         if (retval >= 0) {
-	    netdev->stats.rx_packets++;
-	    netdev->stats.rx_bytes += retval;
+	        netdev->stats.rx_packets++;
+	        netdev->stats.rx_bytes += retval;
             if (retval <= size) {
-	    	    return retval;
+                buffer->size += retval;
+	    	    return 0;
             } else {
                 netdev->stats.rx_errors++;
                 netdev->stats.rx_length_errors++;
-                return -EMSGSIZE;
+                return EMSGSIZE;
             }
         } else if (errno != EINTR) {
             if (errno != EAGAIN) {
@@ -256,13 +294,13 @@ netdev_rx_tunnel_recv(struct netdev_rx *rx_, void *buffer, size_t size)
                     netdev_rx_get_name(rx_), ovs_strerror(errno));
 	            netdev->stats.rx_errors++;
             }
-            return -errno;
+            return errno;
         }
     }
 }
 
 static void
-netdev_rx_tunnel_wait(struct netdev_rx *rx_)
+netdev_tunnel_rx_wait(struct netdev_rx *rx_)
 {
     struct netdev_rx_tunnel *rx = 
     	netdev_rx_tunnel_cast(rx_);
@@ -281,14 +319,14 @@ netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size)
     for (;;) {
         ssize_t retval;
         retval = send(dev->sockfd, buffer, size, 0);
-    	VLOG_DBG("%s: send(%"PRIxPTR", %zu) = %zd",
+    	VLOG_DBG("%s: send(%"PRIxPTR", %"PRIuSIZE") = %"PRIdSIZE,
 	         netdev_get_name(netdev_), (uintptr_t)buffer, size, retval);
         if (retval >= 0) {
 	    dev->stats.tx_packets++;
 	    dev->stats.tx_bytes += retval;
 	    if (retval != size) {
-	        VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of "
-		             "%zu) on %s", retval, size, netdev_get_name(netdev_));
+	        VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of "
+		             "%"PRIuSIZE") on %s", retval, size, netdev_get_name(netdev_));
 		dev->stats.tx_errors++;
 	    }
             return 0;
@@ -313,7 +351,7 @@ netdev_tunnel_send_wait(struct netdev *netdev_)
 }
 
 static int
-netdev_rx_tunnel_drain(struct netdev_rx *rx_)
+netdev_tunnel_rx_drain(struct netdev_rx *rx_)
 {
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(rx_->netdev);
@@ -342,10 +380,12 @@ netdev_tunnel_set_etheraddr(struct netdev *netdev,
 {
     struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     if (!eth_addr_equals(dev->hwaddr, mac)) {
         memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
         netdev_tunnel_update_seq(dev);
     }
+    ovs_mutex_unlock(&dev->mutex);
 
     return 0;
 }
@@ -356,7 +396,9 @@ netdev_tunnel_get_etheraddr(const struct netdev *netdev,
 {
     const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
+    ovs_mutex_unlock(&dev->mutex);
     return 0;
 }
 
@@ -366,7 +408,9 @@ netdev_tunnel_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
 {
     const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     *stats = dev->stats;
+    ovs_mutex_unlock(&dev->mutex);
     return 0;
 }
 
@@ -375,7 +419,9 @@ netdev_tunnel_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
 {
     struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
 
+    ovs_mutex_lock(&dev->mutex);
     dev->stats = *stats;
+    ovs_mutex_unlock(&dev->mutex);
     return 0;
 }
 
@@ -386,9 +432,12 @@ netdev_tunnel_update_flags(struct netdev *dev_,
 {
     struct netdev_tunnel *netdev =
         netdev_tunnel_cast(dev_);
+    int error = 0;
 
+    ovs_mutex_lock(&netdev->mutex);
     if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
-        return EINVAL;
+        error = EINVAL;
+        goto out;
     }
 
     // XXX should we actually do something with these flags?
@@ -398,19 +447,30 @@ netdev_tunnel_update_flags(struct netdev *dev_,
     if (*old_flagsp != netdev->flags) {
         netdev_tunnel_update_seq(netdev);
     }
-    return 0;
+
+out:
+    ovs_mutex_unlock(&netdev->mutex);
+    return error;
 }
 
 static unsigned int
-netdev_tunnel_change_seq(const struct netdev *netdev)
+netdev_tunnel_change_seq(const struct netdev *netdev_)
 {
-    return netdev_tunnel_cast(netdev)->change_seq;
+    struct netdev_tunnel *netdev = netdev_tunnel_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_tunnel_update_seq(struct netdev_tunnel *dev)
+    OVS_REQUIRES(dev->mutex)
 {
     dev->change_seq++;
     if (!dev->change_seq) {
@@ -425,14 +485,20 @@ netdev_tunnel_get_port(struct unixctl_conn *conn,
     struct netdev_tunnel *tunnel_dev;
     char buf[6];
 
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
     tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
     if (!tunnel_dev) {
         unixctl_command_reply_error(conn, "no such tunnel netdev");
-        return;
+        goto out;
     }
 
+    ovs_mutex_lock(&tunnel_dev->mutex);
     sprintf(buf, "%d", ntohs(tunnel_dev->local_addr.sin_port));
+    ovs_mutex_unlock(&tunnel_dev->mutex);
+
     unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
 }
 
 static void
@@ -442,14 +508,19 @@ netdev_tunnel_get_tx_bytes(struct unixctl_conn *conn,
     struct netdev_tunnel *tunnel_dev;
     char buf[128];
 
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
     tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
     if (!tunnel_dev) {
         unixctl_command_reply_error(conn, "no such tunnel netdev");
-        return;
+        goto out;
     }
 
+    ovs_mutex_lock(&tunnel_dev->mutex);
     sprintf(buf, "%"PRIu64, tunnel_dev->stats.tx_bytes);
+    ovs_mutex_unlock(&tunnel_dev->mutex);
     unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
 }
 
 static void
@@ -459,14 +530,17 @@ netdev_tunnel_get_rx_bytes(struct unixctl_conn *conn,
     struct netdev_tunnel *tunnel_dev;
     char buf[128];
 
+    ovs_mutex_lock(&tunnel_netdevs_mutex);
     tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
     if (!tunnel_dev) {
         unixctl_command_reply_error(conn, "no such tunnel netdev");
-        return;
+        goto out;
     }
 
     sprintf(buf, "%"PRIu64, tunnel_dev->stats.rx_bytes);
     unixctl_command_reply(conn, buf);
+out:
+    ovs_mutex_unlock(&tunnel_netdevs_mutex);
 }
 
 
@@ -482,20 +556,30 @@ netdev_tunnel_init(void)
     return 0;
 }
 
+static void
+netdev_tunnel_run(void)
+{
+}
+
+static void
+netdev_tunnel_wait(void)
+{
+}
+
 const struct netdev_class netdev_tunnel_class = {
     "tunnel",
-    netdev_tunnel_init,         /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
-
-    netdev_tunnel_create,
-    netdev_tunnel_destroy,
+    netdev_tunnel_init,    
+    netdev_tunnel_run,      
+    netdev_tunnel_wait,   
+
+    netdev_tunnel_alloc,
+    netdev_tunnel_construct,
+    netdev_tunnel_destruct,
+    netdev_tunnel_dealloc,
     netdev_tunnel_get_config,
     netdev_tunnel_set_config, 
     NULL,			            /* get_tunnel_config */
 
-    netdev_tunnel_rx_open,
-
     netdev_tunnel_send, 
     netdev_tunnel_send_wait,  
 
@@ -522,7 +606,9 @@ const struct netdev_class netdev_tunnel_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 */
@@ -530,19 +616,16 @@ const struct netdev_class netdev_tunnel_class = {
     NULL,                       /* get_in6 */
     NULL,                       /* add_router */
     NULL,                       /* get_next_hop */
-    NULL,                       /* get_drv_info */
+    NULL,                       /* get_status */
     NULL,                       /* arp_lookup */
 
     netdev_tunnel_update_flags,
 
-    netdev_tunnel_change_seq
+    netdev_tunnel_rx_alloc,
+    netdev_tunnel_rx_construct,
+    netdev_tunnel_rx_destruct,
+    netdev_tunnel_rx_dealloc,
+    netdev_tunnel_rx_recv,
+    netdev_tunnel_rx_wait,
+    netdev_tunnel_rx_drain,
 };
-
-
-static const struct netdev_rx_class netdev_rx_tunnel_class = {
-    netdev_rx_tunnel_destroy,
-    netdev_rx_tunnel_recv,
-    netdev_rx_tunnel_wait,
-    netdev_rx_tunnel_drain,
-};
-