bridge: vlan: add global mcast_querier_interval option

Add control and dump support for the global mcast_querier_interval
option which controls the interval after which if no other router
queries are seen the bridge will start sending its own queries.
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.
Syntax:
 $ bridge vlan global set dev bridge vid 1 mcast_querier_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 9f94819036bd0953561cf2750b30e03d63c8a7d1..275589af8691953845a230feb5d4df05ddb7cb7a 100644 (file)
--- a/bridge/vlan.c
+++ b/bridge/vlan.c
@@ -46,6 +46,7 @@ static void usage(void)
                "                      [ mcast_last_member_interval LAST_MEMBER_INTERVAL ]\n"
                "                      [ mcast_startup_query_count STARTUP_QUERY_COUNT ]\n"
                "                      [ mcast_membership_interval MEMBERSHIP_INTERVAL ]\n"
+               "                      [ mcast_querier_interval QUERIER_INTERVAL ]\n"
                "       bridge vlan global { show } [ dev DEV ] [ vid VLAN_ID ]\n");
        exit(-1);
 }
@@ -457,6 +458,14 @@ static int vlan_global_option_set(int argc, char **argv)
                        addattr64(&req.n, 1024,
                                  BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
                                  val64);
+               } else if (strcmp(*argv, "mcast_querier_interval") == 0) {
+                       NEXT_ARG();
+                       if (get_u64(&val64, *argv, 0))
+                               invarg("invalid mcast_querier_interval",
+                                      *argv);
+                       addattr64(&req.n, 1024,
+                                 BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL,
+                                 val64);
                } else {
                        if (strcmp(*argv, "help") == 0)
                                NEXT_ARG();
@@ -829,6 +838,12 @@ static void print_vlan_global_opts(struct rtattr *a, int ifindex)
                             "mcast_membership_interval %llu ",
                             rta_getattr_u64(vattr));
        }
+       if (vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL]) {
+               vattr = vtb[BRIDGE_VLANDB_GOPTS_MCAST_QUERIER_INTVL];
+               print_lluint(PRINT_ANY, "mcast_querier_interval",
+                            "mcast_querier_interval %llu ",
+                            rta_getattr_u64(vattr));
+       }
        print_nl();
        close_json_object();
 }

diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index a026ca16f89aac611a6a1868b45ab1eb1f3f048f..f5c72ec83f9394c585a874f439954787cafdea9e 100644 (file)
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -171,7 +171,9 @@ bridge \- show / manipulate bridge addresses and devices
 .B mcast_startup_query_count
 .IR STARTUP_QUERY_COUNT " ] [ "
 .B mcast_membership_interval
-.IR MEMBERSHIP_INTERVAL " ]"
+.IR MEMBERSHIP_INTERVAL " ] [ "
+.B mcast_querier_interval
+.IR QUERIER_INTERVAL " ]"
 
 .ti -8
 .BR "bridge vlan global" " [ " show " ] [ "
@@ -971,6 +973,14 @@ set the number of queries to send during startup phase. Default is 2.
 delay after which the bridge will leave a group,
 if no membership reports for this group are received.
 
+.TP
+.BI mcast_querier_interval " QUERIER_INTERVAL "
+interval between queries sent by other routers. If no queries are seen
+after this delay has passed, the bridge will start to send its own queries
+(as if
+.BI mcast_querier
+was enabled).
+
 .SS bridge vlan global show - list global vlan options.
 
 This command displays the global VLAN options for each VLAN entry.