]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
lockdep: Complain only once about RCU in extended quiescent state
authorPaul E. McKenney <paulmck@kernel.org>
Thu, 28 May 2020 15:49:29 +0000 (08:49 -0700)
committerPaul E. McKenney <paulmck@kernel.org>
Mon, 29 Jun 2020 18:58:51 +0000 (11:58 -0700)
Currently, lockdep_rcu_suspicious() complains twice about RCU read-side
critical sections being invoked from within extended quiescent states,
for example:

RCU used illegally from idle CPU!
rcu_scheduler_active = 2, debug_locks = 1
RCU used illegally from extended quiescent state!

This commit therefore saves a couple lines of code and one line of
console-log output by eliminating the first of these two complaints.

Link: https://lore.kernel.org/lkml/87wo4wnpzb.fsf@nanos.tec.linutronix.de
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
kernel/locking/lockdep.c

index 29a8de4c50b90e8f7b5593f5d781f796e8a5e186..0a7549d159edce194d2130a33381c83afbe13a6f 100644 (file)
@@ -5851,9 +5851,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
        pr_warn("\n%srcu_scheduler_active = %d, debug_locks = %d\n",
               !rcu_lockdep_current_cpu_online()
                        ? "RCU used illegally from offline CPU!\n"
-                       : !rcu_is_watching()
-                               ? "RCU used illegally from idle CPU!\n"
-                               : "",
+                       : "",
               rcu_scheduler_active, debug_locks);
 
        /*