Bonding: add per-port priority support
Subsystems (4)
v3 cover Bonding: add per-port priority support
This patch set add per-port priority for bonding failover re-selection.
The first patch add a new filed for bond_opt_value so we can set slave value easier. I will update the bond_option_queue_id_set() setting in later patch.
The second patch add the per-port priority for bonding. I defined it as s32 to compatible with team prio option, which also use a s32 value.
v3: store slave_dev in bond_opt_value directly to simplify setting
values for slave.
v2: using the extant bonding options management stuff instead setting
slave prio in bond_slave_changelink() directly.
Hangbin Liu (2):
bonding: add slave_dev field for bond_opt_value
Bonding: add per-port priority for failover re-selection
Documentation/networking/bonding.rst | 11 ++++++++++ drivers/net/bonding/bond_main.c | 27 +++++++++++++++++++++++ drivers/net/bonding/bond_netlink.c | 15 +++++++++++++ drivers/net/bonding/bond_options.c | 33 ++++++++++++++++++++++++++++ include/net/bond_options.h | 11 ++++++++-- include/net/bonding.h | 1 + include/uapi/linux/if_link.h | 1 + tools/include/uapi/linux/if_link.h | 1 + 8 files changed, 98 insertions(+), 2 deletions(-)
Signature · 1 line
2.35.1
PATCH v3 1/2 bonding: add slave_dev field for bond_opt_value
Currently, bond_opt_value are mostly used for bonding option settings. If we want to set a value for slave, we need to re-alloc a string to store both slave name and vlaue, like bond_option_queue_id_set() does, which is complex and dumb.
As Jon suggested, let's add a union field slave_dev for bond_opt_value, which will be benefit for future slave option setting. In function __bond_opt_init(), we will always check the extra field and set it if it's not NULL.
--- include/net/bond_options.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
include/net/bond_options.h +8 -2
@@ -83,7 +83,10 @@ struct bond_opt_value {char *string;u64 value;u32 flags; -char extra[BOND_OPT_EXTRA_MAXLEN ]; +union { +char extra[BOND_OPT_EXTRA_MAXLEN ]; +struct net_device *slave_dev; + }; };struct bonding ;
@@ -133,13 +136,16 @@ static inline void __bond_opt_init(struct bond_opt_value *optval, optval->value = value; else if (string) optval->string = string; - else if (extra_len <= BOND_OPT_EXTRA_MAXLEN) + + if (extra && extra_len <= BOND_OPT_EXTRA_MAXLEN) memcpy(optval->extra, extra, extra_len); } #define bond_opt_initval(optval, value) __bond_opt_init(optval, NULL, value, NULL, 0) #define bond_opt_initstr(optval, str) __bond_opt_init(optval, str, ULLONG_MAX, NULL, 0) #define bond_opt_initextra(optval, extra, extra_len) \ __bond_opt_init(optval, NULL, ULLONG_MAX, extra, extra_len) +#define bond_opt_slave_initval(optval, slave_dev, value) \ + __bond_opt_init(optval, NULL, value, slave_dev, sizeof(struct net_device *)) void bond_option_arp_ip_targets_clear(struct bonding *bond); #if IS_ENABLED(CONFIG_IPV6)
Signature · 1 line
2.35.1
Re: [PATCHv3 net-next 1/2] bonding: add slave_dev field for bond_opt_value
Quoted 5 lines · Hangbin Liu
Currently,
bond_opt_valueare mostly used for bonding option settings. If we want to set a value for slave, we need to re-alloc a string to store both slave name and vlaue, likebond_option_queue_id_set()does, which is complex and dumb.
Quoted 7 lines
As Jon suggested, let's add a union field
slave_devforbond_opt_value, which will be benefit for future slave option setting. In function__bond_opt_init(), we will always check the extra field and set it if it's not NULL.Suggested-by Jonathan Toppins <[email protected]>Signed-off-by Hangbin Liu <[email protected]>
PATCH v3 2/2 Bonding: add per-port priority for failover re-selection
In reply to Hangbin LiuAdd per port priority support for bonding active slave re-selection during failover. A higher number means higher priority in selection. The primary slave still has the highest priority. This option also follows the primary_reselect rules.
This option could only be configured via netlink.
---
v3: store slave_dev in bond_opt_value directly to simplify setting
values for slave.
v2: using the extant bonding options management stuff instead setting
slave prio in bond_slave_changelink() directly.
--- Documentation/networking/bonding.rst | 11 ++++++++++ drivers/net/bonding/bond_main.c | 27 +++++++++++++++++++++++ drivers/net/bonding/bond_netlink.c | 15 +++++++++++++ drivers/net/bonding/bond_options.c | 33 ++++++++++++++++++++++++++++ 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 + 8 files changed, 90 insertions(+)
Documentation/networking/bonding.rst +11 -0
@@ -780,6 +780,17 @@ peer_notif_delay value is 0 which means to match the value of the link monitor interval. +prio + Slave priority. A higher number means higher priority. + The primary slave has the highest priority. This option also + follows the primary_reselect rules. + + This option could only be configured via netlink, and is only valid + for active-backup(1), balance-tlb (5) and balance-alb (6) mode. + The valid value range is a signed 32 bit integer. + + The default value is 0. + primary A string (eth0, eth2, etc) specifying which slave is the
drivers/net/bonding/bond_main.c +27 -0
@@ -1026,12 +1026,38 @@ static void bond_do_fail_over_mac(struct bonding *bond, } +/** +* bond_choose_primary_or_current - select the primary or high priority slave +* @bond: our bonding struct +* +* - Check if there is a primary link. If the primary link was set and is up, +* go on and do link reselection. +* +* - If primary link is not set or down, find the highest priority link. +* If the highest priority link is not current slave, set it as primary +* link and do link reselection. +*/ static struct slave *bond_choose_primary_or_current (struct bonding *bond) {struct slave *prim =rtnl_dereference (bond->primary_slave);struct slave *curr =rtnl_dereference (bond->curr_active_slave); +struct slave *slave, *hprio =NULL ; +struct list_head *iter;if (!prim || prim->link !=BOND_LINK_UP ) { +bond_for_each_slave (bond, slave, iter) { +if (slave->link ==BOND_LINK_UP ) { + hprio = hprio ?: slave; +if (slave->prio > hprio->prio) + hprio = slave; + } + } + +if (hprio && hprio != curr) { + prim = hprio; + goto link_reselect; + } +if (!curr || curr->link !=BOND_LINK_UP )return NULL ;return curr;
@@ -1042,6 +1068,7 @@ static struct slave *bond_choose_primary_or_current(struct bonding *bond)return prim; } +link_reselect:if (!curr || curr->link !=BOND_LINK_UP )return prim;
drivers/net/bonding/bond_netlink.c +15 -0
@@ -27,6 +27,7 @@ static size_t bond_get_slave_size(const struct net_device *bond_dev,nla_total_size (sizeof (u16)) +/* IFLA_BOND_SLAVE_AD_AGGREGATOR_ID */ nla_total_size (sizeof (u8)) +/* IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE */ nla_total_size (sizeof (u16)) +/* IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE */ +nla_total_size (sizeof (s32)) +/* IFLA_BOND_SLAVE_PRIO */ 0 ; }
@@ -53,6 +54,9 @@ static int bond_fill_slave_info(struct sk_buff *skb,if (nla_put_u16 (skb,IFLA_BOND_SLAVE_QUEUE_ID , slave->queue_id)) goto nla_put_failure; +if (nla_put_s32 (skb,IFLA_BOND_SLAVE_PRIO , slave->prio)) + goto nla_put_failure; +if (BOND_MODE (slave->bond) ==BOND_MODE_8023AD ) {const struct aggregator *agg;const struct port *ad_port;
@@ -117,6 +121,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX +1 ] = { [IFLA_BOND_SLAVE_QUEUE_ID ] = { .type =NLA_U16 }, + [IFLA_BOND_SLAVE_PRIO ] = { .type =NLA_S32 }, }; static int bond_validate(struct nlattr *tb[], struct nlattr *data[],
@@ -157,6 +162,16 @@ static int bond_slave_changelink(struct net_device *bond_dev,return err; } +if (data[IFLA_BOND_SLAVE_PRIO ]) { +int prio =nla_get_s32 (data[IFLA_BOND_SLAVE_PRIO ]); + +bond_opt_slave_initval (&newval, &slave_dev, prio); + err =__bond_opt_set (bond,BOND_OPT_PRIO , &newval, + data[IFLA_BOND_SLAVE_PRIO ], extack); +if (err) +return err; + } +return 0 ; }
drivers/net/bonding/bond_options.c +33 -0
@@ -40,6 +40,8 @@ static int bond_option_arp_validate_set(struct bonding *bond, const struct bond_opt_value *newval);static int bond_option_arp_all_targets_set (struct bonding *bond,const struct bond_opt_value *newval); +static int bond_option_prio_set (struct bonding *bond, +const struct bond_opt_value *newval);static int bond_option_primary_set (struct bonding *bond,const struct bond_opt_value *newval); static int bond_option_primary_reselect_set(struct bonding *bond,
@@ -365,6 +367,16 @@ static const struct bond_option bond_opts[BOND_OPT_LAST] = { .values = bond_intmax_tbl, .set = bond_option_miimon_set }, + [BOND_OPT_PRIO] = { + .id = BOND_OPT_PRIO, + .name = "prio", + .desc = "Link priority for failover re-selection", + .flags = BOND_OPTFLAG_RAWVAL, + .unsuppmodes =BOND_MODE_ALL_EX (BIT (BOND_MODE_ACTIVEBACKUP ) | +BIT (BOND_MODE_TLB ) | + BIT(BOND_MODE_ALB)), + .set = bond_option_prio_set + }, [BOND_OPT_PRIMARY] = { .id = BOND_OPT_PRIMARY, .name = "primary",
@@ -1306,6 +1318,27 @@ static int bond_option_missed_max_set(struct bonding *bond,return 0 ; } +static int bond_option_prio_set (struct bonding *bond, +const struct bond_opt_value *newval) +{ +struct slave *slave; + + slave =bond_slave_get_rtnl (newval->slave_dev); +if (!slave) { +netdev_dbg (newval->slave_dev,"%s called on NULL slave\n" , __func__); +return -ENODEV ; + } + slave->prio = newval->value; + +if (rtnl_dereference (bond->primary_slave)) +slave_warn (bond->dev, slave->dev, +"prio updated, but will not affect failover re-selection as primary slave have been set\n" ); +else +bond_select_active_slave (bond); + +return 0 ; +} +static int bond_option_primary_set (struct bonding *bond,const struct bond_opt_value *newval) {
include/net/bond_options.h +1 -0
@@ -67,6 +67,7 @@ enum {BOND_OPT_LACP_ACTIVE ,BOND_OPT_MISSED_MAX ,BOND_OPT_NS_TARGETS , +BOND_OPT_PRIO , BOND_OPT_LAST };
include/net/bonding.h +1 -0
@@ -178,6 +178,7 @@ struct slave {u32 speed;u16 queue_id;u8 perm_hwaddr[MAX_ADDR_LEN ]; +int prio;struct ad_slave_info *ad_info;struct tlb_slave_info tlb_info;#ifdef CONFIG_NET_POLL_CONTROLLER
include/uapi/linux/if_link.h +1 -0
@@ -963,6 +963,7 @@ enum {IFLA_BOND_SLAVE_AD_AGGREGATOR_ID ,IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE ,IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE , +IFLA_BOND_SLAVE_PRIO , __IFLA_BOND_SLAVE_MAX, };
tools/include/uapi/linux/if_link.h +1 -0
@@ -890,6 +890,7 @@ enum {IFLA_BOND_SLAVE_AD_AGGREGATOR_ID ,IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE ,IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE , +IFLA_BOND_SLAVE_PRIO , __IFLA_BOND_SLAVE_MAX, };
Signature · 1 line
2.35.1
Re: [PATCHv3 net-next 2/2] Bonding: add per-port priority for failover re-selection
Quoted 8 lines · Hangbin Liu
Add per port priority support for bonding active slave re-selection during failover. A higher number means higher priority in selection. The primary slave still has the highest priority. This option also follows the
primary_reselectrules.This option could only be configured via netlink.
Signed-off-by Hangbin Liu <[email protected]>
Quoted 7 lines
---
v3: storeslave_devinbond_opt_valuedirectly to simplify setting
values for slave.v2: using the extant bonding options management stuff instead setting
slave prio inbond_slave_changelink()directly.
---
PATCH v3 1/1 iplink: bond_slave: add per port prio support
In reply to Hangbin LiuAdd per port priority support for active slave re-selection during bonding failover. A higher number means higher priority.
This option is only valid for active-backup(1), balance-tlb (5) and balance-alb (6) mode.
---
v3: no update
v2: update man page
--- ip/iplink_bond_slave.c | 12 +++++++++++- man/man8/ip-link.8.in | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
ip/iplink_bond_slave.c +11 -1
@@ -19,7 +19,7 @@static void print_explain (FILE *f) { -fprintf (f,"Usage: ... bond_slave [ queue_id ID ]\n" ); +fprintf (f,"Usage: ... bond_slave [ queue_id ID ] [ prio PRIORITY ]\n" ); }static void explain (void )
@@ -120,6 +120,10 @@ static void bond_slave_print_opt(struct link_util *lu, FILE *f, struct rtattr *t"queue_id %d " , rta_getattr_u16(tb[IFLA_BOND_SLAVE_QUEUE_ID])); +if (tb[IFLA_BOND_SLAVE_PRIO ]) +print_int (PRINT_ANY ,"prio" ,"prio %d " , +rta_getattr_s32 (tb[IFLA_BOND_SLAVE_PRIO ])); +if (tb[IFLA_BOND_SLAVE_AD_AGGREGATOR_ID ]) print_int(PRINT_ANY, "ad_aggregator_id",
@@ -151,6 +155,7 @@ static int bond_slave_parse_opt(struct link_util *lu, int argc, char **argv, struct nlmsghdr *n) {__u16 queue_id; +int prio;while (argc >0 ) {if (matches (*argv,"queue_id" ) ==0 ) {
@@ -158,6 +163,11 @@ static int bond_slave_parse_opt(struct link_util *lu, int argc, char **argv,if (get_u16 (&queue_id, *argv,0 ))invarg ("queue_id is invalid" , *argv);addattr16 (n,1024 ,IFLA_BOND_SLAVE_QUEUE_ID , queue_id); + }else if (strcmp (*argv,"prio" ) ==0 ) { +NEXT_ARG (); +if (get_s32 (&prio, *argv,0 )) +invarg ("prio is invalid" , *argv); +addattr32 (n,1024 ,IFLA_BOND_SLAVE_PRIO , prio); }else {if (matches (*argv,"help" ) !=0 ) fprintf(stderr,
man/man8/ip-link.8.in +8 -0
@@ -2567,6 +2567,8 @@ the following additional arguments are supported: .B "ip link set type bond_slave" [ .BI queue_id " ID" +] [ +.BI prio " PRIORITY" ] .in +8
@@ -2574,6 +2576,12 @@ the following additional arguments are supported: .BI queue_id " ID" - set the slave's queue ID (a 16bit unsigned value). +.sp +.BI prio " PRIORITY" +- set the slave's priority for active slave re-selection during failover +(a 32bit signed value). This option only valid for active-backup(1), +balance-tlb (5) and balance-alb (6) mode. + .in -8 .TP
Signature · 1 line
2.35.1
Re: [PATCHv3 iproute2-next] iplink: bond_slave: add per port prio support
Quoted 7 lines · Hangbin Liu
Add per port priority support for active slave re-selection during bonding failover. A higher number means higher priority.
This option is only valid for active-backup(1), balance-tlb (5) and balance-alb (6) mode.
Signed-off-by Hangbin Liu <[email protected]>
Quoted 8 lines
---
v3: no update
v2: update man page--- ip/iplink_bond_slave.c | 12 +++++++++++- man/man8/ip-link.8.in | 8 ++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
Re: [PATCHv3 iproute2-next] iplink: bond_slave: add per port prio support
In reply to Hangbin LiuThis patch was applied to iproute2/iproute2-next.git (main) by David Ahern <[email protected]>:
Hello:
This patch was applied to iproute2/iproute2-next.git (main) by David Ahern <[email protected]>:
Quoted 9 lines · On Tue, 21 Jun 2022 15:51:05 +0800 you wrote:
Add per port priority support for active slave re-selection during bonding failover. A higher number means higher priority.
This option is only valid for active-backup(1), balance-tlb (5) and balance-alb (6) mode.
Signed-off-by Hangbin Liu <[email protected]>[...]
Here is the summary with links:
- [PATCHv3,iproute2-next] iplink: bond_slave: add per port prio support
https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=a10a197d715d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 11 lines · On Tue, 21 Jun 2022 15:49:17 +0800 you wrote:
This patch set add per-port priority for bonding failover re-selection.
The first patch add a new filed for
bond_opt_valueso we can set slave value easier. I will update thebond_option_queue_id_set()setting in later patch.The second patch add the per-port priority for bonding. I defined it as s32 to compatible with team prio option, which also use a s32 value.
[...]
Here is the summary with links:
- [PATCHv3,net-next,1/2] bonding: add slave_dev field for bond_opt_value
https://git.kernel.org/netdev/net-next/c/f2b3b28ce523 - [PATCHv3,net-next,2/2] Bonding: add per-port priority for failover re-selection https://git.kernel.org/netdev/net-next/c/0a2ff7cc8ad4
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html