This adds compatibility with kernel changeset
"bridge: use rx_handler_data pointer to store net_bridge_port pointer"
which was added between 2.6.35 and 2.6.36-rc1.
With this change it is now safe to (attempt to) insert both bridge and
datapath with newer (>=2.6.36) kernels, although whichever is inserted
second will fail to initialise on the call to netdev_rx_handler_register()
Signed-off-by: Simon Horman <horms@verge.net.au>
[Jesse: fixed merge conflicts in vport-netdev.c and netdevice.h]
Signed-off-by: Jesse Gross <jesse@nicira.com>
#endif /* linux kernel < 2.6.31 */
#endif /* linux kernel < 2.6.31 */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+/* XXX: Change to a unique value after merge */
+#define IFF_OVS_DATAPATH IFF_BRIDGE_PORT
+#else
+#define IFF_OVS_DATAPATH 0 /* no-op flag */
+#endif
+
{
if (dev->br_port)
return -EBUSY;
{
if (dev->br_port)
return -EBUSY;
+ rcu_assign_pointer(dev->br_port, rx_handler_data);
-static inline void netdev_rx_handler_unregister(struct net_device *dev) { }
+static inline void netdev_rx_handler_unregister(struct net_device *dev)
+{
+ rcu_assign_pointer(dev->br_port, NULL);
+}
if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
return 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);
netdev_port_receive(vport, skb);
struct netdev_vport *netdev_vport = netdev_vport_priv(vport);
int err;
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,
err = netdev_rx_handler_register(netdev_vport->dev, netdev_frame_hook,
if (err)
return err;
dev_set_promiscuity(netdev_vport->dev, 1);
dev_disable_lro(netdev_vport->dev);
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;
{
struct netdev_vport *netdev_vport = netdev_vport_priv(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);
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;
dev_set_promiscuity(netdev_vport->dev, -1);
return 0;
/* Returns null if this device is not attached to a datapath. */
struct vport *netdev_get_vport(struct net_device *dev)
{
/* Returns null if this device is not attached to a datapath. */
struct vport *netdev_get_vport(struct net_device *dev)
{
+#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);
return (struct vport *)rcu_dereference(dev->br_port);
}
struct vport_ops netdev_vport_ops = {
}
struct vport_ops netdev_vport_ops = {
+#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
*
* Declaring and exporting this symbol enforces mutual exclusion. The bridge
* module also exports the same symbol, so the module loader will refuse to
*/
typeof(br_should_route_hook) br_should_route_hook;
EXPORT_SYMBOL(br_should_route_hook);
*/
typeof(br_should_route_hook) br_should_route_hook;
EXPORT_SYMBOL(br_should_route_hook);