[PATCH net-next] bonding: support balance-alb with openvswitch

[PATCH net-next] bonding: support balance-alb with openvswitch

[Mat Kowalski]

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>
---
  drivers/net/bonding/bond_alb.c | 2 +-
  include/linux/netdevice.h      | 5 +++++
  2 files changed, 6 insertions(+), 1 deletion(-)

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 32a4cdf37dd4..265888af1220 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -5100,6 +5100,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);
-- 
2.41.0

Re: [PATCH net-next] bonding: support balance-alb with openvswitch

[Simon Horman]

On Fri, Jul 28, 2023 at 02:24:32PM +0200, Mat Kowalski wrote:
> 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>

Re: [PATCH net-next] bonding: support balance-alb with openvswitch

[Mat Kowalski]

On 29/07/2023 13:12, Simon Horman wrote:
> On Fri, Jul 28, 2023 at 02:24:32PM +0200, Mat Kowalski wrote:
>> 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>
>
Sorry for the mess, I just noticed in patchwork that it fails to apply not because of the code, but because I messed up with the line wrapping. I really hope it's the last time with such a stupid mistake; v2 is on its way