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

Commit d12c9176 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

bridge: resolve a false alarm of lockdep 



Andrei reported a false alarm of lockdep at net/bridge/br_fdb.c:109,
this is because in Andrei's case, a spin_bug() was already triggered
before this, therefore the debug_locks is turned off, lockdep_is_held()
is no longer accurate after that. We should use lockdep_assert_held_once()
instead of lockdep_is_held() to respect debug_locks.

Fixes: 410b3d48 ("bridge: fdb: add proper lock checks in searching functions")
Reported-by: default avatarAndrei Vagin <avagin@gmail.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d4a6ac7

net/bridge/br_fdb.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static struct net_bridge_fdb_entry *br_fdb_find(struct net_bridge *br, 
	struct hlist_head *head = &br->hash[br_mac_hash(addr, vid)];

	struct net_bridge_fdb_entry *fdb;



	WARN_ON_ONCE(!br_hash_lock_held(br));

	lockdep_assert_held_once(&br->hash_lock);



	rcu_read_lock();

	fdb = fdb_find_rcu(head, addr, vid);

net/bridge/br_private.h

+0 −9
Original line number Diff line number Diff line
@@ -531,15 +531,6 @@ int br_fdb_external_learn_add(struct net_bridge *br, struct net_bridge_port *p, 
int br_fdb_external_learn_del(struct net_bridge *br, struct net_bridge_port *p,

			      const unsigned char *addr, u16 vid);



static inline bool br_hash_lock_held(struct net_bridge *br)

{

#ifdef CONFIG_LOCKDEP

	return lockdep_is_held(&br->hash_lock);

#else

	return true;

#endif

}



/* br_forward.c */

enum br_pkt_type {

	BR_PKT_UNICAST,