rcu: make PREEMPT_RCU to be a decoration of TREE_RCU
Subsystems (4)
PATCH 1/1 rcu: make PREEMPT_RCU to be a decoration of TREE_RCU
Currently PREEMPT_RCU and TREE_RCU are "contrary" configs when they can't be both on. But PREEMPT_RCU is actually a kind of TREE_RCU in the implementation. It seams to be appropriate to make PREEMPT_RCU to be a decorative option of TREE_RCU.
--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)
include/linux/rcupdate.h +2 -2
@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h>
@@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted,
include/trace/events/rcu.h +2 -2
@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the
@@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string
kernel/rcu/Kconfig +7 -6
@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or
@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or
@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow
@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help
@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical
@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n help
kernel/rcu/Makefile +0 -1
@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o
kernel/rcu/rcu.h +1 -1
@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);
kernel/rcu/update.c +1 -1
@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)
kernel/sysctl.c +1 -1
@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,
Signature · 1 line
2.20.1
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.
Looks like a nice simplification and so far I could not poke any holes in the code...
I am in support of this patch for further review and testing. Thanks!
thanks,
- Joel
Quoted 173 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-1@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,Signature · 1 line
2.20.1
Paul E. McKenney
maintainerQuoted 7 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.
Quoted 6 lines
Looks like a nice simplification and so far I could not poke any holes in the code...
I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>
Thank you both!
Lai, what is this patch against? It does not want to apply to the current -rcu "dev" branch.
Thanx, Paul
Quoted 178 lines
thanks,
- Joel
Quoted 173 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-1@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,Signature · 1 line
2.20.1
Lai Jiangshan
reviewerQuoted 12 lines · Paul E. McKenney
Quoted 10 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Looks like a nice simplification and so far I could not poke any holes in the code...
Quoted 8 lines
Quoted 3 lines
I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>Thank you both!
Lai, what is this patch against? It does not want to apply to the current -rcu "dev" branch.
Oh, sorry
I wrongly made the change base on upstream.
I will rebase later.
thanks
Lai
Quoted 181 lines
Thanx, Paul
Quoted 178 lines
thanks,
- Joel
Quoted 173 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-2@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall, --2.20.1
Paul E. McKenney
maintainerQuoted 19 lines · Lai Jiangshan
Quoted 18 lines · Paul E. McKenney
Quoted 7 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Quoted 6 lines
Looks like a nice simplification and so far I could not poke any holes in the code...
I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>Thank you both!
Quoted 7 lines
Quoted 2 lines
Lai, what is this patch against? It does not want to apply to the current -rcu "dev" branch.
Oh, sorry
I wrongly made the change base on upstream.
I will rebase later.
Very good, looking forward to this updated version.
Thanx, Paul
Quoted 184 lines
thanks
LaiQuoted 181 lines
Thanx, Paul
Quoted 178 lines
thanks,
- Joel
Quoted 173 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-2@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall, --2.20.1
Quoted 23 lines · Paul E. McKenney
Quoted 22 lines · Lai Jiangshan
Quoted 20 lines · Paul E. McKenney
Quoted 7 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Quoted 6 lines
Looks like a nice simplification and so far I could not poke any holes in the code...
I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>Thank you both!
Lai, what is this patch against? It does not want to apply to the current -rcu "dev" branch.
Quoted 8 lines
Quoted 4 lines
Oh, sorry
I wrongly made the change base on upstream.
I will rebase later.Very good, looking forward to this updated version.
Thanx, Paul
In my box, the patch can be applied to the -rcu "dev" well. And there is nothing strange after boot.
Have I just made a mistake a again? In my box, the HEAD
of -rcu "dev" is 9725023b ("torture: Handle jitter for CPUs that cannot be offlined")
Thanks
Lai
Quoted 185 lines
Quoted 185 lines
thanks
LaiQuoted 181 lines
Thanx, Paul
Quoted 178 lines
thanks,
- Joel
Quoted 173 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>--- include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -583,7 +583,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -452,7 +452,7 @@ enum rcutorture_type { INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq);void rcutorture_record_progress (unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-2@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall, --2.20.1
Quoted 31 lines · Lai Jiangshan
Quoted 28 lines · Paul E. McKenney
Quoted 26 lines · Lai Jiangshan
Quoted 12 lines · Paul E. McKenney
Quoted 10 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Looks like a nice simplification and so far I could not poke any holes in the code...
Quoted 8 lines
Quoted 3 lines
I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>Thank you both!
Lai, what is this patch against? It does not want to apply to the current -rcu "dev" branch.
Oh, sorry
I wrongly made the change base on upstream.
I will rebase later.
Quoted 6 lines
Quoted 3 lines
Very good, looking forward to this updated version.
Thanx, Paul
In my box, the patch can be applied to the -rcu "dev" well.
Oh, I first applied it by "git cherry-pick" not "git am". It did have conflicts when using "git am". Updated patch was sent, sorry for the nosing.
thanks
Lai
Quoted 197 lines
And there is nothing strange after boot.
Have I just made a mistake a again? In my box, the HEAD
of -rcu "dev" is9725023b("torture: Handle jitter for CPUs that cannot be offlined")Thanks
LaiQuoted 189 lines
Quoted 189 lines
thanks
LaiQuoted 185 lines
Thanx, Paul
Quoted 182 lines
thanks,
- Joel
Quoted 177 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>---
include/linux/rcupdate.h | 4 ++--
include/trace/events/rcu.h| 4 ++--
kernel/rcu/Kconfig | 13 +++++++------
kernel/rcu/Makefile | 1 -
kernel/rcu/rcu.h | 2 +-
kernel/rcu/update.c | 2 +-
kernel/sysctl.c | 2 +-7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) #include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU) #include <linux/rcutiny.h>@@ -583,7 +583,7 @@ do { \ * read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * - * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), + * In non-preemptible RCU implementations (pure TREE_RCU andTINY_RCU ), * it is illegal to block while in an RCU read-side critical section.* In preemptible RCU implementations (
PREEMPT_RCU) inCONFIG_PREEMPTION
* kernel builds, RCU read-side critical sections may be preempted,include/trace/events/rcu.h +1
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization, TP_printk("%s", __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) /** Tracepoint for grace-period events. Takes a string identifying the @@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) ||
defined(CONFIG_PREEMPT_RCU)*/
+#endif /* #ifdefined(CONFIG_TREE_RCU)*//*
* Tracepoint for dyntick-idle entry/exit events. These take a stringkernel/rcu/Kconfig +0
-0@@ -7,7 +7,7 @@ menu "RCU Subsystem"config
TREE_RCU
bool
- default y if !PREEMPTION && SMP
+ default y if SMP
help
This option selects the RCU implementation that is designed for very large SMP system with hundreds orkernel/rcu/Kconfig +0
-0@@ -17,6 +17,7 @@ config TREE_RCUconfig
PREEMPT_RCU
bool
default y if PREEMPTION
+ selectTREE_RCU
help
This option selects the RCU implementation that is designed for very large SMP systems with hundreds orkernel/rcu/Kconfig +0
-0@@ -78,7 +79,7 @@ config TASKS_RCUuser-mode execution as quiescent states.
config
RCU_STALL_COMMON
-def_bool(TREE_RCU||PREEMPT_RCU)
+def_boolTREE_RCU
help
This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allowkernel/rcu/Kconfig +0
-0@@ -86,13 +87,13 @@ config RCU_STALL_COMMONmaking these warnings mandatory for the tree variants.
config
RCU_NEED_SEGCBLIST- def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU )config
RCU_FANOUT
int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT
range 2 32 if !64BIT
- depends on (TREE_RCU||PREEMPT_RCU) &&RCU_EXPERT+ depends onTREE_RCU&&RCU_EXPERT
default 64 if 64BIT
default 32 if !64BIT
helpkernel/rcu/Kconfig +0
-0@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAFint "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT
range 2 32 if !64BIT
- depends on (TREE_RCU||PREEMPT_RCU) &&RCU_EXPERT+ depends onTREE_RCU&&RCU_EXPERT
default 16
help
This option controls the leaf-level fanout of hierarchicalkernel/rcu/Kconfig +0
-0@@ -187,7 +188,7 @@ config RCU_BOOST_DELAYconfig
RCU_NOCB_CPU
bool "Offload RCU callback processing from boot-selected CPUs" - depends onTREE_RCU||PREEMPT_RCU
+ depends onTREE_RCU
depends onRCU_EXPERT||NO_HZ_FULL
default n
helpkernel/rcu/Makefile +0
-0@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.oobj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o
kernel/rcu/rcu.h +0
-0@@ -452,7 +452,7 @@ enum rcutorture_type {
INVALID_RCU_FLAVOR
};kernel/rcu/rcu.h +1
-1-#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void
rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags, unsigned long *gp_seq);
voidrcutorture_record_progress(unsigned long vernum);kernel/rcu/update.c +1
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = { EXPORT_SYMBOL_GPL(rcuhead_debug_descr); #endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE ) void do_trace_rcu_torture_read(const char *rcutorturename, struct rcu_head *rhp, unsigned long secs,unsigned long
c_old, unsigned long c)kernel/sysctl.c +1
-1@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, }, #endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,Signature · 1 line
2.20.1
Paul E. McKenney
maintainerQuoted 35 lines · Lai Jiangshan
Quoted 34 lines · Lai Jiangshan
Quoted 33 lines · Paul E. McKenney
Quoted 21 lines · Lai Jiangshan
Quoted 19 lines · Paul E. McKenney
Quoted 7 lines · Joel Fernandes
Quoted 5 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Quoted 7 lines
Looks like a nice simplification and so far I could not poke any holes in the
code...I am in support of this patch for further review and testing. Thanks!
Reviewed-by Joel Fernandes (Google) <[email protected]>Thank you both!
Quoted 8 lines
Quoted 3 lines
Lai, what is this patch against? It does not want to apply to the current
-rcu "dev" branch.Oh, sorry
I wrongly made the change base on upstream.
I will rebase later.Very good, looking forward to this updated version.
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Thanx, Paul
In my box, the patch can be applied to the -rcu "dev" well.
Oh, I first applied it by "git cherry-pick" not "git am". It did have conflicts when using "git am". Updated patch was sent, sorry for the nosing.
No problem, and that is why I asked you where it applied. I do sometimes "git am" to wherever you put it, then "git cherrypick" to move it to where it belongs. But much better when you rebase it as you have done!
Thanx, Paul
Quoted 210 lines
thanks
LaiQuoted 206 lines
And there is nothing strange after boot.
Have I just made a mistake a again? In my box, the HEAD
of -rcu "dev" is9725023b("torture: Handle jitter for CPUs that cannot be offlined")Thanks
LaiQuoted 197 lines
Quoted 197 lines
thanks
LaiQuoted 193 lines
Thanx, Paul
Quoted 190 lines
thanks,
- Joel
Quoted 185 lines
Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>---
include/linux/rcupdate.h | 4 ++--
include/trace/events/rcu.h| 4 ++--
kernel/rcu/Kconfig | 13 +++++++------
kernel/rcu/Makefile | 1 -
kernel/rcu/rcu.h | 2 +-
kernel/rcu/update.c | 2 +-
kernel/sysctl.c | 2 +-7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +1
-1@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) #include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU) #include <linux/rcutiny.h>@@ -583,7 +583,7 @@ do { \ * read-side critical section that would block ina !PREEMPT kernel.
* But if you want the full story, read on!
*
- * In non-preemptible RCU implementations (TREE_RCUandTINY_RCU),
+ * In non-preemptible RCU implementations (pureTREE_RCUandTINY_RCU),
* it is illegal to block while in an RCU
read-side critical section.
* In preemptible RCU implementations
(PREEMPT_RCU) inCONFIG_PREEMPTION
* kernel builds, RCU read-side critical sections may be preempted,include/trace/events/rcu.h +1
-1@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization, TP_printk("%s", __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) /** Tracepoint for grace-period events. Takes a string identifying the
include/trace/events/rcu.h +0
-1@@ -425,7 +425,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) ||
defined(CONFIG_PREEMPT_RCU)*/
+#endif /* #ifdefined(CONFIG_TREE_RCU)*//*
* Tracepoint for dyntick-idle entry/exit events. These take a stringkernel/rcu/Kconfig +0
-0@@ -7,7 +7,7 @@ menu "RCU Subsystem"config
TREE_RCU
bool
- default y if !PREEMPTION && SMP
+ default y if SMP
help
This option selects the RCU implementation that is designed for very large SMP system with hundreds orkernel/rcu/Kconfig +0
-0@@ -17,6 +17,7 @@ config TREE_RCUconfig
PREEMPT_RCU
bool
default y if PREEMPTION
+ selectTREE_RCU
help
This option selects the RCU implementation that is designed for very large SMP systems with hundreds orkernel/rcu/Kconfig +0
-0@@ -78,7 +79,7 @@ config TASKS_RCUuser-mode execution as quiescent states.
config
RCU_STALL_COMMON
-def_bool(TREE_RCU||PREEMPT_RCU)
+def_boolTREE_RCU
help
This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allowkernel/rcu/Kconfig +0
-0@@ -86,13 +87,13 @@ config RCU_STALL_COMMONmaking these warnings mandatory for the tree variants.
config
RCU_NEED_SEGCBLIST- def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU )config
RCU_FANOUT
int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT
range 2 32 if !64BIT
- depends on (TREE_RCU||PREEMPT_RCU) &&RCU_EXPERT+ depends onTREE_RCU&&RCU_EXPERT
default 64 if 64BIT
default 32 if !64BIT
helpkernel/rcu/Kconfig +0
-0@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAFint "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT
range 2 32 if !64BIT
- depends on (TREE_RCU||PREEMPT_RCU) &&RCU_EXPERT+ depends onTREE_RCU&&RCU_EXPERT
default 16
help
This option controls the leaf-level fanout of hierarchicalkernel/rcu/Kconfig +0
-0@@ -187,7 +188,7 @@ config RCU_BOOST_DELAYconfig
RCU_NOCB_CPU
bool "Offload RCU callback processing from boot-selected CPUs" - depends onTREE_RCU||PREEMPT_RCU
+ depends onTREE_RCU
depends onRCU_EXPERT||NO_HZ_FULL
default n
helpkernel/rcu/Makefile +0
-0@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.oobj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o
kernel/rcu/rcu.h +0
-0@@ -452,7 +452,7 @@ enum rcutorture_type {
INVALID_RCU_FLAVOR
};kernel/rcu/rcu.h +1
-1-#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data(enum
rcutorture_typetest_type, int *flags,
unsigned long*gp_seq); voidrcutorture_record_progress(unsigned long vernum);kernel/rcu/update.c +0
-1@@ -435,7 +435,7 @@ struct debug_obj_descr rcuhead_debug_descr = { EXPORT_SYMBOL_GPL(rcuhead_debug_descr); #endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU) ||
defined(CONFIG_PREEMPT_RCU)||defined(CONFIG_RCU_TRACE)
+#ifdefined(CONFIG_TREE_RCU)||defined(CONFIG_RCU_TRACE)void do_trace_rcu_torture_read(const char *rcutorturename, structrcu_head*rhp,
unsigned long secs, unsigned longc_old, unsigned long c)kernel/sysctl.c +1
-1@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, }, #endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,Signature · 1 line
2.20.1
PATCH v2 1/1 rcu: make PREEMPT_RCU to be a decoration of TREE_RCU
In reply to Paul E. McKenneyCurrently PREEMPT_RCU and TREE_RCU are "contrary" configs when they can't be both on. But PREEMPT_RCU is actually a kind of TREE_RCU in the implementation. It seams to be appropriate to make PREEMPT_RCU to be a decorative option of TREE_RCU.
---
Changed from v1:
Rebased on -rcu "dev" branch
include/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)
include/linux/rcupdate.h +2 -2
@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h>
@@ -585,7 +585,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted,
include/trace/events/rcu.h +2 -2
@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the
@@ -432,7 +432,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string
kernel/rcu/Kconfig +7 -6
@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or
@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or
@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow
@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help
@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical
@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n help
kernel/rcu/Makefile +0 -1
@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.o
kernel/rcu/rcu.h +1 -1
@@ -427,7 +427,7 @@ enum rcutorture_type {INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq); void do_trace_rcu_torture_read(const char *rcutorturename,
kernel/rcu/update.c +1 -1
@@ -437,7 +437,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)
kernel/sysctl.c +1 -1
@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,
Signature · 1 line
2.20.1
Paul E. McKenney
maintainerQuoted 8 lines · Lai Jiangshan
Currently
PREEMPT_RCUandTREE_RCUare "contrary" configs when they can't be both on. ButPREEMPT_RCUis actually a kind ofTREE_RCUin the implementation. It seams to be appropriate to makePREEMPT_RCUto be a decorative option ofTREE_RCU.Signed-off-by Lai Jiangshan <[email protected]>Signed-off-by Lai Jiangshan <[email protected]>Reviewed-by Joel Fernandes (Google) <[email protected]>
Applied for further review and testing, thank you both!
Thanx, Paul
Quoted 173 lines
---
Changed from v1:
Rebased on -rcu "dev" branchinclude/linux/rcupdate.h | 4 ++-- include/trace/events/rcu.h | 4 ++-- kernel/rcu/Kconfig | 13 +++++++------ kernel/rcu/Makefile | 1 - kernel/rcu/rcu.h | 2 +- kernel/rcu/update.c | 2 +- kernel/sysctl.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-)include/linux/rcupdate.h +2
-2@@ -167,7 +167,7 @@ do { \* TREE_RCU and rcu_barrier_() primitives in TINY_RCU. */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )#include <linux/rcutree.h> #elif defined(CONFIG_TINY_RCU )#include <linux/rcutiny.h> @@ -585,7 +585,7 @@ do { \* read-side critical section that would block in a !PREEMPT kernel. * But if you want the full story, read on! * -* In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), +* In non-preemptible RCU implementations (pure TREE_RCU and TINY_RCU), * it is illegal to block while in an RCU read-side critical section. * In preemptible RCU implementations (PREEMPT_RCU) in CONFIG_PREEMPTION * kernel builds, RCU read-side critical sections may be preempted, include/trace/events/rcu.h +2
-2@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,TP_printk ("%s" , __entry->s) ); -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )/* * Tracepoint for grace-period events. Takes a string identifying the @@ -432,7 +432,7 @@ TRACE_EVENT_RCU(rcu_fqs, __entry->cpu, __entry->qsevent) ); -#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */ +#endif /* #if defined(CONFIG_TREE_RCU) */ /* * Tracepoint for dyntick-idle entry/exit events. These take a string kernel/rcu/Kconfig +7
-6@@ -7,7 +7,7 @@ menu "RCU Subsystem" config TREE_RCU bool - default y if !PREEMPTION && SMP + default y if SMP help This option selects the RCU implementation that is designed for very large SMP system with hundreds or@@ -17,6 +17,7 @@ config TREE_RCU config PREEMPT_RCU bool default y if PREEMPTION + select TREE_RCU help This option selects the RCU implementation that is designed for very large SMP systems with hundreds or@@ -78,7 +79,7 @@ config TASKS_RCU user-mode execution as quiescent states. config RCU_STALL_COMMON - def_bool ( TREE_RCU || PREEMPT_RCU ) + def_bool TREE_RCU help This option enables RCU CPU stall code that is common between the TINY and TREE variants of RCU. The purpose is to allow@@ -86,13 +87,13 @@ config RCU_STALL_COMMON making these warnings mandatory for the tree variants. config RCU_NEED_SEGCBLIST - def_bool ( TREE_RCU || PREEMPT_RCU || TREE_SRCU ) + def_bool ( TREE_RCU || TREE_SRCU ) config RCU_FANOUT int "Tree-based hierarchical RCU fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 64 if 64BIT default 32 if !64BIT help@@ -112,7 +113,7 @@ config RCU_FANOUT_LEAF int "Tree-based hierarchical RCU leaf-level fanout value" range 2 64 if 64BIT range 2 32 if !64BIT - depends on (TREE_RCU || PREEMPT_RCU) && RCU_EXPERT + depends on TREE_RCU && RCU_EXPERT default 16 help This option controls the leaf-level fanout of hierarchical@@ -187,7 +188,7 @@ config RCU_BOOST_DELAY config RCU_NOCB_CPU bool "Offload RCU callback processing from boot-selected CPUs" - depends on TREE_RCU || PREEMPT_RCU + depends on TREE_RCU depends on RCU_EXPERT || NO_HZ_FULL default n helpkernel/rcu/Makefile +0
-1@@ -9,6 +9,5 @@ obj-$(CONFIG_TINY_SRCU) += srcutiny.o obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_RCU_PERF_TEST) += rcuperf.o obj-$(CONFIG_TREE_RCU) += tree.o -obj-$(CONFIG_PREEMPT_RCU) += tree.o obj-$(CONFIG_TINY_RCU) += tiny.o obj-$(CONFIG_RCU_NEED_SEGCBLIST) += rcu_segcblist.okernel/rcu/rcu.h +1
-1@@ -427,7 +427,7 @@ enum rcutorture_type {INVALID_RCU_FLAVOR }; -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU )void rcutorture_get_gp_data (enum rcutorture_type test_type,int *flags,unsigned long *gp_seq); void do_trace_rcu_torture_read(const char *rcutorturename,kernel/rcu/update.c +1
-1@@ -437,7 +437,7 @@ struct debug_obj_descr rcuhead_debug_descr = {EXPORT_SYMBOL_GPL (rcuhead_debug_descr);#endif /* #ifdef CONFIG_DEBUG_OBJECTS_RCU_HEAD */ -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) || defined(CONFIG_RCU_TRACE ) +#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_RCU_TRACE )void do_trace_rcu_torture_read (const char *rcutorturename,struct rcu_head *rhp,unsigned long secs,unsigned long c_old,unsigned long c)kernel/sysctl.c +1
-1@@ -1268,7 +1268,7 @@ static struct ctl_table kern_table[] = { .proc_handler = proc_do_static_key, },#endif -#if defined(CONFIG_TREE_RCU ) || defined(CONFIG_PREEMPT_RCU ) +#if defined(CONFIG_TREE_RCU ) { .procname = "panic_on_rcu_stall", .data = &sysctl_panic_on_rcu_stall,Signature · 1 line
2.20.1