bridge: vlan: add global mcast_last_member_interval option

Add control and dump support for the global mcast_last_member_interval
option which controls the interval between queries to find remaining
members of a group after a leave message. 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 100 (1 second).
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_last_member_interval 200

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 c68f83407c0fcace1c0cfd7f135afee3d87de843..446a611f2119df19bf41e25e5593abb0cb059e84 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -43,6 +43,7 @@ static void usage(void)
                "                      [ mcast_igmp_version IGMP_VERSION ]\n"
                "                      [ mcast_mld_version MLD_VERSION ]\n"
                "                      [ mcast_last_member_count LAST_MEMBER_COUNT ]\n"
+               "                      [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
                "                      [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
@@ -361,6 +362,7 @@ static int vlan_global_option_set(int argc, char **argv)
        short vid_end = -1;
        char *d = NULL;
        short vid = -1;
+       __u64 val64;
        __u32 val32;
        __u8 val8;
 
@@ -438,6 +440,14 @@ static int vlan_global_option_set(int argc, char **argv)
                        addattr32(&req.n, 1024,
                                  BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
                                  val32);
+               } else if (strcmp(*argv, "mcast_last_member_interval") == 0) {
+                       NEXT_ARG();
+                       if (get_u64(&val64, *argv, 0))
+                               invarg("invalid mcast_last_member_interval",
+                                      *argv);
+                       addattr64(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
+                                 val64);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -792,6 +802,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                           "mcast_last_member_count %u ",
                           rta_getattr_u32(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL];
+               print_lluint(PRINT_ANY, "mcast_last_member_interval",
+                            "mcast_last_member_interval %llu ",
+                            rta_getattr_u64(vattr));
+       }
        if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]) {
                vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT];
                print_uint(PRINT_ANY, "mcast_startup_query_count",

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 7741382321cbbe752110bfdf6e091021e1321a72..0d973a9db0e0df4f2cb91b6362674f7c665da7f5 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -166,6 +166,8 @@ bridge \- show / manipulate bridge addresses and devices
 .IR MLD_VERSION " ] [ "
 .B mcast_last_member_count
 .IR LAST_MEMBER_COUNT " ] [ "
+.B mcast_last_member_interval
+.IR LAST_MEMBER_INTERVAL " ] [ "
 .B mcast_startup_query_count
 .IR STARTUP_QUERY_COUNT " ]"
 
@@ -953,6 +955,11 @@ set multicast last member count, ie the number of queries the bridge
 will send before stopping forwarding a multicast group after a "leave"
 message has been received. Default is 2.
 
+.TP
+.BI mcast_last_member_interval " LAST_MEMBER_INTERVAL "
+interval between queries to find remaining members of a group,
+after a "leave" message is received.
+
 .TP
 .BI mcast_startup_query_count " STARTUP_QUERY_COUNT "
 set the number of queries to send during startup phase. Default is 2.