lockdep: Fix lockdep_set_notrack_class() for CONFIG_LOCK_STAT

We won't find a contended lock if it's not being tracked.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 58c88220a478ac59a00dc83be03ed260346559e6..0349f957e672da9ede0c3e6ff24892dffa8118e2 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -5936,6 +5936,9 @@ __lock_contended(struct lockdep_map *lock, unsigned long ip)
        if (DEBUG_LOCKS_WARN_ON(!depth))
                return;
 
+       if (unlikely(lock->key == &__lockdep_no_track__))
+               return;
+
        hlock = find_held_lock(curr, lock, depth, &i);
        if (!hlock) {
                print_lock_contention_bug(curr, lock, ip);
@@ -5978,6 +5981,9 @@ __lock_acquired(struct lockdep_map *lock, unsigned long ip)
        if (DEBUG_LOCKS_WARN_ON(!depth))
                return;
 
+       if (unlikely(lock->key == &__lockdep_no_track__))
+               return;
+
        hlock = find_held_lock(curr, lock, depth, &i);
        if (!hlock) {
                print_lock_contention_bug(curr, lock, _RET_IP_);