ip: bridge: add support for mst_enabled

When enabled, the bridge's legacy per-VLAN STP facility is replaced
with the Multiple Spanning Tree Protocol (MSTP) compatible version.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Reviewed-by: Hangbin Liu <liuhangbin@gmail.com>
Acked-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
index 6b70ffbb6f5f4bc194ec8bda162fd9ce725439a1..f01ffe15d7e8758799630c6cba071d2585051463 100644 (file)
--- a/ip/iplink_bridge.c
+++ b/ip/iplink_bridge.c
@@ -30,6 +30,7 @@ static void print_explain(FILE *f)
                "                 [ max_age MAX_AGE ]\n"
                "                 [ ageing_time AGEING_TIME ]\n"
                "                 [ stp_state STP_STATE ]\n"
+               "                 [ mst_enabled MST_ENABLED ]\n"
                "                 [ priority PRIORITY ]\n"
                "                 [ group_fwd_mask MASK ]\n"
                "                 [ group_address ADDRESS ]\n"
@@ -169,6 +170,18 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
                                bm.optval |= no_ll_learn_bit;
                        else
                                bm.optval &= ~no_ll_learn_bit;
+               } else if (strcmp(*argv, "mst_enabled") == 0) {
+                       __u32 mst_bit = 1 << BR_BOOLOPT_MST_ENABLE;
+                       __u8 mst_enabled;
+
+                       NEXT_ARG();
+                       if (get_u8(&mst_enabled, *argv, 0))
+                               invarg("invalid mst_enabled", *argv);
+                       bm.optmask |= mst_bit;
+                       if (mst_enabled)
+                               bm.optval |= mst_bit;
+                       else
+                               bm.optval &= ~mst_bit;
                } else if (strcmp(*argv, "fdb_max_learned") == 0) {
                        __u32 fdb_max_learned;
 
@@ -609,6 +622,7 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
        if (tb[IFLA_BR_MULTI_BOOLOPT]) {
                __u32 mcvl_bit = 1 << BR_BOOLOPT_MCAST_VLAN_SNOOPING;
                __u32 no_ll_learn_bit = 1 << BR_BOOLOPT_NO_LL_LEARN;
+               __u32 mst_bit = 1 << BR_BOOLOPT_MST_ENABLE;
                struct br_boolopt_multi *bm;
 
                bm = RTA_DATA(tb[IFLA_BR_MULTI_BOOLOPT]);
@@ -622,6 +636,11 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                                   "mcast_vlan_snooping",
                                   "mcast_vlan_snooping %u ",
                                    !!(bm->optval & mcvl_bit));
+               if (bm->optmask & mst_bit)
+                       print_uint(PRINT_ANY,
+                                  "mst_enabled",
+                                  "mst_enabled %u ",
+                                  !!(bm->optval & mst_bit));
        }
 
        if (tb[IFLA_BR_MCAST_ROUTER])

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index c198415828b93ec602e206e4bf40ce06ec649f7d..eabca4903302fd0a073db50a3f3050014a89fc09 100644 (file)
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -1685,6 +1685,8 @@ the following additional arguments are supported:
 ] [
 .BI stp_state " STP_STATE "
 ] [
+.BI mst_enabled " MST_ENABLED "
+] [
 .BI priority " PRIORITY "
 ] [
 .BI no_linklocal_learn " NO_LINKLOCAL_LEARN "
@@ -1788,6 +1790,18 @@ or off
 .RI ( STP_STATE " == 0). "
 for this bridge.
 
+.BI mst_enabled " MST_ENABLED "
+- turn multiple spanning tree (MST) support on
+.RI ( MST_ENABLED " > 0) "
+or off
+.RI ( MST_ENABLED " == 0). "
+When enabled, sets of VLANs can be associated with multiple spanning
+tree instances (MSTIs), and STP states for each port can be controlled
+on a per-MSTI basis. Note: no implementation of the MSTP protocol is
+provided, only the primitives needed to implement it. To avoid
+interfering with the legacy per-VLAN STP states, this setting can only
+be changed when no bridge VLANs are configured.
+
 .BI priority " PRIORITY "
 - set this bridge's spanning tree priority, used during STP root
 bridge election.