Catalli's threaded switch

[sliver-openvswitch.git] / datapath / vport-netdev.c

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index a85a9b5..f6709e2 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -36,7 +36,7 @@ static struct sk_buff *netdev_frame_hook(struct sk_buff *skb)
        if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
                return skb;
 
-       vport = (struct vport *)rcu_dereference(skb->dev->br_port);
+       vport = netdev_get_vport(skb->dev);
 
        netdev_port_receive(vport, skb);
 
@@ -115,11 +115,6 @@ static struct vport *netdev_create(const char *name, const void __user *config)
                goto error_put;
        }
 
-       if (netdev_vport->dev->br_port) {
-               err = -EBUSY;
-               goto error_put;
-       }
-
        /* If we are using the vport stats layer initialize it to the current
         * values so we are roughly consistent with the device stats. */
        if (USE_VPORT_STATS) {
@@ -155,15 +150,14 @@ static int netdev_attach(struct vport *vport)
        struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
        int err;
 
-       rcu_assign_pointer(netdev_vport->dev->br_port,
-                          (struct net_bridge_port *)vport);
        err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,
-                                        NULL);
+                                        vport);
        if (err)
                return err;
 
        dev_set_promiscuity(netdev_vport->dev, 1);
        dev_disable_lro(netdev_vport->dev);
+       netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
 
        return 0;
 }
@@ -172,8 +166,8 @@ static int netdev_detach(struct vport *vport)
 {
        struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
+       netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
        netdev_rx_handler_unregister(netdev_vport->dev);
-       rcu_assign_pointer(netdev_vport->dev->br_port, NULL);
        dev_set_promiscuity(netdev_vport->dev, -1);
 
        return 0;
@@ -217,9 +211,15 @@ struct kobject *netdev_get_kobj(const struct vport *vport)
 int netdev_get_stats(const struct vport *vport, struct odp_vport_stats *stats)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+       struct rtnl_link_stats64 *netdev_stats, storage;
+
+       netdev_stats = dev_get_stats(netdev_vport->dev, &storage);
+#else
        const struct net_device_stats *netdev_stats;
 
        netdev_stats = dev_get_stats(netdev_vport->dev);
+#endif
 
        stats->rx_bytes         = netdev_stats->rx_bytes;
        stats->rx_packets       = netdev_stats->rx_packets;
@@ -309,7 +309,18 @@ static int netdev_send(struct vport *vport, struct sk_buff *skb)
 /* Returns null if this device is not attached to a datapath. */
 struct vport *netdev_get_vport(struct net_device *dev)
 {
-       return (struct vport *)dev->br_port;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+       /* XXX: The bridge code may have registered the data.
+        * So check that the handler pointer is the datapath's.
+        * Once the merge is done and IFF_OVS_DATAPATH stops
+        * being the same value as IFF_BRIDGE_PORT the check can
+        * simply be netdev_vport->dev->priv_flags & IFF_OVS_DATAPATH. */
+       if (rcu_dereference(dev->rx_handler) != netdev_frame_hook)
+               return NULL;
+       return (struct vport *)rcu_dereference(dev->rx_handler_data);
+#else
+       return (struct vport *)rcu_dereference(dev->br_port);
+#endif
 }
 
 struct vport_ops netdev_vport_ops = {
@@ -337,10 +348,12 @@ struct vport_ops netdev_vport_ops = {
        .send           = netdev_send,
 };
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 /*
- * Open vSwitch cannot safely coexist with the Linux bridge module on any
- * released version of Linux, because there is only a single bridge hook
- * function and only a single br_port member in struct net_device.
+ * In kernels earlier than 2.6.36, Open vSwitch cannot safely coexist with
+ * the Linux bridge module on any released version of Linux, because there
+ * is only a single bridge hook function and only a single br_port member
+ * in struct net_device.
  *
  * Declaring and exporting this symbol enforces mutual exclusion.  The bridge
  * module also exports the same symbol, so the module loader will refuse to
@@ -352,3 +365,4 @@ struct vport_ops netdev_vport_ops = {
  */
 typeof(br_should_route_hook) br_should_route_hook;
 EXPORT_SYMBOL(br_should_route_hook);
+#endif