locking/lockdep: Make lockdep_register_key() ignore 'debug_locks'
PATCH 1/1 locking/lockdep: Make lockdep_register_key() ignore 'debug_locks'
If lockdep_register_key() and lockdep_unregister_key() are called with debug_locks == false then the following warning is reported:
WARNING: CPU: 2 PID: 15145 at kernel/locking/lockdep.c:4920 lockdep_unregister_key+0x1ad/0x240
That warning is reported because lockdep_unregister_key() ignores the value of 'debug_locks' and because the behavior of lockdep_register_key() depends on whether or not 'debug_locks' is set. Fix this inconsistency by making lockdep_register_key() unconditionally register lock keys.
--- kernel/locking/lockdep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/locking/lockdep.c +4 -3
@@ -1027,15 +1027,16 @@ void lockdep_register_key(struct lock_class_key *key) hash_head =keyhashentry (key);raw_local_irq_save (flags); -if (!graph_lock ()) - goto restore_irqs; +arch_spin_lock (&lockdep_lock); + current->lockdep_recursion =1 ;hlist_for_each_entry_rcu (k, hash_head, hash_entry) {if (WARN_ON_ONCE (k == key)) goto out_unlock; }hlist_add_head_rcu (&key->hash_entry, hash_head); out_unlock: -graph_unlock (); + current->lockdep_recursion =0 ; +arch_spin_unlock (&lockdep_lock); restore_irqs:raw_local_irq_restore (flags); }
Signature · 1 line
2.21.0.196.g041f5ea1cf98
Quoted 35 lines · Bart Van Assche
If
lockdep_register_key()andlockdep_unregister_key()are called withdebug_locks== false then the following warning is reported:WARNING: CPU: 2 PID: 15145 at kernel/locking/lockdep.c:4920 lockdep_unregister_key+0x1ad/0x240That warning is reported because
lockdep_unregister_key()ignores the value of 'debug_locks' and because the behavior oflockdep_register_key()depends on whether or not 'debug_locks' is set. Fix this inconsistency by makinglockdep_register_key()unconditionally register lock keys.Cc Thomas Gleixner <[email protected]>Cc Will Deacon <[email protected]>Cc Waiman Long <[email protected]>Cc shenghui <[email protected]>Reported-by shenghui <[email protected]>Fixes a0b0fd53e1e6 ("locking/lockdep: Free lock classes that are no longer in use") # v5.1-rc1.Signed-off-by Bart Van Assche <[email protected]>--- kernel/locking/lockdep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)kernel/locking/lockdep.c +2
-2@@ -1027,15 +1027,16 @@ void lockdep_register_key(struct lock_class_key *key) hash_head =keyhashentry (key);raw_local_irq_save (flags); -if (!graph_lock ()) - goto restore_irqs; +arch_spin_lock (&lockdep_lock); + current->lockdep_recursion =1 ;hlist_for_each_entry_rcu (k, hash_head, hash_entry) {if (WARN_ON_ONCE (k == key))
kernel/locking/lockdep.c void lockdep_register_key(struct lock_class_key *key) · line 1042
Quoted 10 lines
kernel/locking/lockdep.c +2
-1goto out_unlock; }hlist_add_head_rcu (&key->hash_entry, hash_head); out_unlock: -graph_unlock (); + current->lockdep_recursion =0 ; +arch_spin_unlock (&lockdep_lock); restore_irqs:raw_local_irq_restore (flags); }
So why don't we add a debug_locks test to lockdep_unregister_key() instead? The general principle to bring lockdep to a screeching halt when bugs are detected, ASAP.
Thanks,
Ingo
Quoted 3 lines · Ingo Molnar
So why don't we add a
debug_lockstest tolockdep_unregister_key()instead? The general principle to bring lockdep to a screeching halt when bugs are detected, ASAP.
Hi Ingo,
Since this issue was introduced by patch "locking/lockdep: Zap lock classes even with lock debugging disabled"and since that patch is in the tip tree but not yet upstream: do you prefer that I post a version 3 of that patch or do you rather prefer that I post a follow-up patch?
Thanks,
Bart.
Quoted 11 lines · Bart Van Assche
Quoted 3 lines · Ingo Molnar
So why don't we add a
debug_lockstest tolockdep_unregister_key()instead? The general principle to bring lockdep to a screeching halt when bugs are detected, ASAP.Hi Ingo,
Since this issue was introduced by patch "locking/lockdep: Zap lock classes even with lock debugging disabled" and since that patch is in the tip tree but not yet upstream: do you prefer that I post a version 3 of that patch or do you rather prefer that I post a follow-up patch?
The crash fix is now upstream, mind sending a followup patch for the warning fix?
Thanks,
Ingo