datapath: Use openvswitch_handle_frame hook in >=RHEL6.4 to live side by side with...

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

diff --git a/datapath/vport-netdev.c b/datapath/vport-netdev.c
index fb64fe0..808ec34 100644 (file)
--- a/datapath/vport-netdev.c
+++ b/datapath/vport-netdev.c
@@ -45,6 +45,12 @@ MODULE_PARM_DESC(vlan_tso, "Enable TSO for VLAN packets");
 #define vlan_tso true
 #endif
 
+#ifdef HAVE_RHEL_OVS_HOOK
+static atomic_t nr_bridges = ATOMIC_INIT(0);
+
+extern struct sk_buff *(*openvswitch_handle_frame_hook)(struct sk_buff *skb);
+#endif
+
 static void netdev_port_receive(struct vport *vport, struct sk_buff *skb);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)
@@ -63,7 +69,8 @@ static rx_handler_result_t netdev_frame_hook(struct sk_buff **pskb)
 
        return RX_HANDLER_CONSUMED;
 }
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) || \
+      defined HAVE_RHEL_OVS_HOOK
 /* Called with rcu_read_lock and bottom-halves disabled. */
 static struct sk_buff *netdev_frame_hook(struct sk_buff *skb)
 {
@@ -105,7 +112,8 @@ static int netdev_frame_hook(struct net_bridge_port *p, struct sk_buff **pskb)
 #error
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) || \
+    defined HAVE_RHEL_OVS_HOOK
 static int netdev_init(void) { return 0; }
 static void netdev_exit(void) { }
 #else
@@ -152,19 +160,31 @@ static struct vport *netdev_create(const struct vport_parms *parms)
                goto error_put;
        }
 
+       rtnl_lock();
+#ifdef HAVE_RHEL_OVS_HOOK
+       rcu_assign_pointer(netdev_vport->dev->ax25_ptr, vport);
+       atomic_inc(&nr_bridges);
+       rcu_assign_pointer(openvswitch_handle_frame_hook, netdev_frame_hook);
+#else
        err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,
                                         vport);
        if (err)
-               goto error_put;
+               goto error_unlock;
+#endif
 
        dev_set_promiscuity(netdev_vport->dev, 1);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
        dev_disable_lro(netdev_vport->dev);
 #endif
        netdev_vport->dev->priv_flags |= IFF_OVS_DATAPATH;
+       rtnl_unlock();
 
        return vport;
 
+#ifndef HAVE_RHEL_OVS_HOOK
+error_unlock:
+#endif
+       rtnl_unlock();
 error_put:
        dev_put(netdev_vport->dev);
 error_free_vport:
@@ -178,6 +198,12 @@ static void free_port_rcu(struct rcu_head *rcu)
        struct netdev_vport *netdev_vport = container_of(rcu,
                                        struct netdev_vport, rcu);
 
+#ifdef HAVE_RHEL_OVS_HOOK
+       rcu_assign_pointer(netdev_vport->dev->ax25_ptr, NULL);
+
+       if (atomic_dec_and_test(&nr_bridges))
+               rcu_assign_pointer(openvswitch_handle_frame_hook, NULL);
+#endif
        dev_put(netdev_vport->dev);
        ovs_vport_free(vport_from_priv(netdev_vport));
 }
@@ -186,36 +212,21 @@ static void netdev_destroy(struct vport *vport)
 {
        struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
 
+       rtnl_lock();
        netdev_vport->dev->priv_flags &= ~IFF_OVS_DATAPATH;
        netdev_rx_handler_unregister(netdev_vport->dev);
        dev_set_promiscuity(netdev_vport->dev, -1);
+       rtnl_unlock();
 
        call_rcu(&netdev_vport->rcu, free_port_rcu);
 }
 
-int ovs_netdev_set_addr(struct vport *vport, const unsigned char *addr)
-{
-       struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-       struct sockaddr sa;
-
-       sa.sa_family = ARPHRD_ETHER;
-       memcpy(sa.sa_data, addr, ETH_ALEN);
-
-       return dev_set_mac_address(netdev_vport->dev, &sa);
-}
-
 const char *ovs_netdev_get_name(const struct vport *vport)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
        return netdev_vport->dev->name;
 }
 
-const unsigned char *ovs_netdev_get_addr(const struct vport *vport)
-{
-       const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
-       return netdev_vport->dev->dev_addr;
-}
-
 int ovs_netdev_get_ifindex(const struct vport *vport)
 {
        const struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
@@ -362,13 +373,18 @@ error:
 /* Returns null if this device is not attached to a datapath. */
 struct vport *ovs_netdev_get_vport(struct net_device *dev)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) || \
+    defined HAVE_RHEL_OVS_HOOK
 #if IFF_OVS_DATAPATH != 0
        if (likely(dev->priv_flags & IFF_OVS_DATAPATH))
 #else
        if (likely(rcu_access_pointer(dev->rx_handler) == netdev_frame_hook))
 #endif
+#ifdef HAVE_RHEL_OVS_HOOK
+               return (struct vport *)rcu_dereference_rtnl(dev->ax25_ptr);
+#else
                return (struct vport *)rcu_dereference_rtnl(dev->rx_handler_data);
+#endif
        else
                return NULL;
 #else
@@ -383,14 +399,13 @@ const struct vport_ops ovs_netdev_vport_ops = {
        .exit           = netdev_exit,
        .create         = netdev_create,
        .destroy        = netdev_destroy,
-       .set_addr       = ovs_netdev_set_addr,
        .get_name       = ovs_netdev_get_name,
-       .get_addr       = ovs_netdev_get_addr,
        .get_ifindex    = ovs_netdev_get_ifindex,
        .send           = netdev_send,
 };
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) && \
+    !defined HAVE_RHEL_OVS_HOOK
 /*
  * Enforces, mutual exclusion with the Linux bridge module, by declaring and
  * exporting br_should_route_hook.  Because the bridge module also exports the