Skip to content

Commit 7a3ceda

Browse files
leitaofbq
authored andcommitted
lockdep: Speed up lockdep_unregister_key() with expedited RCU synchronization
lockdep_unregister_key() is called from critical code paths, including sections where rtnl_lock() is held. For example, when replacing a qdisc in a network device, network egress traffic is disabled while __qdisc_destroy() is called for every network queue. If lockdep is enabled, __qdisc_destroy() calls lockdep_unregister_key(), which gets blocked waiting for synchronize_rcu() to complete. For example, a simple tc command to replace a qdisc could take 13 seconds: # time /usr/sbin/tc qdisc replace dev eth0 root handle 0x1: mq real 0m13.195s user 0m0.001s sys 0m2.746s During this time, network egress is completely frozen while waiting for RCU synchronization. Use synchronize_rcu_expedited() instead to minimize the impact on critical operations like network connectivity changes. This improves 10x the function call to tc, when replacing the qdisc for a network card. # time /usr/sbin/tc qdisc replace dev eth0 root handle 0x1: mq real 0m1.789s user 0m0.000s sys 0m1.613s [boqun: Fixed the comment and add more information for the temporary workaround, and add TODO information for hazptr] Reported-by: Erik Lundgren <[email protected]> Signed-off-by: Breno Leitao <[email protected]> Reviewed-by: Paul E. McKenney <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Signed-off-by: Boqun Feng <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1dfe5ea commit 7a3ceda

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

kernel/locking/lockdep.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6616,8 +6616,16 @@ void lockdep_unregister_key(struct lock_class_key *key)
66166616
if (need_callback)
66176617
call_rcu(&delayed_free.rcu_head, free_zapped_rcu);
66186618

6619-
/* Wait until is_dynamic_key() has finished accessing k->hash_entry. */
6620-
synchronize_rcu();
6619+
/*
6620+
* Wait until is_dynamic_key() has finished accessing k->hash_entry.
6621+
*
6622+
* Some operations like __qdisc_destroy() will call this in a debug
6623+
* kernel, and the network traffic is disabled while waiting, hence
6624+
* the delay of the wait matters in debugging cases. Currently use a
6625+
* synchronize_rcu_expedited() to speed up the wait at the cost of
6626+
* system IPIs. TODO: Replace RCU with hazptr for this.
6627+
*/
6628+
synchronize_rcu_expedited();
66216629
}
66226630
EXPORT_SYMBOL_GPL(lockdep_unregister_key);
66236631

0 commit comments

Comments
 (0)