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

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

bonding: add all_slaves_active attribute netlink support 



Add IFLA_BOND_ALL_SLAVES_ACTIVE to allow get/set of bonding parameter
all_slaves_active 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 2c9839c1

drivers/net/bonding/bond_netlink.c

+15 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[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 },

};



static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -213,6 +214,15 @@ static int bond_changelink(struct net_device *bond_dev, 
		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;

	}

	return 0;

}
@@ -247,6 +257,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		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 */

		0;

}
@@ -331,6 +342,10 @@ static int bond_fill_info(struct sk_buff *skb, 
		       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;



	return 0;



nla_put_failure:

drivers/net/bonding/bond_options.c

+29 −0
Original line number Diff line number Diff line
@@ -582,3 +582,32 @@ 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;

}

drivers/net/bonding/bond_sysfs.c

+7 −27
Original line number Diff line number Diff line
@@ -1290,41 +1290,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;

}

drivers/net/bonding/bonding.h

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ 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);

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
@@ -345,6 +345,7 @@ enum { 
	IFLA_BOND_XMIT_HASH_POLICY,

	IFLA_BOND_RESEND_IGMP,

	IFLA_BOND_NUM_PEER_NOTIF,

	IFLA_BOND_ALL_SLAVES_ACTIVE,

	__IFLA_BOND_MAX,

};