Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29c49482 authored by sfeldma@cumulusnetworks.com's avatar sfeldma@cumulusnetworks.com Committed by David S. Miller
Browse files

bonding: add arp_validate netlink support 



Add IFLA_BOND_ARP_VALIDATE to allow get/set of bonding parameter
arp_validate via netlink.

Signed-off-by: default avatarScott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f28fa10

drivers/net/bonding/bond_netlink.c

+18 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[IFLA_BOND_USE_CARRIER]		= { .type = NLA_U8 },

	[IFLA_BOND_ARP_INTERVAL]	= { .type = NLA_U32 },

	[IFLA_BOND_ARP_IP_TARGET]	= { .type = NLA_NESTED },

	[IFLA_BOND_ARP_VALIDATE]	= { .type = NLA_U32 },

};



static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -131,6 +132,19 @@ static int bond_changelink(struct net_device *bond_dev, 
		if (err)

			return err;

	}

	if (data[IFLA_BOND_ARP_VALIDATE]) {

		int arp_validate = nla_get_u32(data[IFLA_BOND_ARP_VALIDATE]);



		if (arp_validate && miimon) {

			pr_err("%s: ARP validating cannot be used with MII monitoring.\n",

			       bond->dev->name);

			return -EINVAL;

		}



		err = bond_option_arp_validate_set(bond, arp_validate);

		if (err)

			return err;

	}

	return 0;

}
@@ -157,6 +171,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_ARP_INTERVAL */

						/* IFLA_BOND_ARP_IP_TARGET */

		nla_total_size(sizeof(u32)) * BOND_MAX_ARP_TARGETS +

		nla_total_size(sizeof(u32)) +	/* IFLA_BOND_ARP_VALIDATE */

		0;

}
@@ -209,6 +224,9 @@ static int bond_fill_info(struct sk_buff *skb, 
	else

		nla_nest_cancel(skb, targets);



	if (nla_put_u32(skb, IFLA_BOND_ARP_VALIDATE, bond->params.arp_validate))

		goto nla_put_failure;



	return 0;



nla_put_failure:

drivers/net/bonding/bond_options.c

+22 −0
Original line number Diff line number Diff line
@@ -436,3 +436,25 @@ int bond_option_arp_ip_targets_set(struct bonding *bond, __be32 *targets, 
	write_unlock_bh(&bond->lock);

	return ret;

}



int bond_option_arp_validate_set(struct bonding *bond, int arp_validate)

{

	if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {

		pr_err("%s: arp_validate only supported in active-backup mode.\n",

		       bond->dev->name);

		return -EINVAL;

	}

	pr_info("%s: setting arp_validate to %s (%d).\n",

		bond->dev->name, arp_validate_tbl[arp_validate].modename,

		arp_validate);



	if (bond->dev->flags & IFF_UP) {

		if (!arp_validate)

			bond->recv_probe = NULL;

		else if (bond->params.arp_interval)

			bond->recv_probe = bond_arp_rcv;

	}

	bond->params.arp_validate = arp_validate;



	return 0;

}

drivers/net/bonding/bond_sysfs.c

+8 −22
Original line number Diff line number Diff line
@@ -358,35 +358,21 @@ static ssize_t bonding_store_arp_validate(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 (!rtnl_trylock())

		return restart_syscall();

	new_value = bond_parse_parm(buf, arp_validate_tbl);

	if (new_value < 0) {

		pr_err("%s: Ignoring invalid arp_validate value %s\n",

		       bond->dev->name, buf);

		ret = -EINVAL;

		goto out;

	}

	if (bond->params.mode != BOND_MODE_ACTIVEBACKUP) {

		pr_err("%s: arp_validate only supported in active-backup mode.\n",

		       bond->dev->name);

		ret = -EINVAL;

		goto out;

		return -EINVAL;

	}

	pr_info("%s: setting arp_validate to %s (%d).\n",

		bond->dev->name, arp_validate_tbl[new_value].modename,

		new_value);

	if (!rtnl_trylock())

		return restart_syscall();



	ret = bond_option_arp_validate_set(bond, new_value);

	if (!ret)

		ret = count;



	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();



	return ret;

drivers/net/bonding/bonding.h

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ 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_arp_validate_set(struct bonding *bond, int arp_validate);

struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);

struct net_device *bond_option_active_slave_get(struct bonding *bond);

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ enum { 
	IFLA_BOND_USE_CARRIER,

	IFLA_BOND_ARP_INTERVAL,

	IFLA_BOND_ARP_IP_TARGET,

	IFLA_BOND_ARP_VALIDATE,

	__IFLA_BOND_MAX,

};