[for-next][PATCH 3/4] srcu: Fix warning to permit SRCU-fast readers in NMI handlers

[for-next][PATCH 3/4] srcu: Fix warning to permit SRCU-fast readers in NMI handlers

[Steven Rostedt]

From: "Paul E. McKenney" <paulmck@kernel.org>

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: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Tested-by: Steven 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: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/rcu/srcutree.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index ea3f128de06f..c4a0a93e8da4 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -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);
-- 
2.51.0

Re: [for-next][PATCH 3/4] srcu: Fix warning to permit SRCU-fast readers in NMI handlers

[Boqun Feng]

On Fri, Jan 30, 2026 at 10:46:10AM -0500, Steven Rostedt wrote:
> From: "Paul E. McKenney" <paulmck@kernel.org>
> 
> 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: Steven Rostedt <rostedt@goodmis.org>
> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> Tested-by: Steven 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: Steven Rostedt (Google) <rostedt@goodmis.org>

Thank you, Steven! I will drop this in the RCU PR since you already plan
to carry it via tracing.

Regards,
Boqun

> ---
>  kernel/rcu/srcutree.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
> index ea3f128de06f..c4a0a93e8da4 100644
> --- a/kernel/rcu/srcutree.c
> +++ b/kernel/rcu/srcutree.c
> @@ -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);
> -- 
> 2.51.0
> 
> 

Re: [for-next][PATCH 3/4] srcu: Fix warning to permit SRCU-fast readers in NMI handlers

[Paul E. McKenney]

On Fri, Jan 30, 2026 at 07:51:16AM -0800, Boqun Feng wrote:
> On Fri, Jan 30, 2026 at 10:46:10AM -0500, Steven Rostedt wrote:
> > From: "Paul E. McKenney" <paulmck@kernel.org>
> > 
> > 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: Steven Rostedt <rostedt@goodmis.org>
> > Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
> > Tested-by: Steven 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: Steven Rostedt (Google) <rostedt@goodmis.org>
> 
> Thank you, Steven! I will drop this in the RCU PR since you already plan
> to carry it via tracing.

Thank you both!

							Thanx, Paul

> Regards,
> Boqun
> 
> > ---
> >  kernel/rcu/srcutree.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
> > index ea3f128de06f..c4a0a93e8da4 100644
> > --- a/kernel/rcu/srcutree.c
> > +++ b/kernel/rcu/srcutree.c
> > @@ -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);
> > -- 
> > 2.51.0
> > 
> > 

Re: [for-next][PATCH 3/4] srcu: Fix warning to permit SRCU-fast readers in NMI handlers

[Steven Rostedt]

On Fri, 30 Jan 2026 07:51:16 -0800
Boqun Feng <boqun@kernel.org> wrote:

> Thank you, Steven! I will drop this in the RCU PR since you already plan
> to carry it via tracing.

Thanks. It was a needed dependency for the last patch.

-- Steve