Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4329596c authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

net: bridge: multicast: use non-bh rcu flavor 



The bridge multicast code has been using a mix of RCU and RCU-bh flavors
sometimes in questionable way. Since we've moved to rhashtable just use
non-bh RCU everywhere. In addition this simplifies freeing of objects
and allows us to remove some unnecessary callback functions.

v3: new patch

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19e3a9c9

net/bridge/br_mdb.c

+1 −1
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ static int __br_mdb_del(struct net_bridge *br, struct br_mdb_entry *entry) 
		rcu_assign_pointer(*pp, p->next);

		hlist_del_init(&p->mglist);

		del_timer(&p->timer);

		call_rcu_bh(&p->rcu, br_multicast_free_pg);

		kfree_rcu(p, rcu);

		err = 0;



		if (!mp->ports && !mp->host_joined &&

net/bridge/br_multicast.c

+5 −21
Original line number Diff line number Diff line
@@ -160,22 +160,6 @@ struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br, 
	return br_mdb_ip_get_rcu(br, &ip);

}



void br_multicast_free_pg(struct rcu_head *head)

{

	struct net_bridge_port_group *p =

		container_of(head, struct net_bridge_port_group, rcu);



	kfree(p);

}



static void br_multicast_free_group(struct rcu_head *head)

{

	struct net_bridge_mdb_entry *mp =

		container_of(head, struct net_bridge_mdb_entry, rcu);



	kfree(mp);

}



static void br_multicast_group_expired(struct timer_list *t)

{

	struct net_bridge_mdb_entry *mp = from_timer(mp, t, timer);
@@ -195,7 +179,7 @@ static void br_multicast_group_expired(struct timer_list *t) 
			       br_mdb_rht_params);

	hlist_del_rcu(&mp->mdb_node);



	call_rcu_bh(&mp->rcu, br_multicast_free_group);

	kfree_rcu(mp, rcu);



out:

	spin_unlock(&br->multicast_lock);
@@ -223,7 +207,7 @@ static void br_multicast_del_pg(struct net_bridge *br, 
		del_timer(&p->timer);

		br_mdb_notify(br->dev, p->port, &pg->addr, RTM_DELMDB,

			      p->flags);

		call_rcu_bh(&p->rcu, br_multicast_free_pg);

		kfree_rcu(p, rcu);



		if (!mp->ports && !mp->host_joined &&

		    netif_running(br->dev))
@@ -1425,7 +1409,7 @@ br_multicast_leave_group(struct net_bridge *br, 
			rcu_assign_pointer(*pp, p->next);

			hlist_del_init(&p->mglist);

			del_timer(&p->timer);

			call_rcu_bh(&p->rcu, br_multicast_free_pg);

			kfree_rcu(p, rcu);

			br_mdb_notify(br->dev, port, group, RTM_DELMDB,

				      p->flags);
@@ -1839,11 +1823,11 @@ void br_multicast_dev_del(struct net_bridge *br) 
		rhashtable_remove_fast(&br->mdb_hash_tbl, &mp->rhnode,

				       br_mdb_rht_params);

		hlist_del_rcu(&mp->mdb_node);

		call_rcu_bh(&mp->rcu, br_multicast_free_group);

		kfree_rcu(mp, rcu);

	}

	spin_unlock_bh(&br->multicast_lock);



	rcu_barrier_bh();

	rcu_barrier();

}



int br_multicast_set_router(struct net_bridge *br, unsigned long val)

net/bridge/br_private.h

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ struct net_bridge_mdb_entry * 
br_mdb_ip_get(struct net_bridge *br, struct br_ip *dst);

struct net_bridge_mdb_entry *

br_multicast_new_group(struct net_bridge *br, struct br_ip *group);

void br_multicast_free_pg(struct rcu_head *head);

struct net_bridge_port_group *

br_multicast_new_port_group(struct net_bridge_port *port, struct br_ip *group,

			    struct net_bridge_port_group __rcu *next,