Commit 3a755cd8 authored by Hangbin Liu's avatar Hangbin Liu Committed by David S. Miller
Browse files

bonding: add new option lacp_active 



Add an option lacp_active, which is similar with team's runner.active.
This option specifies whether to send LACPDU frames periodically. If set
on, the LACPDU frames are sent along with the configured lacp_rate
setting. If set off, the LACPDU frames acts as "speak when spoken to".

Note, the LACPDU state frames still will be sent when init or unbind port.

v2: remove module parameter

Signed-off-by: default avatarHangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2414d628

Documentation/networking/bonding.rst

+12 −0
Original line number Diff line number Diff line
@@ -501,6 +501,18 @@ fail_over_mac 
	This option was added in bonding version 3.2.0.  The "follow"

	policy was added in bonding version 3.3.0.



lacp_active

	Option specifying whether to send LACPDU frames periodically.



	off or 0

		LACPDU frames acts as "speak when spoken to".



	on or 1

		LACPDU frames are sent along the configured links

		periodically. See lacp_rate for more details.



	The default is on.



lacp_rate



	Option specifying the rate in which we'll ask our link partner

drivers/net/bonding/bond_3ad.c

+6 −5
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker); 
static void ad_mux_machine(struct port *port, bool *update_slave_arr);

static void ad_rx_machine(struct lacpdu *lacpdu, struct port *port);

static void ad_tx_machine(struct port *port);

static void ad_periodic_machine(struct port *port);

static void ad_periodic_machine(struct port *port, struct bond_params bond_params);

static void ad_port_selection_logic(struct port *port, bool *update_slave_arr);

static void ad_agg_selection_logic(struct aggregator *aggregator,

				   bool *update_slave_arr);
@@ -1294,10 +1294,11 @@ static void ad_tx_machine(struct port *port) 
/**

 * ad_periodic_machine - handle a port's periodic state machine

 * @port: the port we're looking at

 * @bond_params: bond parameters we will use

 *

 * Turn ntt flag on priodically to perform periodic transmission of lacpdu's.

 */

static void ad_periodic_machine(struct port *port)

static void ad_periodic_machine(struct port *port, struct bond_params bond_params)

{

	periodic_states_t last_state;
@@ -1306,8 +1307,8 @@ static void ad_periodic_machine(struct port *port) 


	/* check if port was reinitialized */

	if (((port->sm_vars & AD_PORT_BEGIN) || !(port->sm_vars & AD_PORT_LACP_ENABLED) || !port->is_enabled) ||

	    (!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY))

	   ) {

	    (!(port->actor_oper_port_state & LACP_STATE_LACP_ACTIVITY) && !(port->partner_oper.port_state & LACP_STATE_LACP_ACTIVITY)) ||

	    !bond_params.lacp_active) {

		port->sm_periodic_state = AD_NO_PERIODIC;

	}

	/* check if state machine should change state */
@@ -2341,7 +2342,7 @@ void bond_3ad_state_machine_handler(struct work_struct *work) 
		}



		ad_rx_machine(NULL, port);

		ad_periodic_machine(port);

		ad_periodic_machine(port, bond->params);

		ad_port_selection_logic(port, &update_slave_arr);

		ad_mux_machine(port, &update_slave_arr);

		ad_tx_machine(port);

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -5478,6 +5478,7 @@ static int bond_check_params(struct bond_params *params) 
	params->downdelay = downdelay;

	params->peer_notif_delay = 0;

	params->use_carrier = use_carrier;

	params->lacp_active = 1;

	params->lacp_fast = lacp_fast;

	params->primary[0] = 0;

	params->primary_reselect = primary_reselect_value;

drivers/net/bonding/bond_netlink.c

+16 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { 
	[IFLA_BOND_MIN_LINKS]		= { .type = NLA_U32 },

	[IFLA_BOND_LP_INTERVAL]		= { .type = NLA_U32 },

	[IFLA_BOND_PACKETS_PER_SLAVE]	= { .type = NLA_U32 },

	[IFLA_BOND_AD_LACP_ACTIVE]	= { .type = NLA_U8 },

	[IFLA_BOND_AD_LACP_RATE]	= { .type = NLA_U8 },

	[IFLA_BOND_AD_SELECT]		= { .type = NLA_U8 },

	[IFLA_BOND_AD_INFO]		= { .type = NLA_NESTED },
@@ -387,6 +388,16 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[], 
		if (err)

			return err;

	}



	if (data[IFLA_BOND_AD_LACP_ACTIVE]) {

		int lacp_active = nla_get_u8(data[IFLA_BOND_AD_LACP_ACTIVE]);



		bond_opt_initval(&newval, lacp_active);

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

		if (err)

			return err;

	}



	if (data[IFLA_BOND_AD_LACP_RATE]) {

		int lacp_rate =

			nla_get_u8(data[IFLA_BOND_AD_LACP_RATE]);
@@ -490,6 +501,7 @@ static size_t bond_get_size(const struct net_device *bond_dev) 
		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 */

		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_LACP_ACTIVE */

		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_LACP_RATE */

		nla_total_size(sizeof(u8)) +	/* IFLA_BOND_AD_SELECT */

		nla_total_size(sizeof(struct nlattr)) + /* IFLA_BOND_AD_INFO */
@@ -622,6 +634,10 @@ static int bond_fill_info(struct sk_buff *skb, 
			packets_per_slave))

		goto nla_put_failure;



	if (nla_put_u8(skb, IFLA_BOND_AD_LACP_ACTIVE,

		       bond->params.lacp_active))

		goto nla_put_failure;



	if (nla_put_u8(skb, IFLA_BOND_AD_LACP_RATE,

		       bond->params.lacp_fast))

		goto nla_put_failure;

drivers/net/bonding/bond_options.c

+27 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ static int bond_option_lp_interval_set(struct bonding *bond, 
				       const struct bond_opt_value *newval);

static int bond_option_pps_set(struct bonding *bond,

			       const struct bond_opt_value *newval);

static int bond_option_lacp_active_set(struct bonding *bond,

				       const struct bond_opt_value *newval);

static int bond_option_lacp_rate_set(struct bonding *bond,

				     const struct bond_opt_value *newval);

static int bond_option_ad_select_set(struct bonding *bond,
@@ -135,6 +137,12 @@ static const struct bond_opt_value bond_intmax_tbl[] = { 
	{ NULL,      -1,      0}

};



static const struct bond_opt_value bond_lacp_active[] = {

	{ "off", 0,  0},

	{ "on",  1,  BOND_VALFLAG_DEFAULT},

	{ NULL,  -1, 0}

};



static const struct bond_opt_value bond_lacp_rate_tbl[] = {

	{ "slow", AD_LACP_SLOW, 0},

	{ "fast", AD_LACP_FAST, 0},
@@ -283,6 +291,15 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { 
		.values = bond_intmax_tbl,

		.set = bond_option_updelay_set

	},

	[BOND_OPT_LACP_ACTIVE] = {

		.id = BOND_OPT_LACP_ACTIVE,

		.name = "lacp_active",

		.desc = "Send LACPDU frames with configured lacp rate or acts as speak when spoken to",

		.flags = BOND_OPTFLAG_IFDOWN,

		.unsuppmodes = BOND_MODE_ALL_EX(BIT(BOND_MODE_8023AD)),

		.values = bond_lacp_active,

		.set = bond_option_lacp_active_set

	},

	[BOND_OPT_LACP_RATE] = {

		.id = BOND_OPT_LACP_RATE,

		.name = "lacp_rate",
@@ -1333,6 +1350,16 @@ static int bond_option_pps_set(struct bonding *bond, 
	return 0;

}



static int bond_option_lacp_active_set(struct bonding *bond,

				       const struct bond_opt_value *newval)

{

	netdev_dbg(bond->dev, "Setting LACP active to %s (%llu)\n",

		   newval->string, newval->value);

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



	return 0;

}



static int bond_option_lacp_rate_set(struct bonding *bond,

				     const struct bond_opt_value *newval)

{