lockdep: Fix wait-type for empty stack

[ Upstream commit f8b298cc39f0619544c607eaef09fd0b2afd10f3 ]

Even the very first lock can violate the wait-context check, consider
the various IRQ contexts.

Fixes: de8f5e4f2dc1 ("lockdep: Introduce wait-type checks")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Joerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20210617190313.256987481@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index b56c3855756e9371ba51de77222bd0f7dacd2d8e..8f8cd43ec2a04e920850aac1279fcefc948dc9df 100644 (file)
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4692,7 +4692,7 @@ static int check_wait_context(struct task_struct *curr, struct held_lock *next)
        u8 curr_inner;
        int depth;
 
-       if (!curr->lockdep_depth || !next_inner || next->trylock)
+       if (!next_inner || next->trylock)
                return 0;
 
        if (!next_outer)