bonding: fix bond_arp_rcv setting and arp validate desync state

We make bond_arp_rcv global so it can be used in bond_sysfs if the bond
interface is up and arp_interval is being changed to a positive value
and cleared otherwise as per Jay's suggestion.
This also fixes a problem where bond_arp_rcv was set even though
arp_validate was disabled while the bond was up by unsetting recv_probe
in bond_store_arp_validate and respectively setting it if enabled.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: Marcelo Ricardo Leitner <mleitner@redhat.com>
Acked-by: Veaceslav Falico <vfalico@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 16 insertions, 3 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 4e386836d34f..eeab40b01b7a 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -349,6 +349,8 @@ static ssize_t bonding_store_mode(struct device *d,
                 goto out;
         }
 
+        /* don't cache arp_validate between modes */
+        bond->params.arp_validate = BOND_ARP_VALIDATE_NONE;
         bond->params.mode = new_value;
         bond_set_mode_ops(bond, bond->params.mode);
         pr_info("%s: setting mode to %s (%d).\n",
@@ -419,8 +421,8 @@ static ssize_t bonding_store_arp_validate(struct device *d,
                                           struct device_attribute *attr,
                                           const char *buf, size_t count)
 {
-        int new_value, ret = count;
         struct bonding *bond = to_bond(d);
+        int new_value, ret = count;
 
         if (!rtnl_trylock())
                 return restart_syscall();
@@ -431,7 +433,7 @@ static ssize_t bonding_store_arp_validate(struct device *d,
                 ret = -EINVAL;
                 goto out;
         }
-        if (new_value && (bond->params.mode != BOND_MODE_ACTIVEBACKUP)) {
+        if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {
                 pr_err("%s: arp_validate only supported in active-backup mode.\n",
                        bond->dev->name);
                 ret = -EINVAL;
@@ -441,6 +443,12 @@ static ssize_t bonding_store_arp_validate(struct device *d,
                 bond->dev->name, arp_validate_tbl[new_value].modename,
                 new_value);
 
+        if (bond->dev->flags & IFF_UP) {
+                if (!new_value)
+                        bond->recv_probe = NULL;
+                else if (bond->params.arp_interval)
+                        bond->recv_probe = bond_arp_rcv;
+        }
         bond->params.arp_validate = new_value;
 out:
         rtnl_unlock();
@@ -561,8 +569,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                                           struct device_attribute *attr,
                                           const char *buf, size_t count)
 {
-        int new_value, ret = count;
         struct bonding *bond = to_bond(d);
+        int new_value, ret = count;
 
         if (!rtnl_trylock())
                 return restart_syscall();
@@ -605,8 +613,13 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                  * is called.
                  */
                 if (!new_value) {
+                        if (bond->params.arp_validate)
+                                bond->recv_probe = NULL;
                         cancel_delayed_work_sync(&bond->arp_work);
                 } else {
+                        /* arp_validate can be set only in active-backup mode */
+                        if (bond->params.arp_validate)
+                                bond->recv_probe = bond_arp_rcv;
                         cancel_delayed_work_sync(&bond->mii_work);
                         queue_delayed_work(bond->wq, &bond->arp_work, 0);
                 }