bridge: vlan: add global mcast_membership_interval option

Add control and dump support for the global mcast_membership_interval
option which controls the interval after which the bridge will leave a
group if no reports have been received for it. To be consistent with the
same bridge-wide option the value is reported with USER_HZ granularity and
the same granularity is expected when setting it.
The default is 26000 (260 seconds).
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_membership_interval 13000

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/bridge/vlan.c b/bridge/vlan.c
index 446a611f2119df19bf41e25e5593abb0cb059e84..9f94819036bd0953561cf2750b30e03d63c8a7d1 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -45,6 +45,7 @@ static void usage(void)
                "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
                "                      [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
                "                      [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
+               "                      [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
@@ -448,6 +449,14 @@ static int vlan_global_option_set(int argc, char **argv)
                        addattr64(&req.n, 1024,
                                  BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
                                  val64);
+               } else if (strcmp(*argv, "mcast_membership_interval") == 0) {
+                       NEXT_ARG();
+                       if (get_u64(&val64, *argv, 0))
+                               invarg("invalid mcast_membership_interval",
+                                      *argv);
+                       addattr64(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
+                                 val64);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -814,6 +823,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                           "mcast_startup_query_count %u ",
                           rta_getattr_u32(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL];
+               print_lluint(PRINT_ANY, "mcast_membership_interval",
+                            "mcast_membership_interval %llu ",
+                            rta_getattr_u64(vattr));
+       }
        print_nl();
        close_json_object();
 }

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 0d973a9db0e0df4f2cb91b6362674f7c665da7f5..a026ca16f89aac611a6a1868b45ab1eb1f3f048f 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -169,7 +169,9 @@ bridge \- show / manipulate bridge addresses and devices
 .B mcast_last_member_interval
 .IR LAST_MEMBER_INTERVAL " ] [ "
 .B mcast_startup_query_count
-.IR STARTUP_QUERY_COUNT " ]"
+.IR STARTUP_QUERY_COUNT " ] [ "
+.B mcast_membership_interval
+.IR MEMBERSHIP_INTERVAL " ]"
 
 .ti -8
 .BR "bridge vlan global" " [ " show " ] [ "
@@ -964,6 +966,11 @@ after a "leave" message is received.
 .BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
 set the number of queries to send during startup phase. Default is 2.
 
+.TP
+.BI mcast_membership_interval " MEMBERSHIP_INTERVAL "
+delay after which the bridge will leave a group,
+if no membership reports for this group are received.
+
 .SS bridge vlan global show - list global vlan options.
 
 This command displays the global VLAN options for each VLAN entry.