net: bridge: vlan: add support for mcast igmp/mld version global options

Add support to change and retrieve global vlan IGMP/MLD versions.

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 5aca85874447d179358596425e24141828792cad..5188b9f6da28c0c17fffa053ce02dcb2a5f49137 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -549,6 +549,8 @@ enum {
        BRIDGE_VLANDB_GOPTS_ID,
        BRIDGE_VLANDB_GOPTS_RANGE,
        BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,
+       BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION,
+       BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
        __BRIDGE_VLANDB_GOPTS_MAX
 };
 #define BRIDGE_VLANDB_GOPTS_MAX (__BRIDGE_VLANDB_GOPTS_MAX - 1)

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 470f1ec3b579aaa846e9581f447d122302e325c6..643b69d767f74ee40d4a817ce8b5dc91b01a9782 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -4327,7 +4327,8 @@ unlock:
        return 0;
 }
 
-int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val)
+int br_multicast_set_igmp_version(struct net_bridge_mcast *brmctx,
+                                 unsigned long val)
 {
        /* Currently we support only version 2 and 3 */
        switch (val) {
@@ -4338,15 +4339,16 @@ int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val)
                return -EINVAL;
        }
 
-       spin_lock_bh(&br->multicast_lock);
-       br->multicast_ctx.multicast_igmp_version = val;
-       spin_unlock_bh(&br->multicast_lock);
+       spin_lock_bh(&brmctx->br->multicast_lock);
+       brmctx->multicast_igmp_version = val;
+       spin_unlock_bh(&brmctx->br->multicast_lock);
 
        return 0;
 }
 
 #if IS_ENABLED(CONFIG_IPV6)
-int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val)
+int br_multicast_set_mld_version(struct net_bridge_mcast *brmctx,
+                                unsigned long val)
 {
        /* Currently we support version 1 and 2 */
        switch (val) {
@@ -4357,9 +4359,9 @@ int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val)
                return -EINVAL;
        }
 
-       spin_lock_bh(&br->multicast_lock);
-       br->multicast_ctx.multicast_mld_version = val;
-       spin_unlock_bh(&br->multicast_lock);
+       spin_lock_bh(&brmctx->br->multicast_lock);
+       brmctx->multicast_mld_version = val;
+       spin_unlock_bh(&brmctx->br->multicast_lock);
 
        return 0;
 }

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 616a1b6dec3caa7da35849debf94134926f0ebea..ded1b244dfcdbeba3756fd2b4c7359168c9f3d3c 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1380,7 +1380,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
                __u8 igmp_version;
 
                igmp_version = nla_get_u8(data[IFLA_BR_MCAST_IGMP_VERSION]);
-               err = br_multicast_set_igmp_version(br, igmp_version);
+               err = br_multicast_set_igmp_version(&br->multicast_ctx,
+                                                   igmp_version);
                if (err)
                        return err;
        }
@@ -1390,7 +1391,8 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
                __u8 mld_version;
 
                mld_version = nla_get_u8(data[IFLA_BR_MCAST_MLD_VERSION]);
-               err = br_multicast_set_mld_version(br, mld_version);
+               err = br_multicast_set_mld_version(&br->multicast_ctx,
+                                                  mld_version);
                if (err)
                        return err;
        }

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 51991f1b3e5ae73ca8f0492f0cf23bf0b78a76c0..b0b1e1aa4db48f9369ee27a72cf9a5e7f017a06c 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -883,9 +883,11 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val,
                        struct netlink_ext_ack *extack);
 int br_multicast_set_querier(struct net_bridge *br, unsigned long val);
 int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val);
-int br_multicast_set_igmp_version(struct net_bridge *br, unsigned long val);
+int br_multicast_set_igmp_version(struct net_bridge_mcast *brmctx,
+                                 unsigned long val);
 #if IS_ENABLED(CONFIG_IPV6)
-int br_multicast_set_mld_version(struct net_bridge *br, unsigned long val);
+int br_multicast_set_mld_version(struct net_bridge_mcast *brmctx,
+                                unsigned long val);
 #endif
 struct net_bridge_mdb_entry *
 br_mdb_ip_get(struct net_bridge *br, struct br_ip *dst);
@@ -1165,6 +1167,19 @@ br_multicast_port_ctx_state_stopped(const struct net_bridge_mcast_port *pmctx)
               (br_multicast_port_ctx_is_vlan(pmctx) &&
                pmctx->vlan->state == BR_STATE_BLOCKING);
 }
+
+static inline bool
+br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,
+                              const struct net_bridge_mcast *brmctx2)
+{
+       return brmctx1->multicast_igmp_version ==
+              brmctx2->multicast_igmp_version &&
+#if IS_ENABLED(CONFIG_IPV6)
+              brmctx1->multicast_mld_version ==
+              brmctx2->multicast_mld_version &&
+#endif
+              true;
+}
 #else
 static inline int br_multicast_rcv(struct net_bridge_mcast **brmctx,
                                   struct net_bridge_mcast_port **pmctx,
@@ -1330,6 +1345,13 @@ static inline int br_mdb_replay(struct net_device *br_dev,
 {
        return -EOPNOTSUPP;
 }
+
+static inline bool
+br_multicast_ctx_options_equal(const struct net_bridge_mcast *brmctx1,
+                              const struct net_bridge_mcast *brmctx2)
+{
+       return true;
+}
 #endif
 
 /* br_vlan.c */

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 953d544663d56d734468838bf6565d6cd7dfe6fb..08e31debd6f2f0ddb1a598cefa64c69942e88d0f 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -520,7 +520,7 @@ static ssize_t multicast_igmp_version_show(struct device *d,
 static int set_multicast_igmp_version(struct net_bridge *br, unsigned long val,
                                      struct netlink_ext_ack *extack)
 {
-       return br_multicast_set_igmp_version(br, val);
+       return br_multicast_set_igmp_version(&br->multicast_ctx, val);
 }
 
 static ssize_t multicast_igmp_version_store(struct device *d,
@@ -757,7 +757,7 @@ static ssize_t multicast_mld_version_show(struct device *d,
 static int set_multicast_mld_version(struct net_bridge *br, unsigned long val,
                                     struct netlink_ext_ack *extack)
 {
-       return br_multicast_set_mld_version(br, val);
+       return br_multicast_set_mld_version(&br->multicast_ctx, val);
 }
 
 static ssize_t multicast_mld_version_store(struct device *d,

diff --git a/net/bridge/br_vlan_options.c b/net/bridge/br_vlan_options.c
index 4ef975b201858135c3bc7baa6bd352e3582d6c89..ac32fb40b7bad75bb3df17072eb99f06e2e7ec1d 100644 (file)
--- a/net/bridge/br_vlan_options.c
+++ b/net/bridge/br_vlan_options.c
@@ -264,7 +264,9 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,
 {
        return v_curr->vid - r_end->vid == 1 &&
               ((v_curr->priv_flags ^ r_end->priv_flags) &
-               BR_VLFLAG_GLOBAL_MCAST_ENABLED) == 0;
+               BR_VLFLAG_GLOBAL_MCAST_ENABLED) == 0 &&
+               br_multicast_ctx_options_equal(&v_curr->br_mcast_ctx,
+                                              &r_end->br_mcast_ctx);
 }
 
 bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
@@ -285,8 +287,16 @@ bool br_vlan_global_opts_fill(struct sk_buff *skb, u16 vid, u16 vid_range,
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING,
-                      !!(v_opts->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED)))
+                      !!(v_opts->priv_flags & BR_VLFLAG_GLOBAL_MCAST_ENABLED)) ||
+           nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION,
+                      v_opts->br_mcast_ctx.multicast_igmp_version))
+               goto out_err;
+
+#if IS_ENABLED(CONFIG_IPV6)
+       if (nla_put_u8(skb, BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION,
+                      v_opts->br_mcast_ctx.multicast_mld_version))
                goto out_err;
+#endif
 #endif
 
        nla_nest_end(skb, nest);
@@ -305,6 +315,8 @@ static size_t rtnl_vlan_global_opts_nlmsg_size(void)
                + nla_total_size(sizeof(u16)) /* BRIDGE_VLANDB_GOPTS_ID */
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
                + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING */
+               + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION */
+               + nla_total_size(sizeof(u8)) /* BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION */
 #endif
                + nla_total_size(sizeof(u16)); /* BRIDGE_VLANDB_GOPTS_RANGE */
 }
@@ -359,6 +371,8 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,
                                           bool *changed,
                                           struct netlink_ext_ack *extack)
 {
+       int err __maybe_unused;
+
        *changed = false;
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
        if (tb[BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]) {
@@ -368,6 +382,26 @@ static int br_vlan_process_global_one_opts(const struct net_bridge *br,
                if (br_multicast_toggle_global_vlan(v, !!mc_snooping))
                        *changed = true;
        }
+       if (tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]) {
+               u8 ver;
+
+               ver = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]);
+               err = br_multicast_set_igmp_version(&v->br_mcast_ctx, ver);
+               if (err)
+                       return err;
+               *changed = true;
+       }
+#if IS_ENABLED(CONFIG_IPV6)
+       if (tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]) {
+               u8 ver;
+
+               ver = nla_get_u8(tb[BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION]);
+               err = br_multicast_set_mld_version(&v->br_mcast_ctx, ver);
+               if (err)
+                       return err;
+               *changed = true;
+       }
+#endif
 #endif
 
        return 0;
@@ -377,6 +411,8 @@ static const struct nla_policy br_vlan_db_gpol[BRIDGE_VLANDB_GOPTS_MAX + 1] = {
        [BRIDGE_VLANDB_GOPTS_ID]        = { .type = NLA_U16 },
        [BRIDGE_VLANDB_GOPTS_RANGE]     = { .type = NLA_U16 },
        [BRIDGE_VLANDB_GOPTS_MCAST_SNOOPING]    = { .type = NLA_U8 },
+       [BRIDGE_VLANDB_GOPTS_MCAST_MLD_VERSION] = { .type = NLA_U8 },
+       [BRIDGE_VLANDB_GOPTS_MCAST_IGMP_VERSION]        = { .type = NLA_U8 },
 };
 
 int br_vlan_rtm_process_global_options(struct net_device *dev,