Bonding: add per-port priority for failover re-selection

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_reselect rules.

This option could only be configured via netlink.

Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/networking/bonding.rst b/Documentation/networking/bonding.rst
index 43be378..53a18ff 100644 (file)
--- a/Documentation/networking/bonding.rst
+++ b/Documentation/networking/bonding.rst
@@ -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

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index dc3e9a0..e75acb1 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1026,12 +1026,38 @@ out:
 
 }
 
+/**
+ * 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;
 

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index 5a6f444..c2d080f 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -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;
 }
 

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 96eef19..3498db1 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -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)
 {

diff --git a/include/net/bond_options.h b/include/net/bond_options.h
index eade823..d2aea5c 100644 (file)
--- a/include/net/bond_options.h
+++ b/include/net/bond_options.h
@@ -67,6 +67,7 @@ enum {
        BOND_OPT_LACP_ACTIVE,
        BOND_OPT_MISSED_MAX,
        BOND_OPT_NS_TARGETS,
+       BOND_OPT_PRIO,
        BOND_OPT_LAST
 };
 

diff --git a/include/net/bonding.h b/include/net/bonding.h
index cb904d3..6e78d65 100644 (file)
--- a/include/net/bonding.h
+++ b/include/net/bonding.h
@@ -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

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 5f58dcf..e36d9d2 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -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,
 };
 

diff --git a/tools/include/uapi/linux/if_link.h b/tools/include/uapi/linux/if_link.h
index b339bf2..0242f31 100644 (file)
--- a/tools/include/uapi/linux/if_link.h
+++ b/tools/include/uapi/linux/if_link.h
@@ -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,
 };