Commit a77cb6a8 authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Steven Rostedt (Google)
Browse files

srcu: Fix warning to permit SRCU-fast readers in NMI handlers 



SRCU-fast is designed to be used in NMI handlers, even going so far
as to use atomic operations for architectures supporting NMIs but not
providing NMI-safe per-CPU atomic operations.  However, the WARN_ON_ONCE()
in __srcu_check_read_flavor() complains if SRCU-fast is used in an NMI
handler.  This commit therefore modifies that WARN_ON_ONCE() to avoid
such complaints.

Reported-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Tested-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Boqun Feng <boqun@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: bpf@vger.kernel.org
Link: https://patch.msgid.link/8232efe8-a7a3-446c-af0b-19f9b523b4f7@paulmck-laptop


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent f7d32765

kernel/rcu/srcutree.c

+2 −1
Original line number Diff line number Diff line
@@ -789,7 +789,8 @@ void __srcu_check_read_flavor(struct srcu_struct *ssp, int read_flavor) 
	struct srcu_data *sdp;



	/* NMI-unsafe use in NMI is a bad sign, as is multi-bit read_flavor values. */

	WARN_ON_ONCE((read_flavor != SRCU_READ_FLAVOR_NMI) && in_nmi());

	WARN_ON_ONCE(read_flavor != SRCU_READ_FLAVOR_NMI &&

		     read_flavor != SRCU_READ_FLAVOR_FAST && in_nmi());

	WARN_ON_ONCE(read_flavor & (read_flavor - 1));



	sdp = raw_cpu_ptr(ssp->sda);