bonding: add ns target multicast address to slave device

Commit 4598380f9c54 ("bonding: fix ns validation on backup slaves")
tried to resolve the issue where backup slaves couldn't be brought up when
receiving IPv6 Neighbor Solicitation (NS) messages. However, this fix only
worked for drivers that receive all multicast messages, such as the veth
interface.

For standard drivers, the NS multicast message is silently dropped because
the slave device is not a member of the NS target multicast group.

To address this, we need to make the slave device join the NS target
multicast group, ensuring it can receive these IPv6 NS messages to validate
the slave’s status properly.

There are three policies before joining the multicast group:
1. All settings must be under active-backup mode (alb and tlb do not support
   arp_validate), with backup slaves and slaves supporting multicast.
2. We can add or remove multicast groups when arp_validate changes.
3. Other operations, such as enslaving, releasing, or setting NS targets,
   need to be guarded by arp_validate.

Fixes: 4e24be018eb9 ("bonding: add new parameter ns_targets")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index b1bffd8e9a958fb1b0e7f965c6fea5bc844f9c07..15e0f14d0d49dea9d122b8e4f7649b2a01f33b5d 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1008,6 +1008,8 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,
 
                if (bond->dev->flags & IFF_UP)
                        bond_hw_addr_flush(bond->dev, old_active->dev);
+
+               bond_slave_ns_maddrs_add(bond, old_active);
        }
 
        if (new_active) {
@@ -1024,6 +1026,8 @@ static void bond_hw_addr_swap(struct bonding *bond, struct slave *new_active,
                        dev_mc_sync(new_active->dev, bond->dev);
                        netif_addr_unlock_bh(bond->dev);
                }
+
+               bond_slave_ns_maddrs_del(bond, new_active);
        }
 }
 
@@ -2341,6 +2345,11 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
        bond_compute_features(bond);
        bond_set_carrier(bond);
 
+       /* Needs to be called before bond_select_active_slave(), which will
+        * remove the maddrs if the slave is selected as active slave.
+        */
+       bond_slave_ns_maddrs_add(bond, new_slave);
+
        if (bond_uses_primary(bond)) {
                block_netpoll_tx();
                bond_select_active_slave(bond);
@@ -2350,7 +2359,6 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
        if (bond_mode_can_use_xmit_hash(bond))
                bond_update_slave_arr(bond, NULL);
 
-
        if (!slave_dev->netdev_ops->ndo_bpf ||
            !slave_dev->netdev_ops->ndo_xdp_xmit) {
                if (bond->xdp_prog) {
@@ -2548,6 +2556,12 @@ static int __bond_release_one(struct net_device *bond_dev,
        if (oldcurrent == slave)
                bond_change_active_slave(bond, NULL);
 
+       /* Must be called after bond_change_active_slave () as the slave
+        * might change from an active slave to a backup slave. Then it is
+        * necessary to clear the maddrs on the backup slave.
+        */
+       bond_slave_ns_maddrs_del(bond, slave);
+
        if (bond_is_lb(bond)) {
                /* Must be called only after the slave has been
                 * detached from the list and the curr_active_slave

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 95d59a18c0223fbd956d977482797ee4942d67e3..327b6ecdc77e00d1922af1f9ff46293b4a473ad1 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -15,6 +15,7 @@
 #include <linux/sched/signal.h>
 
 #include <net/bonding.h>
+#include <net/ndisc.h>
 
 static int bond_option_active_slave_set(struct bonding *bond,
                                        const struct bond_opt_value *newval);
@@ -1234,6 +1235,68 @@ static int bond_option_arp_ip_targets_set(struct bonding *bond,
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
+static bool slave_can_set_ns_maddr(const struct bonding *bond, struct slave *slave)
+{
+       return BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &&
+              !bond_is_active_slave(slave) &&
+              slave->dev->flags & IFF_MULTICAST;
+}
+
+static void slave_set_ns_maddrs(struct bonding *bond, struct slave *slave, bool add)
+{
+       struct in6_addr *targets = bond->params.ns_targets;
+       char slot_maddr[MAX_ADDR_LEN];
+       int i;
+
+       if (!slave_can_set_ns_maddr(bond, slave))
+               return;
+
+       for (i = 0; i < BOND_MAX_NS_TARGETS; i++) {
+               if (ipv6_addr_any(&targets[i]))
+                       break;
+
+               if (!ndisc_mc_map(&targets[i], slot_maddr, slave->dev, 0)) {
+                       if (add)
+                               dev_mc_add(slave->dev, slot_maddr);
+                       else
+                               dev_mc_del(slave->dev, slot_maddr);
+               }
+       }
+}
+
+void bond_slave_ns_maddrs_add(struct bonding *bond, struct slave *slave)
+{
+       if (!bond->params.arp_validate)
+               return;
+       slave_set_ns_maddrs(bond, slave, true);
+}
+
+void bond_slave_ns_maddrs_del(struct bonding *bond, struct slave *slave)
+{
+       if (!bond->params.arp_validate)
+               return;
+       slave_set_ns_maddrs(bond, slave, false);
+}
+
+static void slave_set_ns_maddr(struct bonding *bond, struct slave *slave,
+                              struct in6_addr *target, struct in6_addr *slot)
+{
+       char target_maddr[MAX_ADDR_LEN], slot_maddr[MAX_ADDR_LEN];
+
+       if (!bond->params.arp_validate || !slave_can_set_ns_maddr(bond, slave))
+               return;
+
+       /* remove the previous maddr from slave */
+       if (!ipv6_addr_any(slot) &&
+           !ndisc_mc_map(slot, slot_maddr, slave->dev, 0))
+               dev_mc_del(slave->dev, slot_maddr);
+
+       /* add new maddr on slave if target is set */
+       if (!ipv6_addr_any(target) &&
+           !ndisc_mc_map(target, target_maddr, slave->dev, 0))
+               dev_mc_add(slave->dev, target_maddr);
+}
+
 static void _bond_options_ns_ip6_target_set(struct bonding *bond, int slot,
                                            struct in6_addr *target,
                                            unsigned long last_rx)
@@ -1243,8 +1306,10 @@ static void _bond_options_ns_ip6_target_set(struct bonding *bond, int slot,
        struct slave *slave;
 
        if (slot >= 0 && slot < BOND_MAX_NS_TARGETS) {
-               bond_for_each_slave(bond, slave, iter)
+               bond_for_each_slave(bond, slave, iter) {
                        slave->target_last_arp_rx[slot] = last_rx;
+                       slave_set_ns_maddr(bond, slave, target, &targets[slot]);
+               }
                targets[slot] = *target;
        }
 }
@@ -1296,15 +1361,30 @@ static int bond_option_ns_ip6_targets_set(struct bonding *bond,
 {
        return -EPERM;
 }
+
+static void slave_set_ns_maddrs(struct bonding *bond, struct slave *slave, bool add) {}
+
+void bond_slave_ns_maddrs_add(struct bonding *bond, struct slave *slave) {}
+
+void bond_slave_ns_maddrs_del(struct bonding *bond, struct slave *slave) {}
 #endif
 
 static int bond_option_arp_validate_set(struct bonding *bond,
                                        const struct bond_opt_value *newval)
 {
+       bool changed = !!bond->params.arp_validate != !!newval->value;
+       struct list_head *iter;
+       struct slave *slave;
+
        netdev_dbg(bond->dev, "Setting arp_validate to %s (%llu)\n",
                   newval->string, newval->value);
        bond->params.arp_validate = newval->value;
 
+       if (changed) {
+               bond_for_each_slave(bond, slave, iter)
+                       slave_set_ns_maddrs(bond, slave, !!bond->params.arp_validate);
+       }
+
        return 0;
 }
 

diff --git a/include/net/bond_options.h b/include/net/bond_options.h
index 473a0147769eb9c7cc33ccbc72e74425442a0e14..18687ccf063830e09b27ef7cbb4aad03e29a6931 100644 (file)
--- a/include/net/bond_options.h
+++ b/include/net/bond_options.h
@@ -161,5 +161,7 @@ void bond_option_arp_ip_targets_clear(struct bonding *bond);
 #if IS_ENABLED(CONFIG_IPV6)
 void bond_option_ns_ip6_targets_clear(struct bonding *bond);
 #endif
+void bond_slave_ns_maddrs_add(struct bonding *bond, struct slave *slave);
+void bond_slave_ns_maddrs_del(struct bonding *bond, struct slave *slave);
 
 #endif /* _NET_BOND_OPTIONS_H */