Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <elundgren@meta.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Paul E. McKenney <paulmck@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
Link: https://lore.kernel.org/r/20250321-lockdep-v1-1-78b732d195fb@debian.org

authored by

Breno Leitao and committed by
Boqun Feng
7a3cedaf 1dfe5ea6

+10 -2
+10 -2
kernel/locking/lockdep.c
··· 6616 6616 if (need_callback) 6617 6617 call_rcu(&delayed_free.rcu_head, free_zapped_rcu); 6618 6618 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(); 6621 6629 } 6622 6630 EXPORT_SYMBOL_GPL(lockdep_unregister_key); 6623 6631