summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Kowalski <mko@redhat.com>2023-08-01 15:37:50 +0300
committerPaolo Abeni <pabeni@redhat.com>2023-08-03 11:25:42 +0300
commitf11e5bd159b08976db9e7a9eabbf0318dfe5429d (patch)
treeddf7c004655da1fb3a8530e49e721f9b2061c0f3
parentb23ec2bd7b847aa8e453d8bb5f62d31176b535f3 (diff)
downloadlinux-f11e5bd159b08976db9e7a9eabbf0318dfe5429d.tar.xz
bonding: support balance-alb with openvswitch
Commit d5410ac7b0ba ("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: Mateusz Kowalski <mko@redhat.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://lore.kernel.org/r/9fe7297c-609e-208b-c77b-3ceef6eb51a4@redhat.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
-rw-r--r--drivers/net/bonding/bond_alb.c2
-rw-r--r--include/linux/netdevice.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index b9dbad3a8af8..cc5049eb25f8 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -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;
}
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 85d594460c66..4176a738177b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -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);