Skip to content

Commit 59bed79

Browse files
paulmckrcufbq
authored andcommitted
context_tracking: Make RCU watch ct_kernel_exit_state() warning
The WARN_ON_ONCE() in ct_kernel_exit_state() follows the call to ct_state_inc(), which means that RCU is not watching this WARN_ON_ONCE(). This can (and does) result in extraneous lockdep warnings when this WARN_ON_ONCE() triggers. These extraneous warnings are the opposite of helpful. Therefore, invert the WARN_ON_ONCE() condition and move it before the call to ct_state_inc(). This does mean that the ct_state_inc() return value can no longer be used in the WARN_ON_ONCE() condition, so discard this return value and instead use a call to rcu_is_watching_curr_cpu(). This call is executed only in CONFIG_RCU_EQS_DEBUG=y kernels, so there is no added overhead in production use. [Boqun: Add the subsystem tag in the title] Reported-by: Breno Leitao <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> Reviewed-by: Valentin Schneider <[email protected]> Reviewed-by: Frederic Weisbecker <[email protected]> Link: https://lore.kernel.org/r/bd911cd9-1fe9-447c-85e0-ea811a1dc896@paulmck-laptop Signed-off-by: Boqun Feng <[email protected]>
1 parent 69381f3 commit 59bed79

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

kernel/context_tracking.c

+4-5
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,16 @@ static __always_inline void rcu_task_trace_heavyweight_exit(void)
8080
*/
8181
static noinstr void ct_kernel_exit_state(int offset)
8282
{
83-
int seq;
84-
8583
/*
8684
* CPUs seeing atomic_add_return() must see prior RCU read-side
8785
* critical sections, and we also must force ordering with the
8886
* next idle sojourn.
8987
*/
9088
rcu_task_trace_heavyweight_enter(); // Before CT state update!
91-
seq = ct_state_inc(offset);
92-
// RCU is no longer watching. Better be in extended quiescent state!
93-
WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && (seq & CT_RCU_WATCHING));
89+
// RCU is still watching. Better not be in extended quiescent state!
90+
WARN_ON_ONCE(IS_ENABLED(CONFIG_RCU_EQS_DEBUG) && !rcu_is_watching_curr_cpu());
91+
(void)ct_state_inc(offset);
92+
// RCU is no longer watching.
9493
}
9594

9695
/*

0 commit comments

Comments
 (0)