RCU dyntick nesting counter cleanups
Subsystems (3)
cover RCU dyntick nesting counter cleanups
These patches clean up the usage of dynticks nesting counters simplifying the code, while preserving the usecases.
It is a much needed simplification, makes the code less confusing, and prevents future bugs such as those that arise from forgetting that the dynticks_nmi_nesting counter is not a simple counter and can be "crowbarred" in common situations.
Several nights of rcutorture testing with CONFIG_RCU_EQS_DEBUG on all RCU kernel configurations have survived without any splats.
Further testing is in progress, hence marked as RFC!
thanks,
- Joel
Joel Fernandes (Google) (2):
rcu/tree: Clean up dynticks counter usage
rcu/tree: Remove dynticks_nmi_nesting counter
.../Data-Structures/Data-Structures.rst | 31 ++---- Documentation/RCU/stallwarn.txt | 6 +- kernel/rcu/rcu.h | 4 - kernel/rcu/tree.c | 98 +++++++++---------- kernel/rcu/tree.h | 4 +- kernel/rcu/tree_stall.h | 4 +- 6 files changed, 64 insertions(+), 83 deletions(-)
--
2.23.0.187.g17f5b7556c-goog
Paul E. McKenney
maintainerQuoted 8 lines · Joel Fernandes (Google)
These patches clean up the usage of dynticks nesting counters simplifying the code, while preserving the usecases.
It is a much needed simplification, makes the code less confusing, and prevents future bugs such as those that arise from forgetting that the
dynticks_nmi_nestingcounter is not a simple counter and can be "crowbarred" in common situations.
Quoted 4 lines
Several nights of rcutorture testing with
CONFIG_RCU_EQS_DEBUGon all RCU kernel configurations have survived without any splats.Further testing is in progress, hence marked as RFC!
My intent was to review this today, but this ran afoul of recent 3.10 work that made for some "interesting" review comments. Fortunately, I realized my mistake before sending the email. I then reviewed the current 2019 RCU dyntick-idle code.
I am doing some (possibly redundant) rcutorture runs on them here, and will take a fresh look tomorrow.
Thanx, Paul
Quoted 19 lines
thanks,
- Joel
Joel Fernandes (Google) (2):
rcu/tree: Clean up dynticks counter usage
rcu/tree: Removedynticks_nmi_nestingcounter.../Data-Structures/Data-Structures.rst | 31 ++---- Documentation/RCU/stallwarn.txt | 6 +- kernel/rcu/rcu.h | 4 - kernel/rcu/tree.c | 98 +++++++++---------- kernel/rcu/tree.h | 4 +- kernel/rcu/tree_stall.h | 4 +- 6 files changed, 64 insertions(+), 83 deletions(-)--
2.23.0.187.g17f5b7556c-goog
PATCH 1/1 rcu/dyntick-idle: Add better tracing
The dyntick-idle traces are a bit confusing. This patch makes it simpler and adds some missing cases such as EQS-enter because user vs idle mode.
Following are the changes:
(1) Add a new context field to trace_rcu_dyntick tracepoint. This context field can be "USER", "IDLE" or "IRQ".
(2) Remove the "++=" and "--=" strings and replace them with "StillNonIdle". This is much easier on the eyes, and the -- and ++ are easily apparent in the dynticks_nesting counters we are printing anyway.
This patch is based on the previous patches to simplify rcu_dyntick counters [1] and with these traces, I have verified the counters are working properly.
--- include/trace/events/rcu.h | 13 ++++++++----- kernel/rcu/tree.c | 17 +++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-)
include/trace/events/rcu.h +8 -5
@@ -449,12 +449,14 @@ TRACE_EVENT_RCU(rcu_fqs,*/ TRACE_EVENT_RCU(rcu_dyntick, - TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks), + TP_PROTO(const char *polarity, const char *context, long oldnesting, + long newnesting, atomic_t dynticks), - TP_ARGS(polarity, oldnesting, newnesting, dynticks), + TP_ARGS(polarity, context, oldnesting, newnesting, dynticks), TP_STRUCT__entry( __field(const char *, polarity) + __field(const char *, context) __field(long, oldnesting) __field(long, newnesting) __field(int, dynticks)
@@ -462,14 +464,15 @@ TRACE_EVENT_RCU(rcu_dyntick,TP_fast_assign ( __entry->polarity = polarity; + __entry->context = context; __entry->oldnesting = oldnesting; __entry->newnesting = newnesting; __entry->dynticks =atomic_read (&dynticks); ), -TP_printk ("%s %lx %lx %#3x" , __entry->polarity, - __entry->oldnesting, __entry->newnesting, - __entry->dynticks &0xfff ) +TP_printk ("%s %s %lx %lx %#3x" , __entry->polarity, + __entry->context, __entry->oldnesting, __entry->newnesting, + __entry->dynticks &0xfff ) );/*
kernel/rcu/tree.c +11 -6
@@ -570,7 +570,8 @@ static void rcu_eqs_enter(bool user) }lockdep_assert_irqs_disabled (); -trace_rcu_dyntick (TPS ("Start" ), rdp->dynticks_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Start" ), (user ?TPS ("USER" ) :TPS ("IDLE" )), + rdp->dynticks_nesting,0 , rdp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current)); rdp =this_cpu_ptr (&rcu_data);do_nocb_deferred_wakeup (rdp);
@@ -642,15 +643,17 @@ static __always_inline void rcu_nmi_exit_common(bool irq)* leave it in non-RCU-idle state. */ if (rdp->dynticks_nesting !=1 ) { -trace_rcu_dyntick (TPS ("--=" ), rdp->dynticks_nesting, - rdp->dynticks_nesting -2 , rdp->dynticks); +trace_rcu_dyntick (TPS ("StillNonIdle" ),TPS ("IRQ" ), + rdp->dynticks_nesting, rdp->dynticks_nesting -2 , + rdp->dynticks);WRITE_ONCE (rdp->dynticks_nesting,/* No store tearing. */ rdp->dynticks_nesting -2 );return ; }/* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */ -trace_rcu_dyntick (TPS ("Startirq" ), rdp->dynticks_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Start" ),TPS ("IRQ" ), rdp->dynticks_nesting,0 , + rdp->dynticks);WRITE_ONCE (rdp->dynticks_nesting,0 );/* Avoid store tearing. */ if (irq)
@@ -733,7 +736,8 @@ static void rcu_eqs_exit(bool user)rcu_dynticks_task_exit ();rcu_dynticks_eqs_exit ();rcu_cleanup_after_idle (); -trace_rcu_dyntick (TPS ("End" ), rdp->dynticks_nesting,1 , rdp->dynticks); +trace_rcu_dyntick (TPS ("End" ), (user ?TPS ("USER" ) :TPS ("IDLE" )), + rdp->dynticks_nesting,1 , rdp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current));WRITE_ONCE (rdp->dynticks_nesting,1 );
@@ -825,7 +829,8 @@ static __always_inline void rcu_nmi_enter_common(bool irq)tick_dep_set_cpu (rdp->cpu,TICK_DEP_BIT_RCU ); } -trace_rcu_dyntick (incby ==1 ?TPS ("Endirq" ) :TPS ("++=" ), +trace_rcu_dyntick (incby ==1 ?TPS ("End" ) :TPS ("StillNonIdle" ), +TPS ("IRQ" ), rdp->dynticks_nesting, rdp->dynticks_nesting + incby, rdp->dynticks);
Signature · 1 line
2.23.0.187.g17f5b7556c-goog
Paul E. McKenney
maintainerRe: [PATCH] rcu/dyntick-idle: Add better tracing
Quoted 16 lines · Joel Fernandes (Google)
The dyntick-idle traces are a bit confusing. This patch makes it simpler and adds some missing cases such as EQS-enter because user vs idle mode.
Following are the changes:
(1) Add a new context field totrace_rcu_dynticktracepoint. This context field can be "USER", "IDLE" or "IRQ".(2) Remove the "++=" and "--=" strings and replace them with "StillNonIdle". This is much easier on the eyes, and the -- and ++ are easily apparent in the
dynticks_nestingcounters we are printing anyway.This patch is based on the previous patches to simplify
rcu_dyntickcounters [1] and with these traces, I have verified the counters are working properly.
Quoted 5 lines
[1]Signed-off-by Joel Fernandes (Google) <[email protected]>
Looks plausible to me.
Thanx, Paul
Quoted 103 lines
--- include/trace/events/rcu.h | 13 ++++++++----- kernel/rcu/tree.c | 17 +++++++++++------ 2 files changed, 19 insertions(+), 11 deletions(-)include/trace/events/rcu.h +8
-5@@ -449,12 +449,14 @@ TRACE_EVENT_RCU(rcu_fqs,*/ TRACE_EVENT_RCU(rcu_dyntick, - TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks), + TP_PROTO(const char *polarity, const char *context, long oldnesting, + long newnesting, atomic_t dynticks), - TP_ARGS(polarity, oldnesting, newnesting, dynticks), + TP_ARGS(polarity, context, oldnesting, newnesting, dynticks), TP_STRUCT__entry( __field(const char *, polarity) + __field(const char *, context) __field(long, oldnesting) __field(long, newnesting) __field(int, dynticks)@@ -462,14 +464,15 @@ TRACE_EVENT_RCU(rcu_dyntick,TP_fast_assign ( __entry->polarity = polarity; + __entry->context = context; __entry->oldnesting = oldnesting; __entry->newnesting = newnesting; __entry->dynticks =atomic_read (&dynticks); ), -TP_printk ("%s %lx %lx %#3x" , __entry->polarity, - __entry->oldnesting, __entry->newnesting, - __entry->dynticks &0xfff ) +TP_printk ("%s %s %lx %lx %#3x" , __entry->polarity, + __entry->context, __entry->oldnesting, __entry->newnesting, + __entry->dynticks &0xfff ) );/* kernel/rcu/tree.c +11
-6@@ -570,7 +570,8 @@ static void rcu_eqs_enter(bool user) }lockdep_assert_irqs_disabled (); -trace_rcu_dyntick (TPS ("Start" ), rdp->dynticks_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Start" ), (user ?TPS ("USER" ) :TPS ("IDLE" )), + rdp->dynticks_nesting,0 , rdp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current)); rdp =this_cpu_ptr (&rcu_data);do_nocb_deferred_wakeup (rdp);@@ -642,15 +643,17 @@ static __always_inline void rcu_nmi_exit_common(bool irq)* leave it in non-RCU-idle state. */ if (rdp->dynticks_nesting !=1 ) { -trace_rcu_dyntick (TPS ("--=" ), rdp->dynticks_nesting, - rdp->dynticks_nesting -2 , rdp->dynticks); +trace_rcu_dyntick (TPS ("StillNonIdle" ),TPS ("IRQ" ), + rdp->dynticks_nesting, rdp->dynticks_nesting -2 , + rdp->dynticks);WRITE_ONCE (rdp->dynticks_nesting,/* No store tearing. */ rdp->dynticks_nesting -2 );return ; }/* This NMI interrupted an RCU-idle CPU, restore RCU-idleness. */ -trace_rcu_dyntick (TPS ("Startirq" ), rdp->dynticks_nesting,0 , rdp->dynticks); +trace_rcu_dyntick (TPS ("Start" ),TPS ("IRQ" ), rdp->dynticks_nesting,0 , + rdp->dynticks);WRITE_ONCE (rdp->dynticks_nesting,0 );/* Avoid store tearing. */ if (irq)@@ -733,7 +736,8 @@ static void rcu_eqs_exit(bool user)rcu_dynticks_task_exit ();rcu_dynticks_eqs_exit ();rcu_cleanup_after_idle (); -trace_rcu_dyntick (TPS ("End" ), rdp->dynticks_nesting,1 , rdp->dynticks); +trace_rcu_dyntick (TPS ("End" ), (user ?TPS ("USER" ) :TPS ("IDLE" )), + rdp->dynticks_nesting,1 , rdp->dynticks);WARN_ON_ONCE (IS_ENABLED (CONFIG_RCU_EQS_DEBUG ) && !user && !is_idle_task (current));WRITE_ONCE (rdp->dynticks_nesting,1 );@@ -825,7 +829,8 @@ static __always_inline void rcu_nmi_enter_common(bool irq)tick_dep_set_cpu (rdp->cpu,TICK_DEP_BIT_RCU ); } -trace_rcu_dyntick (incby ==1 ?TPS ("Endirq" ) :TPS ("++=" ), +trace_rcu_dyntick (incby ==1 ?TPS ("End" ) :TPS ("StillNonIdle" ), +TPS ("IRQ" ), rdp->dynticks_nesting, rdp->dynticks_nesting + incby, rdp->dynticks);Signature · 1 line
2.23.0.187.g17f5b7556c-goog