Add support for the actor_port_prio option for bond slaves.
This per-port priority can be used by the bonding driver in ad_select to
choose the higher-priority aggregator during failover.

Signed-off-by: Hangbin Liu <redacted>
---
v4: no update
v3: rename ad_actor_port_prio to actor_port_prio
v2: no update
---
ip/iplink_bond.c       |  1 +
ip/iplink_bond_slave.c | 18 ++++++++++++++++--
man/man8/ip-link.8.in  |  6 ++++++
3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index d6960f6d9b03..1a2c1b3042a0 100644
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c

@@ -91,6 +91,7 @@ static const char *ad_select_tbl[] = {

	"stable",
	"bandwidth",
	"count",
+	"prio",

	NULL,
};

diff --git a/ip/iplink_bond_slave.c b/ip/iplink_bond_slave.c
index ad6875006950..c88100e248dd 100644
--- a/ip/iplink_bond_slave.c
+++ b/ip/iplink_bond_slave.c

@@ -15,7 +15,9 @@

static void print_explain(FILE *f)
{
-	fprintf(f, "Usage: ... bond_slave [ queue_id ID ] [ prio PRIORITY ]\n");
+	fprintf(f, "Usage: ... bond_slave [ queue_id ID ] [ prio PRIORITY ]\n"
+		   "                      [ actor_port_prio PRIORITY ]\n"
+	);
}

static void explain(void)

@@ -145,12 +147,18 @@ static void bond_slave_print_opt(struct link_util *lu, FILE *f, struct rtattr *t

			  state);
		print_slave_oper_state(f, "ad_partner_oper_port_state_str", state);
	}
+
+	if (tb[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO])
+		print_int(PRINT_ANY,
+			  "actor_port_prio",
+			  "actor_port_prio %d ",
+			  rta_getattr_u16(tb[IFLA_BOND_SLAVE_ACTOR_PORT_PRIO]));
}

static int bond_slave_parse_opt(struct link_util *lu, int argc, char **argv,
				struct nlmsghdr *n)
{
-	__u16 queue_id;
+	__u16 queue_id, actor_port_prio;
	int prio;

	while (argc > 0) {

@@ -164,6 +172,12 @@ static int bond_slave_parse_opt(struct link_util *lu, int argc, char **argv,

			if (get_s32(&prio, *argv, 0))
				invarg("prio is invalid", *argv);
			addattr32(n, 1024, IFLA_BOND_SLAVE_PRIO, prio);
+		} else if (strcmp(*argv, "actor_port_prio") == 0) {
+			NEXT_ARG();
+			if (get_u16(&actor_port_prio, *argv, 0))
+				invarg("actor prio is invalid", *argv);
+			addattr16(n, 1024, IFLA_BOND_SLAVE_ACTOR_PORT_PRIO,
+				  actor_port_prio);
		} else {
			if (matches(*argv, "help") != 0)
				fprintf(stderr,

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index e3297c577152..7995943ab11f 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in

@@ -2846,6 +2846,12 @@ the following additional arguments are supported:

(a 32bit signed value). This option only valid for active-backup(1),
balance-tlb (5) and balance-alb (6) mode.

+.sp
+.BI actor_port_prio " PRIORITY"
+- set the slave's ad actor port priority for 802.3ad aggregation selection
+logic during failover (a 16bit unsigned value). This option only valid for
+802.3ad (4) mode.
+
.in -8

.TP
-- 
2.50.1