AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-26 14:20:50 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

bridge: disable softirqs around br_fdb_update to avoid lockup

Browse Source 
br_fdb_update() can be called in process context in the following way:
br_fdb_add() -> __br_fdb_add() -> br_fdb_update() (if NTF_USE flag is set)
so we need to disable softirqs because there are softirq users of the
hash_lock. One easy way to reproduce this is to modify the bridge utility
to set NTF_USE, enable stp and then set maxageing to a low value so
br_fdb_cleanup() is called frequently and then just add new entries in
a loop. This happens because br_fdb_cleanup() is called from timer/softirq
context. The spin locks in br_fdb_update were _bh before commit f8ae737dee
("[BRIDGE]: forwarding remove unneeded preempt and bh diasables")
and at the time that commit was correct because br_fdb_update() couldn't be
called from process context, but that changed after commit:
292d139898 ("bridge: add NTF_USE support")
Using local_bh_disable/enable around br_fdb_update() allows us to keep
using the spin_lock/unlock in br_fdb_update for the fast-path.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fixes: 292d139898 ("bridge: add NTF_USE support")
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2015-06-06 06:49:00 -07:00 committed by David S. Miller
parent 7ff46e79fb
commit c4c832f89d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/bridge/br_fdb.c
View File

@ -796,9 +796,11 @@ static int __br_fdb_add(struct ndmsg *ndm, struct net_bridge_port *p,
int err = 0; int err = 0;
if (ndm->ndm_flags & NTF_USE) { if (ndm->ndm_flags & NTF_USE) {
local_bh_disable();
rcu_read_lock(); rcu_read_lock();
br_fdb_update(p->br, p, addr, vid, true); br_fdb_update(p->br, p, addr, vid, true);
rcu_read_unlock(); rcu_read_unlock();
local_bh_enable();
} else { } else {
spin_lock_bh(&p->br->hash_lock); spin_lock_bh(&p->br->hash_lock);
err = fdb_add_entry(p, addr, ndm->ndm_state, err = fdb_add_entry(p, addr, ndm->ndm_state,