From 4fb0ef585eb2825ef4e542c2b1d302dc53f36860 Mon Sep 17 00:00:00 2001 From: Nikolay Aleksandrov Date: Wed, 22 Jan 2014 14:53:24 +0100 Subject: [PATCH] bonding: convert arp_ip_target to use the new option API This patch adds the necessary changes so arp_ip_target would use the new bonding option API. This option is an exception because of the way it's currently implemented that's why its netlink code is a bit different from the other options to keep the functionality as before and at the same time to have a single set function. This patch also fixes a few stylistic errors. Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller --- drivers/net/bonding/bond_netlink.c | 15 +++++++--- drivers/net/bonding/bond_options.c | 46 +++++++++++++++++++++--------- drivers/net/bonding/bond_options.h | 4 +++ drivers/net/bonding/bond_sysfs.c | 25 +++------------- drivers/net/bonding/bonding.h | 2 -- 5 files changed, 52 insertions(+), 40 deletions(-) diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index 74463f3db8b6..9164a5a8e44f 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c @@ -172,16 +172,23 @@ static int bond_changelink(struct net_device *bond_dev, return err; } if (data[IFLA_BOND_ARP_IP_TARGET]) { - __be32 targets[BOND_MAX_ARP_TARGETS] = { 0, }; struct nlattr *attr; int i = 0, rem; + bond_option_arp_ip_targets_clear(bond); nla_for_each_nested(attr, data[IFLA_BOND_ARP_IP_TARGET], rem) { __be32 target = nla_get_be32(attr); - targets[i++] = target; - } - err = bond_option_arp_ip_targets_set(bond, targets, i); + bond_opt_initval(&newval, target); + err = __bond_opt_set(bond, BOND_OPT_ARP_TARGETS, + &newval); + if (err) + break; + i++; + } + if (i == 0 && bond->params.arp_interval) + pr_warn("%s: removing last arp target with arp_interval on\n", + bond->dev->name); if (err) return err; } diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index df693afbb1a5..df5f007ddaa5 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "bonding.h" static struct bond_opt_value bond_mode_tbl[] = { @@ -127,6 +128,13 @@ static struct bond_option bond_opts[] = { .values = bond_intmax_tbl, .set = bond_option_arp_interval_set }, + [BOND_OPT_ARP_TARGETS] = { + .id = BOND_OPT_ARP_TARGETS, + .name = "arp_ip_target", + .desc = "arp targets in n.n.n.n form", + .flags = BOND_OPTFLAG_RAWVAL, + .set = bond_option_arp_ip_targets_set + }, { } }; @@ -757,29 +765,41 @@ int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target) return 0; } -int bond_option_arp_ip_targets_set(struct bonding *bond, __be32 *targets, - int count) +void bond_option_arp_ip_targets_clear(struct bonding *bond) { - int i, ret = 0; + int i; /* not to race with bond_arp_rcv */ write_lock_bh(&bond->lock); - - /* clear table */ for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) _bond_options_arp_ip_target_set(bond, i, 0, 0); + write_unlock_bh(&bond->lock); +} - if (count == 0 && bond->params.arp_interval) - pr_warn("%s: removing last arp target with arp_interval on\n", - bond->dev->name); +int bond_option_arp_ip_targets_set(struct bonding *bond, + struct bond_opt_value *newval) +{ + int ret = -EPERM; + __be32 target; - for (i = 0; i < count; i++) { - ret = _bond_option_arp_ip_target_add(bond, targets[i]); - if (ret) - break; + if (newval->string) { + if (!in4_pton(newval->string+1, -1, (u8 *)&target, -1, NULL)) { + pr_err("%s: invalid ARP target %pI4 specified\n", + bond->dev->name, &target); + return ret; + } + if (newval->string[0] == '+') + ret = bond_option_arp_ip_target_add(bond, target); + else if (newval->string[0] == '-') + ret = bond_option_arp_ip_target_rem(bond, target); + else + pr_err("no command found in arp_ip_targets file for bond %s. Use + or -.\n", + bond->dev->name); + } else { + target = newval->value; + ret = bond_option_arp_ip_target_add(bond, target); } - write_unlock_bh(&bond->lock); return ret; } diff --git a/drivers/net/bonding/bond_options.h b/drivers/net/bonding/bond_options.h index f02b8573116e..da351489a583 100644 --- a/drivers/net/bonding/bond_options.h +++ b/drivers/net/bonding/bond_options.h @@ -45,6 +45,7 @@ enum { BOND_OPT_ARP_ALL_TARGETS, BOND_OPT_FAIL_OVER_MAC, BOND_OPT_ARP_INTERVAL, + BOND_OPT_ARP_TARGETS, BOND_OPT_LAST }; @@ -117,4 +118,7 @@ int bond_option_fail_over_mac_set(struct bonding *bond, struct bond_opt_value *newval); int bond_option_arp_interval_set(struct bonding *bond, struct bond_opt_value *newval); +int bond_option_arp_ip_targets_set(struct bonding *bond, + struct bond_opt_value *newval); +void bond_option_arp_ip_targets_clear(struct bonding *bond); #endif /* _BOND_OPTIONS_H */ diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 585c38c5562c..5eeb3a2add02 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -454,8 +454,8 @@ static ssize_t bonding_show_arp_targets(struct device *d, struct device_attribute *attr, char *buf) { - int i, res = 0; struct bonding *bond = to_bond(d); + int i, res = 0; for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) { if (bond->params.arp_targets[i]) @@ -464,6 +464,7 @@ static ssize_t bonding_show_arp_targets(struct device *d, } if (res) buf[res-1] = '\n'; /* eat the leftover space */ + return res; } @@ -472,30 +473,12 @@ static ssize_t bonding_store_arp_targets(struct device *d, const char *buf, size_t count) { struct bonding *bond = to_bond(d); - __be32 target; - int ret = -EPERM; - - if (!in4_pton(buf + 1, -1, (u8 *)&target, -1, NULL)) { - pr_err("%s: invalid ARP target %pI4 specified\n", - bond->dev->name, &target); - return -EPERM; - } - - if (!rtnl_trylock()) - return restart_syscall(); - - if (buf[0] == '+') - ret = bond_option_arp_ip_target_add(bond, target); - else if (buf[0] == '-') - ret = bond_option_arp_ip_target_rem(bond, target); - else - pr_err("no command found in arp_ip_targets file for bond %s. Use + or -.\n", - bond->dev->name); + int ret; + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_ARP_TARGETS, (char *)buf); if (!ret) ret = count; - rtnl_unlock(); return ret; } static DEVICE_ATTR(arp_ip_target, S_IRUGO | S_IWUSR , bonding_show_arp_targets, bonding_store_arp_targets); diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 7d39588b17db..5a63c0e777e7 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -457,8 +457,6 @@ int bond_option_miimon_set(struct bonding *bond, int miimon); int bond_option_updelay_set(struct bonding *bond, int updelay); int bond_option_downdelay_set(struct bonding *bond, int downdelay); int bond_option_use_carrier_set(struct bonding *bond, int use_carrier); -int bond_option_arp_ip_targets_set(struct bonding *bond, __be32 *targets, - int count); int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target); int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target); int bond_option_primary_set(struct bonding *bond, const char *primary);