Commit 7cb3f921 authored Oct 18, 2016 by Nikolay Aleksandrov Committed by David S. Miller Oct 18, 2016

bridge: multicast: restore perm router ports on multicast enable



Satish reported a problem with the perm multicast router ports not getting
reenabled after some series of events, in particular if it happens that the
multicast snooping has been disabled and the port goes to disabled state
then it will be deleted from the router port list, but if it moves into
non-disabled state it will not be re-added because the mcast snooping is
still disabled, and enabling snooping later does nothing.

Here are the steps to reproduce, setup br0 with snooping enabled and eth1
added as a perm router (multicast_router = 2):
1. $ echo 0 > /sys/class/net/br0/bridge/multicast_snooping
2. $ ip l set eth1 down
^ This step deletes the interface from the router list
3. $ ip l set eth1 up
^ This step does not add it again because mcast snooping is disabled
4. $ echo 1 > /sys/class/net/br0/bridge/multicast_snooping
5. $ bridge -d -s mdb show
<empty>

At this point we have mcast enabled and eth1 as a perm router (value = 2)
but it is not in the router list which is incorrect.

After this change:
1. $ echo 0 > /sys/class/net/br0/bridge/multicast_snooping
2. $ ip l set eth1 down
^ This step deletes the interface from the router list
3. $ ip l set eth1 up
^ This step does not add it again because mcast snooping is disabled
4. $ echo 1 > /sys/class/net/br0/bridge/multicast_snooping
5. $ bridge -d -s mdb show
router ports on br0: eth1

Note: we can directly do br_multicast_enable_port for all because the
querier timer already has checks for the port state and will simply
expire if it's in blocking/disabled. See the comment added by
commit 9aa66382 ("bridge: multicast: add a comment to
br_port_state_selection about blocking state")

Fixes: 561f1103 ("bridge: Add multicast_snooping sysfs toggle")
Reported-by: Satish Ashok <sashok@cumulusnetworks.com>
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7ab48895

net/bridge/br_multicast.c

+14 −9

Original line number	Diff line number	Diff line
		@@ -972,13 +972,12 @@ static void br_multicast_enable(struct bridge_mcast_own_query *query)
		mod_timer(&query->timer, jiffies);
		}

		void br_multicast_enable_port(struct net_bridge_port *port)
		static void __br_multicast_enable_port(struct net_bridge_port *port)
		{
		struct net_bridge *br = port->br;

		spin_lock(&br->multicast_lock);
		if (br->multicast_disabled \|\| !netif_running(br->dev))
		goto out;
		return;

		br_multicast_enable(&port->ip4_own_query);
		#if IS_ENABLED(CONFIG_IPV6)
		@@ -987,8 +986,14 @@ void br_multicast_enable_port(struct net_bridge_port *port)
		if (port->multicast_router == MDB_RTR_TYPE_PERM &&
		hlist_unhashed(&port->rlist))
		br_multicast_add_router(br, port);
		}

		out:
		void br_multicast_enable_port(struct net_bridge_port *port)
		{
		struct net_bridge *br = port->br;

		spin_lock(&br->multicast_lock);
		__br_multicast_enable_port(port);
		spin_unlock(&br->multicast_lock);
		}

		@@ -1994,8 +1999,9 @@ static void br_multicast_start_querier(struct net_bridge *br,

		int br_multicast_toggle(struct net_bridge *br, unsigned long val)
		{
		int err = 0;
		struct net_bridge_mdb_htable *mdb;
		struct net_bridge_port *port;
		int err = 0;

		spin_lock_bh(&br->multicast_lock);
		if (br->multicast_disabled == !val)
		@@ -2023,10 +2029,9 @@ rollback:
		goto rollback;
		}

		br_multicast_start_querier(br, &br->ip4_own_query);
		#if IS_ENABLED(CONFIG_IPV6)
		br_multicast_start_querier(br, &br->ip6_own_query);
		#endif
		br_multicast_open(br);
		list_for_each_entry(port, &br->port_list, list)
		__br_multicast_enable_port(port);

		unlock:
		spin_unlock_bh(&br->multicast_lock);

Admin message