From: Peter Zijlstra <peterz@infradead.org>
Date: Thu, 17 Jun 2021 18:57:18 +0000 (+0200)
Subject: lockdep: Fix wait-type for empty stack
X-Git-Tag: v5.10.50~329
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca9e784a36c48091a21b0dc85c0b61a810e7346;p=thirdparty%2Fkernel%2Fstable.git

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 788629c06ce9c..8ae9d7abebc08 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4626,7 +4626,7 @@ static int check_wait_context(struct task_struct *curr, struct held_lock *next)
 	short curr_inner;
 	int depth;
 
-	if (!curr->lockdep_depth || !next_inner || next->trylock)
+	if (!next_inner || next->trylock)
 		return 0;
 
 	if (!next_outer)