Commit f11e5bd1 authored by Mateusz Kowalski's avatar Mateusz Kowalski Committed by Paolo Abeni
Browse files

bonding: support balance-alb with openvswitch 



Commit d5410ac7 ("net:bonding:support balance-alb interface with
vlan to bridge") introduced a support for balance-alb mode for
interfaces connected to the linux bridge by fixing missing matching of
MAC entry in FDB. In our testing we discovered that it still does not
work when the bond is connected to the OVS bridge as show in diagram
below:

eth1(mac:eth1_mac)--bond0(balance-alb,mac:eth0_mac)--eth0(mac:eth0_mac)
                         |
                       bond0.150(mac:eth0_mac)
                         |
                       ovs_bridge(ip:bridge_ip,mac:eth0_mac)

This patch fixes it by checking not only if the device is a bridge but
also if it is an openvswitch.

Signed-off-by: default avatarMateusz Kowalski <mko@redhat.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/9fe7297c-609e-208b-c77b-3ceef6eb51a4@redhat.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent b23ec2bd

drivers/net/bonding/bond_alb.c

+1 −1
Original line number Diff line number Diff line
@@ -668,7 +668,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond) 


	dev = ip_dev_find(dev_net(bond->dev), arp->ip_src);

	if (dev) {

		if (netif_is_bridge_master(dev)) {

		if (netif_is_any_bridge_master(dev)) {

			dev_put(dev);

			return NULL;

		}

include/linux/netdevice.h

+5 −0
Original line number Diff line number Diff line
@@ -5128,6 +5128,11 @@ static inline bool netif_is_ovs_port(const struct net_device *dev) 
	return dev->priv_flags & IFF_OVS_DATAPATH;

}



static inline bool netif_is_any_bridge_master(const struct net_device *dev)

{

	return netif_is_bridge_master(dev) || netif_is_ovs_master(dev);

}



static inline bool netif_is_any_bridge_port(const struct net_device *dev)

{

	return netif_is_bridge_port(dev) || netif_is_ovs_port(dev);