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

Commit 171a42c3 authored by Andy Gospodarek's avatar Andy Gospodarek Committed by David S. Miller
Browse files

bonding: add netlink support for sys prio, actor sys mac, and port key 



Adds netlink support for the following bonding options:
* BOND_OPT_AD_ACTOR_SYS_PRIO
* BOND_OPT_AD_ACTOR_SYSTEM
* BOND_OPT_AD_USER_PORT_KEY

When setting the actor system mac address we assume the netlink message
contains a binary mac and not a string representation of a mac.

Signed-off-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
[jt: completed the setting side of the netlink attributes]
Signed-off-by: default avatarJonathan Toppins <jtoppins@cumulusnetworks.com>
Signed-off-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d22a5fc0

drivers/net/bonding/bond_netlink.c

+50 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[IFLA_BOND_AD_LACP_RATE]	= { .type = NLA_U8 },

	[IFLA_BOND_AD_SELECT]		= { .type = NLA_U8 },

	[IFLA_BOND_AD_INFO]		= { .type = NLA_NESTED },

	[IFLA_BOND_AD_ACTOR_SYS_PRIO]	= { .type = NLA_U16 },

	[IFLA_BOND_AD_USER_PORT_KEY]	= { .type = NLA_U16 },

	[IFLA_BOND_AD_ACTOR_SYSTEM]	= { .type = NLA_BINARY,

					    .len  = ETH_ALEN },

};



static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {
@@ -379,6 +383,36 @@ static int bond_changelink(struct net_device *bond_dev, 
		if (err)

			return err;

	}

	if (data[IFLA_BOND_AD_ACTOR_SYS_PRIO]) {

		int actor_sys_prio =

			nla_get_u16(data[IFLA_BOND_AD_ACTOR_SYS_PRIO]);



		bond_opt_initval(&newval, actor_sys_prio);

		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &newval);

		if (err)

			return err;

	}



	if (data[IFLA_BOND_AD_USER_PORT_KEY]) {

		int port_key =

			nla_get_u16(data[IFLA_BOND_AD_USER_PORT_KEY]);



		bond_opt_initval(&newval, port_key);

		err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &newval);

		if (err)

			return err;

	}



	if (data[IFLA_BOND_AD_ACTOR_SYSTEM]) {

		if (nla_len(data[IFLA_BOND_AD_ACTOR_SYSTEM]) != ETH_ALEN)

			return -EINVAL;



		bond_opt_initval(&newval,

				 nla_get_be64(data[IFLA_BOND_AD_ACTOR_SYSTEM]));

		err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &newval);

		if (err)

			return err;

	}

	return 0;

}
@@ -426,6 +460,9 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_ACTOR_KEY */

		nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_PARTNER_KEY*/

		nla_total_size(ETH_ALEN) +    /* IFLA_BOND_AD_INFO_PARTNER_MAC*/

		nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_ACTOR_SYS_PRIO */

		nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_USER_PORT_KEY */

		nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_ACTOR_SYSTEM */

		0;

}
@@ -551,6 +588,19 @@ static int bond_fill_info(struct sk_buff *skb, 
	if (BOND_MODE(bond) == BOND_MODE_8023AD) {

		struct ad_info info;



		if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO,

				bond->params.ad_actor_sys_prio))

			goto nla_put_failure;



		if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY,

				bond->params.ad_user_port_key))

			goto nla_put_failure;



		if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM,

			    sizeof(bond->params.ad_actor_system),

			    &bond->params.ad_actor_system))

			goto nla_put_failure;



		if (!bond_3ad_get_active_agg_info(bond, &info)) {

			struct nlattr *nest;

drivers/net/bonding/bond_options.c

+21 −9
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ static int bond_option_tlb_dynamic_lb_set(struct bonding *bond, 
static int bond_option_ad_actor_sys_prio_set(struct bonding *bond,

					     const struct bond_opt_value *newval)

{

	netdev_info(bond->dev, "Setting ad_actor_sys_prio to (%llu)\n",

	netdev_info(bond->dev, "Setting ad_actor_sys_prio to %llu\n",

		    newval->value);



	bond->params.ad_actor_sys_prio = newval->value;
@@ -1405,24 +1405,36 @@ static int bond_option_ad_actor_system_set(struct bonding *bond, 
					   const struct bond_opt_value *newval)

{

	u8 macaddr[ETH_ALEN];

	u8 *mac;

	int i;



	if (newval->string) {

		i = sscanf(newval->string, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",

			   &macaddr[0], &macaddr[1], &macaddr[2],

			   &macaddr[3], &macaddr[4], &macaddr[5]);

	if (i != ETH_ALEN || !is_valid_ether_addr(macaddr)) {

		netdev_err(bond->dev, "Invalid MAC address.\n");

		return -EINVAL;

		if (i != ETH_ALEN)

			goto err;

		mac = macaddr;

	} else {

		mac = (u8 *)&newval->value;

	}



	ether_addr_copy(bond->params.ad_actor_system, macaddr);

	if (!is_valid_ether_addr(mac))

		goto err;



	netdev_info(bond->dev, "Setting ad_actor_system to %pM\n", mac);

	ether_addr_copy(bond->params.ad_actor_system, mac);

	return 0;



err:

	netdev_err(bond->dev, "Invalid MAC address.\n");

	return -EINVAL;

}



static int bond_option_ad_user_port_key_set(struct bonding *bond,

					    const struct bond_opt_value *newval)

{

	netdev_info(bond->dev, "Setting ad_user_port_key to (%llu)\n",

	netdev_info(bond->dev, "Setting ad_user_port_key to %llu\n",

		    newval->value);



	bond->params.ad_user_port_key = newval->value;

include/uapi/linux/if_link.h

+3 −0
Original line number Diff line number Diff line
@@ -417,6 +417,9 @@ enum { 
	IFLA_BOND_AD_LACP_RATE,

	IFLA_BOND_AD_SELECT,

	IFLA_BOND_AD_INFO,

	IFLA_BOND_AD_ACTOR_SYS_PRIO,

	IFLA_BOND_AD_USER_PORT_KEY,

	IFLA_BOND_AD_ACTOR_SYSTEM,

	__IFLA_BOND_MAX,

};