bonding: don't trust arp requests unless active slave really works

Currently, if we receive any arp packet on a backup slave in active-backup
mode and arp_validate enabled, we suppose that it's an arp request, swap
source/target ip and try to validate it. This optimization gives us
virtually no downtime in the most common situation (active and backup
slaves are in the same broadcast domain and the active slave failed).

However, if we can't reach the arp_ip_target(s), we end up in an endless
loop of reselecting slaves, because we receive our arp requests, sent by
the active slave, and think that backup slaves are up, thus selecting them
as active and, again, sending arp requests, which fool our backup slaves.

Fix this by not validating the swapped arp packets if the current active
slave didn't receive any arp reply after it was selected as active. This
way we will only accept arp requests if we know that the current active
slave can actually reach arp_ip_target.

v3->v4:
Obey 80 lines and make checkpatch.pl happy, per Sergei's suggestion.

v1->v3:
No change.

Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 7fe9802c9eec453bd16a39704165f427dbc33cba..d3a70c0d0edd82c0e364f2935062eaf065412e92 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2677,10 +2677,17 @@ static int bond_arp_rcv(const struct sk_buff *skb, struct bonding *bond,
         * configuration, the ARP probe will (hopefully) travel from
         * the active, through one switch, the router, then the other
         * switch before reaching the backup.
+        *
+        * We 'trust' the arp requests if there is an active slave and
+        * it received valid arp reply(s) after it became active. This
+        * is done to avoid endless looping when we can't reach the
+        * arp_ip_target and fool ourselves with our own arp requests.
         */
        if (bond_is_active_slave(slave))
                bond_validate_arp(bond, slave, sip, tip);
-       else
+       else if (bond->curr_active_slave &&
+                time_after(slave_last_rx(bond, bond->curr_active_slave),
+                           bond->curr_active_slave->jiffies))
                bond_validate_arp(bond, slave, tip, sip);
 
 out_unlock: