Commit 1a56f7d5 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

net/bridge: Replace call_rcu_bh() and rcu_barrier_bh() 



Now that call_rcu()'s callback is not invoked until after all bh-disable
regions of code have completed (in addition to explicitly marked
RCU read-side critical sections), call_rcu() can be used in place
of call_rcu_bh().  Similarly, rcu_barrier() can be used in place of
rcu_barrier_bh().  This commit therefore makes these changes.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
Cc: Roopa Prabhu <roopa@cumulusnetworks.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <bridge@lists.linux-foundation.org>
Cc: <netdev@vger.kernel.org>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
parent 5da54c18

net/bridge/br_mdb.c

+1 −1
Original line number Diff line number Diff line
@@ -728,7 +728,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);

		call_rcu(&p->rcu, br_multicast_free_pg);

		err = 0;



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

net/bridge/br_multicast.c

+7 −7
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void br_multicast_group_expired(struct timer_list *t) 
	hlist_del_rcu(&mp->hlist[mdb->ver]);

	mdb->size--;



	call_rcu_bh(&mp->rcu, br_multicast_free_group);

	call_rcu(&mp->rcu, br_multicast_free_group);



out:

	spin_unlock(&br->multicast_lock);
@@ -291,7 +291,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);

		call_rcu(&p->rcu, br_multicast_free_pg);



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

		    netif_running(br->dev))
@@ -358,7 +358,7 @@ static int br_mdb_rehash(struct net_bridge_mdb_htable __rcu **mdbp, int max, 
	}



	br_mdb_rehash_seq++;

	call_rcu_bh(&mdb->rcu, br_mdb_free);

	call_rcu(&mdb->rcu, br_mdb_free);



out:

	rcu_assign_pointer(*mdbp, mdb);
@@ -1629,7 +1629,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);

			call_rcu(&p->rcu, br_multicast_free_pg);

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

				      p->flags);
@@ -2051,19 +2051,19 @@ void br_multicast_dev_del(struct net_bridge *br) 
		hlist_for_each_entry_safe(mp, n, &mdb->mhash[i],

					  hlist[ver]) {

			del_timer(&mp->timer);

			call_rcu_bh(&mp->rcu, br_multicast_free_group);

			call_rcu(&mp->rcu, br_multicast_free_group);

		}

	}



	if (mdb->old) {

		spin_unlock_bh(&br->multicast_lock);

		rcu_barrier_bh();

		rcu_barrier();

		spin_lock_bh(&br->multicast_lock);

		WARN_ON(mdb->old);

	}



	mdb->old = mdb;

	call_rcu_bh(&mdb->rcu, br_mdb_free);

	call_rcu(&mdb->rcu, br_mdb_free);



out:

	spin_unlock_bh(&br->multicast_lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE