4 files changed, 220 insertions, 61 deletions

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index e161c9cbd91e..84acd144d075 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -19,6 +19,7 @@
 #include <linux/if_ether.h>
 #include <net/netlink.h>
 #include <net/rtnetlink.h>
+#include <linux/reciprocal_div.h>
 #include "bonding.h"
 
 static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
@@ -37,6 +38,11 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
         [IFLA_BOND_FAIL_OVER_MAC]       = { .type = NLA_U8 },
         [IFLA_BOND_XMIT_HASH_POLICY]    = { .type = NLA_U8 },
         [IFLA_BOND_RESEND_IGMP]         = { .type = NLA_U32 },
+        [IFLA_BOND_NUM_PEER_NOTIF]      = { .type = NLA_U8 },
+        [IFLA_BOND_ALL_SLAVES_ACTIVE]   = { .type = NLA_U8 },
+        [IFLA_BOND_MIN_LINKS]           = { .type = NLA_U32 },
+        [IFLA_BOND_LP_INTERVAL]         = { .type = NLA_U32 },
+        [IFLA_BOND_PACKETS_PER_SLAVE]   = { .type = NLA_U32 },
 };
 
 static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -204,6 +210,48 @@ static int bond_changelink(struct net_device *bond_dev,
                 if (err)
                         return err;
         }
+        if (data[IFLA_BOND_NUM_PEER_NOTIF]) {
+                int num_peer_notif =
+                        nla_get_u8(data[IFLA_BOND_NUM_PEER_NOTIF]);
+
+                err = bond_option_num_peer_notif_set(bond, num_peer_notif);
+                if (err)
+                        return err;
+        }
+        if (data[IFLA_BOND_ALL_SLAVES_ACTIVE]) {
+                int all_slaves_active =
+                        nla_get_u8(data[IFLA_BOND_ALL_SLAVES_ACTIVE]);
+
+                err = bond_option_all_slaves_active_set(bond,
+                                                        all_slaves_active);
+                if (err)
+                        return err;
+        }
+        if (data[IFLA_BOND_MIN_LINKS]) {
+                int min_links =
+                        nla_get_u32(data[IFLA_BOND_MIN_LINKS]);
+
+                err = bond_option_min_links_set(bond, min_links);
+                if (err)
+                        return err;
+        }
+        if (data[IFLA_BOND_LP_INTERVAL]) {
+                int lp_interval =
+                        nla_get_u32(data[IFLA_BOND_LP_INTERVAL]);
+
+                err = bond_option_lp_interval_set(bond, lp_interval);
+                if (err)
+                        return err;
+        }
+        if (data[IFLA_BOND_PACKETS_PER_SLAVE]) {
+                int packets_per_slave =
+                        nla_get_u32(data[IFLA_BOND_PACKETS_PER_SLAVE]);
+
+                err = bond_option_packets_per_slave_set(bond,
+                                                        packets_per_slave);
+                if (err)
+                        return err;
+        }
         return 0;
 }
 
@@ -237,6 +285,11 @@ static size_t bond_get_size(const struct net_device *bond_dev)
                 nla_total_size(sizeof(u8)) +    /* IFLA_BOND_FAIL_OVER_MAC */
                 nla_total_size(sizeof(u8)) +    /* IFLA_BOND_XMIT_HASH_POLICY */
                 nla_total_size(sizeof(u32)) +   /* IFLA_BOND_RESEND_IGMP */
+                nla_total_size(sizeof(u8)) +    /* IFLA_BOND_NUM_PEER_NOTIF */
+                nla_total_size(sizeof(u8)) +   /* IFLA_BOND_ALL_SLAVES_ACTIVE */
+                nla_total_size(sizeof(u32)) +   /* IFLA_BOND_MIN_LINKS */
+                nla_total_size(sizeof(u32)) +   /* IFLA_BOND_LP_INTERVAL */
+                nla_total_size(sizeof(u32)) +  /* IFLA_BOND_PACKETS_PER_SLAVE */
                 0;
 }
 
@@ -246,6 +299,7 @@ static int bond_fill_info(struct sk_buff *skb,
         struct bonding *bond = netdev_priv(bond_dev);
         struct net_device *slave_dev = bond_option_active_slave_get(bond);
         struct nlattr *targets;
+        unsigned int packets_per_slave;
         int i, targets_added;
 
         if (nla_put_u8(skb, IFLA_BOND_MODE, bond->params.mode))
@@ -317,6 +371,30 @@ static int bond_fill_info(struct sk_buff *skb,
                         bond->params.resend_igmp))
                 goto nla_put_failure;
 
+        if (nla_put_u8(skb, IFLA_BOND_NUM_PEER_NOTIF,
+                       bond->params.num_peer_notif))
+                goto nla_put_failure;
+
+        if (nla_put_u8(skb, IFLA_BOND_ALL_SLAVES_ACTIVE,
+                       bond->params.all_slaves_active))
+                goto nla_put_failure;
+
+        if (nla_put_u32(skb, IFLA_BOND_MIN_LINKS,
+                        bond->params.min_links))
+                goto nla_put_failure;
+
+        if (nla_put_u32(skb, IFLA_BOND_LP_INTERVAL,
+                        bond->params.lp_interval))
+                goto nla_put_failure;
+
+        packets_per_slave = bond->params.packets_per_slave;
+        if (packets_per_slave > 1)
+                packets_per_slave = reciprocal_value(packets_per_slave);
+
+        if (nla_put_u32(skb, IFLA_BOND_PACKETS_PER_SLAVE,
+                        packets_per_slave))
+                goto nla_put_failure;
+
         return 0;
 
 nla_put_failure:
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 1ed7dff9a679..f8a2cd8c7b57 100644
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -16,6 +16,7 @@
 #include <linux/netdevice.h>
 #include <linux/rwlock.h>
 #include <linux/rcupdate.h>
+#include <linux/reciprocal_div.h>
 #include "bonding.h"
 
 static bool bond_mode_is_valid(int mode)
@@ -576,3 +577,82 @@ int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp)
 
         return 0;
 }
+
+int bond_option_num_peer_notif_set(struct bonding *bond, int num_peer_notif)
+{
+        bond->params.num_peer_notif = num_peer_notif;
+        return 0;
+}
+
+int bond_option_all_slaves_active_set(struct bonding *bond,
+                                      int all_slaves_active)
+{
+        struct list_head *iter;
+        struct slave *slave;
+
+        if (all_slaves_active == bond->params.all_slaves_active)
+                return 0;
+
+        if ((all_slaves_active == 0) || (all_slaves_active == 1)) {
+                bond->params.all_slaves_active = all_slaves_active;
+        } else {
+                pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
+                        bond->dev->name, all_slaves_active);
+                return -EINVAL;
+        }
+
+        bond_for_each_slave(bond, slave, iter) {
+                if (!bond_is_active_slave(slave)) {
+                        if (all_slaves_active)
+                                slave->inactive = 0;
+                        else
+                                slave->inactive = 1;
+                }
+        }
+
+        return 0;
+}
+
+int bond_option_min_links_set(struct bonding *bond, int min_links)
+{
+        pr_info("%s: Setting min links value to %u\n",
+                bond->dev->name, min_links);
+        bond->params.min_links = min_links;
+
+        return 0;
+}
+
+int bond_option_lp_interval_set(struct bonding *bond, int lp_interval)
+{
+        if (lp_interval <= 0) {
+                pr_err("%s: lp_interval must be between 1 and %d\n",
+                       bond->dev->name, INT_MAX);
+                return -EINVAL;
+        }
+
+        bond->params.lp_interval = lp_interval;
+
+        return 0;
+}
+
+int bond_option_packets_per_slave_set(struct bonding *bond,
+                                      int packets_per_slave)
+{
+        if (packets_per_slave < 0 || packets_per_slave > USHRT_MAX) {
+                pr_err("%s: packets_per_slave must be between 0 and %u\n",
+                       bond->dev->name, USHRT_MAX);
+                return -EINVAL;
+        }
+
+        if (bond->params.mode != BOND_MODE_ROUNDROBIN)
+                pr_warn("%s: Warning: packets_per_slave has effect only in balance-rr mode\n",
+                        bond->dev->name);
+
+        if (packets_per_slave > 1)
+                bond->params.packets_per_slave =
+                        reciprocal_value(packets_per_slave);
+        else
+                bond->params.packets_per_slave = packets_per_slave;
+
+        return 0;
+}
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index f5c1a54095b9..a0a3476fadba 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -722,10 +722,15 @@ static ssize_t bonding_store_min_links(struct device *d,
                 return ret;
         }
 
-        pr_info("%s: Setting min links value to %u\n",
-                bond->dev->name, new_value);
-        bond->params.min_links = new_value;
-        return count;
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        ret = bond_option_min_links_set(bond, new_value);
+        if (!ret)
+                ret = count;
+
+        rtnl_unlock();
+        return ret;
 }
 static DEVICE_ATTR(min_links, S_IRUGO | S_IWUSR,
                    bonding_show_min_links, bonding_store_min_links);
@@ -790,8 +795,25 @@ static ssize_t bonding_store_num_peer_notif(struct device *d,
                                             const char *buf, size_t count)
 {
         struct bonding *bond = to_bond(d);
-        int err = kstrtou8(buf, 10, &bond->params.num_peer_notif);
-        return err ? err : count;
+        u8 new_value;
+        int ret;
+
+        ret = kstrtou8(buf, 10, &new_value);
+        if (!ret) {
+                pr_err("%s: invalid value %s specified.\n",
+                       bond->dev->name, buf);
+                return ret;
+        }
+
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        ret = bond_option_num_peer_notif_set(bond, new_value);
+        if (!ret)
+                ret = count;
+
+        rtnl_unlock();
+        return ret;
 }
 static DEVICE_ATTR(num_grat_arp, S_IRUGO | S_IWUSR,
                    bonding_show_num_peer_notif, bonding_store_num_peer_notif);
@@ -1273,41 +1295,21 @@ static ssize_t bonding_store_slaves_active(struct device *d,
                                            const char *buf, size_t count)
 {
         struct bonding *bond = to_bond(d);
-        int new_value, ret = count;
-        struct list_head *iter;
-        struct slave *slave;
-
-        if (!rtnl_trylock())
-                return restart_syscall();
+        int new_value, ret;
 
         if (sscanf(buf, "%d", &new_value) != 1) {
                 pr_err("%s: no all_slaves_active value specified.\n",
                        bond->dev->name);
-                ret = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
-        if (new_value == bond->params.all_slaves_active)
-                goto out;
+        if (!rtnl_trylock())
+                return restart_syscall();
 
-        if ((new_value == 0) || (new_value == 1)) {
-                bond->params.all_slaves_active = new_value;
-        } else {
-                pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
-                        bond->dev->name, new_value);
-                ret = -EINVAL;
-                goto out;
-        }
+        ret = bond_option_all_slaves_active_set(bond, new_value);
+        if (!ret)
+                ret = count;
 
-        bond_for_each_slave(bond, slave, iter) {
-                if (!bond_is_active_slave(slave)) {
-                        if (new_value)
-                                slave->inactive = 0;
-                        else
-                                slave->inactive = 1;
-                }
-        }
-out:
         rtnl_unlock();
         return ret;
 }
@@ -1367,24 +1369,22 @@ static ssize_t bonding_store_lp_interval(struct device *d,
                                          const char *buf, size_t count)
 {
         struct bonding *bond = to_bond(d);
-        int new_value, ret = count;
+        int new_value, ret;
 
         if (sscanf(buf, "%d", &new_value) != 1) {
                 pr_err("%s: no lp interval value specified.\n",
                         bond->dev->name);
-                ret = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
 
-        if (new_value <= 0) {
-                pr_err ("%s: lp_interval must be between 1 and %d\n",
-                        bond->dev->name, INT_MAX);
-                ret = -EINVAL;
-                goto out;
-        }
+        if (!rtnl_trylock())
+                return restart_syscall();
 
-        bond->params.lp_interval = new_value;
-out:
+        ret = bond_option_lp_interval_set(bond, new_value);
+        if (!ret)
+                ret = count;
+
+        rtnl_unlock();
         return ret;
 }
 
@@ -1409,28 +1409,22 @@ static ssize_t bonding_store_packets_per_slave(struct device *d,
                                                const char *buf, size_t count)
 {
         struct bonding *bond = to_bond(d);
-        int new_value, ret = count;
+        int new_value, ret;
 
         if (sscanf(buf, "%d", &new_value) != 1) {
                 pr_err("%s: no packets_per_slave value specified.\n",
                        bond->dev->name);
-                ret = -EINVAL;
-                goto out;
-        }
-        if (new_value < 0 || new_value > USHRT_MAX) {
-                pr_err("%s: packets_per_slave must be between 0 and %u\n",
-                       bond->dev->name, USHRT_MAX);
-                ret = -EINVAL;
-                goto out;
+                return -EINVAL;
         }
-        if (bond->params.mode != BOND_MODE_ROUNDROBIN)
-                pr_warn("%s: Warning: packets_per_slave has effect only in balance-rr mode\n",
-                        bond->dev->name);
-        if (new_value > 1)
-                bond->params.packets_per_slave = reciprocal_value(new_value);
-        else
-                bond->params.packets_per_slave = new_value;
-out:
+
+        if (!rtnl_trylock())
+                return restart_syscall();
+
+        ret = bond_option_packets_per_slave_set(bond, new_value);
+        if (!ret)
+                ret = count;
+
+        rtnl_unlock();
         return ret;
 }
 
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index c70ad9f02b1e..5886f07dc1f3 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -461,6 +461,13 @@ int bond_option_fail_over_mac_set(struct bonding *bond, int fail_over_mac);
 int bond_option_xmit_hash_policy_set(struct bonding *bond,
                                      int xmit_hash_policy);
 int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);
+int bond_option_num_peer_notif_set(struct bonding *bond, int num_peer_notif);
+int bond_option_all_slaves_active_set(struct bonding *bond,
+                                      int all_slaves_active);
+int bond_option_min_links_set(struct bonding *bond, int min_links);
+int bond_option_lp_interval_set(struct bonding *bond, int min_links);
+int bond_option_packets_per_slave_set(struct bonding *bond,
+                                      int packets_per_slave);
 struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);
 struct net_device *bond_option_active_slave_get(struct bonding *bond);