net: bridge: mcast: move querier state to the multicast context

We need to have the querier state per multicast context in order to have
per-vlan control, so remove the internal option bit and move it to the
multicast context. Also annotate the lockless reads of the new variable.

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

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 643b69d767f74ee40d4a817ce8b5dc91b01a9782..fe1482efd59c2fb66475d0e8ad40beb94171b662 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1668,7 +1668,7 @@ static void br_multicast_send_query(struct net_bridge_mcast *brmctx,
 
        if (!br_multicast_ctx_should_use(brmctx, pmctx) ||
            !br_opt_get(brmctx->br, BROPT_MULTICAST_ENABLED) ||
-           !br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER))
+           !brmctx->multicast_querier)
                return;
 
        memset(&br_group.dst, 0, sizeof(br_group.dst));
@@ -1747,14 +1747,16 @@ static void br_multicast_port_group_rexmit(struct timer_list *t)
 
        spin_lock(&br->multicast_lock);
        if (!netif_running(br->dev) || hlist_unhashed(&pg->mglist) ||
-           !br_opt_get(br, BROPT_MULTICAST_ENABLED) ||
-           !br_opt_get(br, BROPT_MULTICAST_QUERIER))
+           !br_opt_get(br, BROPT_MULTICAST_ENABLED))
                goto out;
 
        pmctx = br_multicast_pg_to_port_ctx(pg);
        if (!pmctx)
                goto out;
        brmctx = br_multicast_port_ctx_get_global(pmctx);
+       if (!brmctx->multicast_querier)
+               goto out;
+
        if (pg->key.addr.proto == htons(ETH_P_IP))
                other_query = &brmctx->ip4_other_query;
 #if IS_ENABLED(CONFIG_IPV6)
@@ -1974,8 +1976,7 @@ static void __grp_src_query_marked_and_rexmit(struct net_bridge_mcast *brmctx,
                if (ent->flags & BR_SGRP_F_SEND) {
                        ent->flags &= ~BR_SGRP_F_SEND;
                        if (ent->timer.expires > lmqt) {
-                               if (br_opt_get(brmctx->br,
-                                              BROPT_MULTICAST_QUERIER) &&
+                               if (brmctx->multicast_querier &&
                                    other_query &&
                                    !timer_pending(&other_query->timer))
                                        ent->src_query_rexmit_cnt = lmqc;
@@ -1984,7 +1985,7 @@ static void __grp_src_query_marked_and_rexmit(struct net_bridge_mcast *brmctx,
                }
        }
 
-       if (!br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER) ||
+       if (!brmctx->multicast_querier ||
            !other_query || timer_pending(&other_query->timer))
                return;
 
@@ -2015,7 +2016,7 @@ static void __grp_send_query_and_rexmit(struct net_bridge_mcast *brmctx,
                other_query = &brmctx->ip6_other_query;
 #endif
 
-       if (br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER) &&
+       if (brmctx->multicast_querier &&
            other_query && !timer_pending(&other_query->timer)) {
                lmi = now + brmctx->multicast_last_member_interval;
                pg->grp_query_rexmit_cnt = brmctx->multicast_last_member_count - 1;
@@ -3316,7 +3317,7 @@ br_multicast_leave_group(struct net_bridge_mcast *brmctx,
        if (timer_pending(&other_query->timer))
                goto out;
 
-       if (br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER)) {
+       if (brmctx->multicast_querier) {
                __br_multicast_send_query(brmctx, pmctx, NULL, NULL, &mp->addr,
                                          false, 0, NULL);
 
@@ -4300,10 +4301,10 @@ int br_multicast_set_querier(struct net_bridge *br, unsigned long val)
        val = !!val;
 
        spin_lock_bh(&br->multicast_lock);
-       if (br_opt_get(br, BROPT_MULTICAST_QUERIER) == val)
+       if (brmctx->multicast_querier == val)
                goto unlock;
 
-       br_opt_toggle(br, BROPT_MULTICAST_QUERIER, !!val);
+       WRITE_ONCE(brmctx->multicast_querier, val);
        if (!val)
                goto unlock;
 

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index ded1b244dfcdbeba3756fd2b4c7359168c9f3d3c..12616e9bdd11f23db348e245aee9c3c067f196c7 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1575,7 +1575,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
            nla_put_u8(skb, IFLA_BR_MCAST_QUERY_USE_IFADDR,
                       br_opt_get(br, BROPT_MULTICAST_QUERY_USE_IFADDR)) ||
            nla_put_u8(skb, IFLA_BR_MCAST_QUERIER,
-                      br_opt_get(br, BROPT_MULTICAST_QUERIER)) ||
+                      READ_ONCE(br->multicast_ctx.multicast_querier)) ||
            nla_put_u8(skb, IFLA_BR_MCAST_STATS_ENABLED,
                       br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED)) ||
            nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) ||

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 8dde124d046406b0aaa3b72ec8752378e97bb45e..b85203e8eb26e285351eec46dedb129e62f5996c 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -118,6 +118,7 @@ struct net_bridge_mcast {
        u32                             multicast_last_member_count;
        u32                             multicast_startup_query_count;
 
+       u8                              multicast_querier;
        u8                              multicast_igmp_version;
        u8                              multicast_router;
 #if IS_ENABLED(CONFIG_IPV6)
@@ -431,7 +432,6 @@ enum net_bridge_opts {
        BROPT_NF_CALL_ARPTABLES,
        BROPT_GROUP_ADDR_SET,
        BROPT_MULTICAST_ENABLED,
-       BROPT_MULTICAST_QUERIER,
        BROPT_MULTICAST_QUERY_USE_IFADDR,
        BROPT_MULTICAST_STATS_ENABLED,
        BROPT_HAS_IPV6_ADDR,
@@ -1028,7 +1028,7 @@ __br_multicast_querier_exists(struct net_bridge_mcast *brmctx,
 {
        bool own_querier_enabled;
 
-       if (br_opt_get(brmctx->br, BROPT_MULTICAST_QUERIER)) {
+       if (READ_ONCE(brmctx->multicast_querier)) {
                if (is_ipv6 && !br_opt_get(brmctx->br, BROPT_HAS_IPV6_ADDR))
                        own_querier_enabled = false;
                else

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index 08e31debd6f2f0ddb1a598cefa64c69942e88d0f..570edfd391f47d58e7309ac32fa96937dd370387 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -447,7 +447,7 @@ static ssize_t multicast_querier_show(struct device *d,
                                      char *buf)
 {
        struct net_bridge *br = to_bridge(d);
-       return sprintf(buf, "%d\n", br_opt_get(br, BROPT_MULTICAST_QUERIER));
+       return sprintf(buf, "%d\n", READ_ONCE(br->multicast_ctx.multicast_querier));
 }
 
 static int set_multicast_querier(struct net_bridge *br, unsigned long val,