bonding: add new option lacp_active
Subsystems (4)
PATCH v2 1/1 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
--- Documentation/networking/bonding.rst | 12 ++++++++++++ drivers/net/bonding/bond_3ad.c | 11 ++++++----- drivers/net/bonding/bond_main.c | 1 + drivers/net/bonding/bond_netlink.c | 16 ++++++++++++++++ drivers/net/bonding/bond_options.c | 27 +++++++++++++++++++++++++++ drivers/net/bonding/bond_procfs.c | 2 ++ drivers/net/bonding/bond_sysfs.c | 25 ++++++++++++++++++++----- include/net/bond_3ad.h | 1 + include/net/bond_options.h | 1 + include/net/bonding.h | 1 + include/uapi/linux/if_link.h | 1 + tools/include/uapi/linux/if_link.h | 1 + 12 files changed, 89 insertions(+), 10 deletions(-)
Documentation/networking/bonding.rst +12 -0
@@ -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
@@ -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
@@ -5477,6 +5477,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
@@ -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
@@ -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) {
drivers/net/bonding/bond_procfs.c +2 -0
@@ -133,6 +133,8 @@ static void bond_info_show_master(struct seq_file *seq)struct ad_info ad_info;seq_puts (seq,"\n802.3ad info\n" ); +seq_printf (seq,"LACP active: %s\n" , + (bond->params.lacp_active) ?"on" :"off" );seq_printf (seq,"LACP rate: %s\n" , (bond->params.lacp_fast) ?"fast" :"slow" );seq_printf (seq,"Min links: %d\n" , bond->params.min_links);
drivers/net/bonding/bond_sysfs.c +20 -5
@@ -339,10 +339,24 @@ static ssize_t bonding_show_peer_notif_delay(struct device *d, static DEVICE_ATTR(peer_notif_delay, 0644, bonding_show_peer_notif_delay, bonding_sysfs_store_option); -/* Show the LACP interval. */ -static ssize_t bonding_show_lacp (struct device *d, -struct device_attribute *attr, -char *buf) +/* Show the LACP activity and interval. */ +static ssize_t bonding_show_lacp_active (struct device *d, +struct device_attribute *attr, +char *buf) +{ +struct bonding *bond =to_bond (d); +const struct bond_opt_value *val; + + val =bond_opt_get_val (BOND_OPT_LACP_ACTIVE , bond->params.lacp_active); + +return sprintf (buf,"%s %d\n" , val->string, bond->params.lacp_active); +} +static DEVICE_ATTR(lacp_active, 0644, + bonding_show_lacp_active, bonding_sysfs_store_option); + +static ssize_t bonding_show_lacp_rate (struct device *d, +struct device_attribute *attr, +char *buf) {struct bonding *bond =to_bond (d);const struct bond_opt_value *val;
@@ -352,7 +366,7 @@ static ssize_t bonding_show_lacp(struct device *d,return sprintf (buf,"%s %d\n" , val->string, bond->params.lacp_fast); } static DEVICE_ATTR(lacp_rate, 0644, - bonding_show_lacp, bonding_sysfs_store_option); + bonding_show_lacp_rate, bonding_sysfs_store_option); static ssize_t bonding_show_min_links(struct device *d, struct device_attribute *attr,
@@ -738,6 +752,7 @@ static struct attribute *per_bond_attrs[] = { &dev_attr_downdelay.attr, &dev_attr_updelay.attr, &dev_attr_peer_notif_delay.attr, + &dev_attr_lacp_active.attr, &dev_attr_lacp_rate.attr, &dev_attr_ad_select.attr, &dev_attr_xmit_hash_policy.attr,
include/net/bond_3ad.h +1 -0
@@ -303,6 +303,7 @@ int __bond_3ad_get_active_agg_info(struct bonding *bond,int bond_3ad_lacpdu_recv (const struct sk_buff *skb,struct bonding *bond,struct slave *slave);int bond_3ad_set_carrier (struct bonding *bond); +void bond_3ad_update_lacp_active (struct bonding *bond);void bond_3ad_update_lacp_rate (struct bonding *bond);void bond_3ad_update_ad_actor_settings (struct bonding *bond);int bond_3ad_stats_fill (struct sk_buff *skb,struct bond_3ad_stats *stats);
include/net/bond_options.h +1 -0
@@ -64,6 +64,7 @@ enum {BOND_OPT_AD_USER_PORT_KEY ,BOND_OPT_NUM_PEER_NOTIF_ALIAS ,BOND_OPT_PEER_NOTIF_DELAY , +BOND_OPT_LACP_ACTIVE , BOND_OPT_LAST };
include/net/bonding.h +1 -0
@@ -129,6 +129,7 @@ struct bond_params {int updelay;int downdelay;int peer_notif_delay; +int lacp_active;int lacp_fast;unsigned int min_links;int ad_select;
include/uapi/linux/if_link.h +1 -0
@@ -855,6 +855,7 @@ enum {IFLA_BOND_AD_ACTOR_SYSTEM ,IFLA_BOND_TLB_DYNAMIC_LB ,IFLA_BOND_PEER_NOTIF_DELAY , +IFLA_BOND_AD_LACP_ACTIVE , __IFLA_BOND_MAX, };
tools/include/uapi/linux/if_link.h +1 -0
@@ -653,6 +653,7 @@ enum {IFLA_BOND_AD_ACTOR_SYSTEM ,IFLA_BOND_TLB_DYNAMIC_LB ,IFLA_BOND_PEER_NOTIF_DELAY , +IFLA_BOND_AD_LACP_ACTIVE , __IFLA_BOND_MAX, };
Signature · 1 line
2.31.1
PATCH 1/1 ip/bond: add lacp active support
lacp_active 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".
--- include/uapi/linux/if_link.h | 1 + ip/iplink_bond.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)
include/uapi/linux/if_link.h +1 -0
@@ -853,6 +853,7 @@ enum {IFLA_BOND_AD_ACTOR_SYSTEM ,IFLA_BOND_TLB_DYNAMIC_LB ,IFLA_BOND_PEER_NOTIF_DELAY , +IFLA_BOND_AD_LACP_ACTIVE , __IFLA_BOND_MAX, };
ip/iplink_bond.c +25 -1
@@ -74,6 +74,12 @@ static const char *xmit_hash_policy_tbl[] = { NULL, }; +static const char *lacp_active_tbl[] = { +"off" , +"on" , +NULL , +}; +static const char *lacp_rate_tbl[] = {"slow" ,"fast" ,
@@ -138,6 +144,7 @@ static void print_explain(FILE *f)" [ lp_interval LP_INTERVAL ]\n" " [ packets_per_slave PACKETS_PER_SLAVE ]\n" " [ tlb_dynamic_lb TLB_DYNAMIC_LB ]\n" +" [ lacp_active LACP_ACTIVE]\n" " [ lacp_rate LACP_RATE ]\n" " [ ad_select AD_SELECT ]\n" " [ ad_user_port_key PORTKEY ]\n"
@@ -150,6 +157,7 @@ static void print_explain(FILE *f)"PRIMARY_RESELECT := always|better|failure\n" "FAIL_OVER_MAC := none|active|follow\n" "XMIT_HASH_POLICY := layer2|layer2+3|layer3+4|encap2+3|encap3+4|vlan+srcmac\n" +"LACP_ACTIVE := off|on\n" "LACP_RATE := slow|fast\n" "AD_SELECT := stable|bandwidth|count\n" );
@@ -165,7 +173,7 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv, {__u8 mode, use_carrier, primary_reselect, fail_over_mac;__u8 xmit_hash_policy, num_peer_notif, all_slaves_active; -__u8 lacp_rate, ad_select, tlb_dynamic_lb; +__u8 lacp_active, lacp_rate, ad_select, tlb_dynamic_lb;__u16 ad_user_port_key, ad_actor_sys_prio;__u32 miimon, updelay, downdelay, peer_notify_delay, arp_interval, arp_validate;__u32 arp_all_targets, resend_igmp, min_links, lp_interval;
@@ -316,6 +324,13 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,addattr32 (n,1024 ,IFLA_BOND_PACKETS_PER_SLAVE , packets_per_slave); + }else if (matches (*argv,"lacp_active" ) ==0 ) { +NEXT_ARG (); +if (get_index (lacp_active_tbl, *argv) <0 ) +invarg ("invalid lacp_active" , *argv); + + lacp_active =get_index (lacp_active_tbl, *argv); +addattr8 (n,1024 ,IFLA_BOND_AD_LACP_ACTIVE , lacp_active); }else if (matches (*argv,"lacp_rate" ) ==0 ) {NEXT_ARG ();if (get_index (lacp_rate_tbl, *argv) <0 )
@@ -561,6 +576,15 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])"packets_per_slave %u " , rta_getattr_u32(tb[IFLA_BOND_PACKETS_PER_SLAVE])); +if (tb[IFLA_BOND_AD_LACP_ACTIVE ]) { +const char *lacp_active =get_name (lacp_active_tbl, +rta_getattr_u8 (tb[IFLA_BOND_AD_LACP_ACTIVE ])); +print_string (PRINT_ANY , +"ad_lacp_active" , +"lacp_active %s " , + lacp_active); + } +if (tb[IFLA_BOND_AD_LACP_RATE ]) {const char *lacp_rate =get_name (lacp_rate_tbl,rta_getattr_u8 (tb[IFLA_BOND_AD_LACP_RATE ]));
Signature · 1 line
2.31.1
Re: [PATCH iproute2-next] ip/bond: add lacp active support
ip/iplink_bond.c static int bond_parse_opt(struct link_util *lu, int argc, char **argv, · line 334
Quoted 12 lines · Hangbin Liu
ip/iplink_bond.c +7
-0@@ -316,6 +324,13 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,addattr32 (n,1024 ,IFLA_BOND_PACKETS_PER_SLAVE , packets_per_slave); + }else if (matches (*argv,"lacp_active" ) ==0 ) { +NEXT_ARG (); +if (get_index (lacp_active_tbl, *argv) <0 ) +invarg ("invalid lacp_active" , *argv); + + lacp_active =get_index (lacp_active_tbl, *argv); +addattr8 (n,1024 ,IFLA_BOND_AD_LACP_ACTIVE , lacp_active); }else if (matches (*argv,"lacp_rate" ) ==0 ) {
The new argument needs to go after the older "lacp_rate" since it uses matches. Also, let's stop using matches and move to a full strcmp for new options.
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 8 lines · On Mon, 2 Aug 2021 11:02:19 +0800 you wrote:
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 configuredlacp_ratesetting. 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.
[...]
Here is the summary with links:
- [PATCHv2,net-next] bonding: add new option lacp_active
https://git.kernel.org/netdev/net-next/c/3a755cd8b7c6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html