bonding: add min_links attribute netlink support

Add IFLA_BOND_MIN_LINKS to allow get/set of bonding parameter
min_links via netlink.

Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 517521569adfcd0b0cb0bb5b9a2c24cfe8a228e0..ac9a10c90a507bb194a12b16a6450ddacce8e534 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -39,6 +39,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
        [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 },
 };
 
 static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -223,6 +224,14 @@ static int bond_changelink(struct net_device *bond_dev,
                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;
+       }
        return 0;
 }
 
@@ -258,6 +267,7 @@ static size_t bond_get_size(const struct net_device *bond_dev)
                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 */
                0;
 }
 
@@ -346,6 +356,10 @@ static int bond_fill_info(struct sk_buff *skb,
                       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;
+
        return 0;
 
 nla_put_failure:

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index cbd832293da45cc904b290b5654e98cbff441d2a..da49ac4a8d8e3a4c9a288dd16a0204a87377214c 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -611,3 +611,12 @@ int bond_option_all_slaves_active_set(struct bonding *bond,
 
        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;
+}

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 9a371251393204f62ab3b174df3f1215ae808b78..359adda17dba858ccc4256c2e663747fbe024b3c 100644 (file)
--- 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);

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 3701e7d1fb16946414524e8999102768abd40f04..7d7ad1ccbd99da7defbc8b607937ef4f63e9d4f6 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -464,6 +464,7 @@ 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);
 struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);
 struct net_device *bond_option_active_slave_get(struct bonding *bond);
 

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 93e9c1b99f7a1d7ea3c91505e8a11a3ebd0a7d9c..c7a0f89d59b2627d601a92e836dd801192cce429 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -346,6 +346,7 @@ enum {
        IFLA_BOND_RESEND_IGMP,
        IFLA_BOND_NUM_PEER_NOTIF,
        IFLA_BOND_ALL_SLAVES_ACTIVE,
+       IFLA_BOND_MIN_LINKS,
        __IFLA_BOND_MAX,
 };