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

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

bonding: add packets_per_slave attribute netlink support 



Add IFLA_BOND_PACKETS_PER_SLAVE to allow get/set of bonding parameter
packets_per_slave 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 8d836d09

drivers/net/bonding/bond_netlink.c

+21 −0
Original line number Diff line number Diff line
@@ -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] = {
@@ -41,6 +42,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[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[])
@@ -241,6 +243,15 @@ static int bond_changelink(struct net_device *bond_dev, 
		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;

}
@@ -278,6 +289,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		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;

}
@@ -287,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))
@@ -374,6 +387,14 @@ static int bond_fill_info(struct sk_buff *skb, 
			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:

drivers/net/bonding/bond_options.c

+23 −0
Original line number Diff line number Diff line
@@ -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)
@@ -633,3 +634,25 @@ int bond_option_lp_interval_set(struct bonding *bond, int 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;

}

drivers/net/bonding/bond_sysfs.c

+11 −17
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/bonding/bonding.h

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

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ enum { 
	IFLA_BOND_ALL_SLAVES_ACTIVE,

	IFLA_BOND_MIN_LINKS,

	IFLA_BOND_LP_INTERVAL,

	IFLA_BOND_PACKETS_PER_SLAVE,

	__IFLA_BOND_MAX,

};