net: bridge: vlan: add support for mcast membership interval global option

Add support to change and retrieve global vlan multicast membership
interval option.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 950ad175610e0c739b4f5f5f9725f596db869f0a..93f1f16617c8f18f88890ff7e7c76956b9870290 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -555,6 +555,7 @@ enum {
        BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT,
        BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
        BRIDGE_VLANDB_GOPTS_PAD,
+       BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
        __BRIDGE_VLANDB_GOPTS_MAX
 };
 #define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 07b2241859ae63d32f85a2c9c4600a2b4d34728d..6508340fd5fce0426855409f517b5ed01f174f4b 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -1180,6 +1180,8 @@ br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,
               brmctx2->multicast_startup_query_count &&
               brmctx1->multicast_last_member_interval ==
               brmctx2->multicast_last_member_interval &&
+              brmctx1->multicast_membership_interval ==
+              brmctx2->multicast_membership_interval &&
 #if IS_ENABLED(CONFIG_IPV6)
               brmctx1->multicast_mld_version ==
               brmctx2->multicast_mld_version &&

diff --git a/net/bridge/br_vlan_options.c b/net/bridge/br_vlan_options.c
index 26f242acef750913c8e31d744a5c16275a46476a..9d695a63732c8085fabc89bf7176aa20e4770c7f 100644 (file)
--- a/net/bridge/br_vlan_options.c
+++ b/net/bridge/br_vlan_options.c
@@ -301,6 +301,10 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
        if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL,
                              clockval, BRIDGE_VLANDB_GOPTS_PAD))
                goto out_err;
+       clockval = jiffies_to_clock_t(v_opts->br_mcast_ctx.multicast_membership_interval);
+       if (nla_put_u64_64bit(skb, BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL,
+                             clockval, BRIDGE_VLANDB_GOPTS_PAD))
+               goto out_err;
 
 #if IS_ENABLED(CONFIG_IPV6)
        if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
@@ -330,6 +334,7 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void)
                + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT */
                + nla_total_size(sizeof(u32)) /* BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT */
                + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL */
+               + nla_total_size(sizeof(u64)) /* BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL */
 #endif
                + nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */
 }
@@ -425,6 +430,13 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,
                v->br_mcast_ctx.multicast_last_member_interval = clock_t_to_jiffies(val);
                *changed = true;
        }
+       if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]) {
+               u64 val;
+
+               val = nla_get_u64(tb[BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]);
+               v->br_mcast_ctx.multicast_membership_interval = clock_t_to_jiffies(val);
+               *changed = true;
+       }
 #if IS_ENABLED(CONFIG_IPV6)
        if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {
                u8 ver;
@@ -450,6 +462,7 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = {
        [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_CNT]     = { .type = NLA_U32 },
        [BRIDGE_VLANDB_GOPTS_MCAST_STARTUP_QUERY_CNT]   = { .type = NLA_U32 },
        [BRIDGE_VLANDB_GOPTS_MCAST_LAST_MEMBER_INTVL]   = { .type = NLA_U64 },
+       [BRIDGE_VLANDB_GOPTS_MCAST_MEMBERSHIP_INTVL]    = { .type = NLA_U64 },
 };
 
 int br_vlan_rtm_process_global_options(struct net_device *dev,