context_tracking: New context tracking susbsystem
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 11 lines · Frederic Weisbecker
Create a new subsystem that probes on kernel boundaries to keep track of the transitions between level contexts with two basic initial contexts: user or kernel.
This is an abstraction of some RCU code that use such tracking to implement its userspace extended quiescent state.
We need to pull this up from RCU into this new level of indirection because this tracking is also going to be used to implement an "on demand" generic virtual cputime accounting. A necessary step to shutdown the tick while still accounting the cputime.
I have queued this, and if it passes tests and inspection will try pushing it for 3.8.
Thanx, Paul
Quoted 567 lines
Signed-off-by Frederic Weisbecker <[email protected]>Cc Andrew Morton <[email protected]>Cc H. Peter Anvin <[email protected]>Cc Ingo Molnar <[email protected]>Cc Paul E. McKenney <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Steven Rostedt <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Li Zhong <[email protected]>Cc Gilad Ben-Yossef [email protected]---
Changes since last version address Gilad's comments and include ifdef fixes. AlsoCONTEXT_TRACKING_FORCEoption has been moved below RCU user mode config as it's the only user for now.arch/Kconfig | 15 ++-- arch/x86/Kconfig | 2 +- arch/x86/include/asm/{rcu.h => context_tracking.h} | 15 ++-- arch/x86/kernel/entry_64.S | 2 +- arch/x86/kernel/ptrace.c | 8 +- arch/x86/kernel/signal.c | 5 +- arch/x86/kernel/traps.c | 2 +- arch/x86/mm/fault.c | 2 +- include/linux/context_tracking.h | 18 ++++ include/linux/rcupdate.h | 2 - init/Kconfig | 28 ++++---- kernel/Makefile | 1 + kernel/context_tracking.c | 83 ++++++++++++++++++++ kernel/rcutree.c | 64 +--------------- kernel/sched/core.c | 11 ++- 15 files changed, 150 insertions(+), 108 deletions(-) rename arch/x86/include/asm/{rcu.h => context_tracking.h} (63%) create mode 100644 include/linux/context_tracking.h create mode 100644 kernel/context_tracking.carch/Kconfig +8
-7@@ -300,15 +300,16 @@ config SECCOMP_FILTER See Documentation/prctl/seccomp_filter.txt for details. -config HAVE_RCU_USER_QS +config HAVE_CONTEXT_TRACKING bool help - Provide kernel entry/exit hooks necessary for userspace - RCU extended quiescent state. Syscalls need to be wrapped inside - rcu_user_exit()-rcu_user_enter() through the slow path using - TIF_NOHZ flag. Exceptions handlers must be wrapped as well. Irqs - are already protected inside rcu_irq_enter/rcu_irq_exit() but - preemption or signal handling on irq exit still need to be protected. + Provide kernel/user boundaries probes necessary for subsystems + that need it, such as userspace RCU extended quiescent state. + Syscalls need to be wrapped inside user_exit()-user_enter() through + the slow path using TIF_NOHZ flag. Exceptions handlers must be + wrapped as well. Irqs are already protected inside + rcu_irq_enter/rcu_irq_exit() but preemption or signal handling on + irq exit still need to be protected. config HAVE_VIRT_CPU_ACCOUNTING boolarch/x86/Kconfig +1
-1@@ -106,7 +106,7 @@ config X86 select KTIME_SCALAR if X86_32 select GENERIC_STRNCPY_FROM_USER select GENERIC_STRNLEN_USER - select HAVE_RCU_USER_QS if X86_64 + select HAVE_CONTEXT_TRACKING if X86_64 select HAVE_IRQ_TIME_ACCOUNTING select GENERIC_KERNEL_THREAD select GENERIC_KERNEL_EXECVEarch/x86/include/asm/context_tracking.h renamed from arch/x86/include/asm/rcu.h +7
-8@@ -1,27 +1,26 @@ -#ifndef _ASM_X86_RCU_H -#define _ASM_X86_RCU_H +#ifndef _ASM_X86_CONTEXT_TRACKING_H +#define _ASM_X86_CONTEXT_TRACKING_H#ifndef __ASSEMBLY__ - -#include <linux/rcupdate.h> +#include <linux/context_tracking.h> #include <asm/ptrace.h> static inline void exception_enter (struct pt_regs *regs) { -rcu_user_exit (); +user_exit (); }static inline void exception_exit (struct pt_regs *regs) { -#ifdef CONFIG_RCU_USER_QS +#ifdef CONFIG_CONTEXT_TRACKING if (user_mode (regs)) -rcu_user_enter (); +user_enter ();#endif }#else /* __ASSEMBLY__ */ -#ifdef CONFIG_RCU_USER_QS +#ifdef CONFIG_CONTEXT_TRACKING # define SCHEDULE_USER call schedule_user#else # define SCHEDULE_USER call schedulearch/x86/kernel/entry_64.S +1
-1@@ -56,7 +56,7 @@ #include <asm/ftrace.h> #include <asm/percpu.h> #include <asm/asm.h> -#include <asm/rcu.h> +#include <asm/context_tracking.h> #include <asm/smap.h> #include <linux/err.h>arch/x86/kernel/ptrace.c +4
-4@@ -21,7 +21,7 @@#include <linux/signal.h> #include <linux/perf_event.h> #include <linux/hw_breakpoint.h> -#include <linux/rcupdate.h> +#include <linux/context_tracking.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -1461,7 +1461,7 @@ long syscall_trace_enter(struct pt_regs *regs) {long ret =0 ; -rcu_user_exit (); +user_exit ();/* * If we stepped into a sysenter/syscall insn, it trapped in @@ -1516,7 +1516,7 @@ void syscall_trace_leave(struct pt_regs *regs)* or do_notify_resume(), in which case we can be in RCU * user mode. */ -rcu_user_exit (); +user_exit ();audit_syscall_exit (regs);@@ -1534,5 +1534,5 @@ void syscall_trace_leave(struct pt_regs *regs)if (step ||test_thread_flag (TIF_SYSCALL_TRACE ))tracehook_report_syscall_exit (regs, step); -rcu_user_enter (); +user_enter (); }arch/x86/kernel/signal.c +3
-2@@ -22,6 +22,7 @@#include <linux/uaccess.h> #include <linux/user-return-notifier.h> #include <linux/uprobes.h> +#include <linux/context_tracking.h> #include <asm/processor.h> #include <asm/ucontext.h> @@ -816,7 +817,7 @@ static void do_signal(struct pt_regs *regs)void do_notify_resume (struct pt_regs *regs,void *unused,__u32 thread_info_flags) { -rcu_user_exit (); +user_exit ();#ifdef CONFIG_X86_MCE /* notify userspace of pending MCEs */ @@ -840,7 +841,7 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)if (thread_info_flags & _TIF_USER_RETURN_NOTIFY)fire_user_return_notifiers (); -rcu_user_enter (); +user_enter (); }void signal_fault (struct pt_regs *regs,void __user *frame,char *where)arch/x86/kernel/traps.c +1
-1@@ -55,7 +55,7 @@#include <asm/i387.h> #include <asm/fpu-internal.h> #include <asm/mce.h> -#include <asm/rcu.h> +#include <asm/context_tracking.h> #include <asm/mach_traps.h> arch/x86/mm/fault.c +1
-1@@ -18,7 +18,7 @@#include <asm/pgalloc.h> /* pgd_*(), ... */ #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */ #include <asm/fixmap.h> /* VSYSCALL_START */ -#include <asm/rcu.h> /* exception_enter(), ... */ +#include <asm/context_tracking.h> /* exception_enter(), ... */ /* * Page fault error code bits: include/linux/context_tracking.h new file +18
-0@@ -0,0 +1,18 @@ +#ifndef _LINUX_CONTEXT_TRACKING_H +#define _LINUX_CONTEXT_TRACKING_H + +#ifdef CONFIG_CONTEXT_TRACKING +#include <linux/sched.h> + +extern void user_enter (void ); +extern void user_exit (void ); +extern void context_tracking_task_switch (struct task_struct *prev, +struct task_struct *next); +#else +static inline void user_enter (void ) { } +static inline void user_exit (void ) { } +static inline void context_tracking_task_switch (struct task_struct *prev, +struct task_struct *next) { } +#endif /* !CONFIG_CONTEXT_TRACKING */ + +#endif include/linux/rcupdate.h +0
-2@@ -222,8 +222,6 @@ extern void rcu_user_enter(void);extern void rcu_user_exit (void );extern void rcu_user_enter_after_irq (void );extern void rcu_user_exit_after_irq (void ); -extern void rcu_user_hooks_switch (struct task_struct *prev, -struct task_struct *next);#else static inline void rcu_user_enter (void ) { }static inline void rcu_user_exit (void ) { }init/Kconfig +14
-14@@ -486,9 +486,13 @@ config PREEMPT_RCU This option enables preemptible-RCU code that is common between the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations. +config CONTEXT_TRACKING + bool + config RCU_USER_QS bool "Consider userspace as in RCU extended quiescent state" - depends on HAVE_RCU_USER_QS && SMP + depends on HAVE_CONTEXT_TRACKING && SMP + select CONTEXT_TRACKING help This option sets hooks on kernel / userspace boundaries and puts RCU in extended quiescent state when the CPU runs in@@ -497,24 +501,20 @@ config RCU_USER_QS try to keep the timer tick on for RCU. Unless you want to hack and help the development of the full - tickless feature, you shouldn't enable this option. It also + dynticks mode, you shouldn't enable this option. It also adds unnecessary overhead. If unsure say N -config RCU_USER_QS_FORCE - bool "Force userspace extended QS by default" - depends on RCU_USER_QS +config CONTEXT_TRACKING_FORCE + bool "Force context tracking" + depends on CONTEXT_TRACKING help - Set the hooks in user/kernel boundaries by default in order to - test this feature that treats userspace as an extended quiescent - state until we have a real user like a full adaptive nohz option. - - Unless you want to hack and help the development of the full - tickless feature, you shouldn't enable this option. It adds - unnecessary overhead. - - If unsure say N + Probe on user/kernel boundaries by default in order to + test the features that rely on it such as userspace RCU extended + quiescent states. + This test is there for debugging until we have a real user like the + full dynticks mode. config RCU_FANOUT int "Tree-based hierarchical RCU fanout value"kernel/Makefile +1
-0@@ -110,6 +110,7 @@ obj-$(CONFIG_USER_RETURN_NOTIFIER) += user-return-notifier.o obj-$(CONFIG_PADATA) += padata.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o +obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o $(obj)/configs.o: $(obj)/config_data.hkernel/context_tracking.c new file +83
-0@@ -0,0 +1,83 @@ +#include <linux/context_tracking.h> +#include <linux/rcupdate.h> +#include <linux/sched.h> +#include <linux/percpu.h> +#include <linux/hardirq.h> + +struct context_tracking { +/* +* When active is false, hooks are not set to +* minimize overhead: TIF flags are cleared +* and calls to user_enter/exit are ignored. This +* may be further optimized using static keys. +*/ +bool active; +enum { +IN_KERNEL =0 , +IN_USER , + } state; +}; + +static DEFINE_PER_CPU(struct context_tracking, context_tracking) = { +#ifdef CONFIG_CONTEXT_TRACKING_FORCE + .active = true, +#endif +}; + +void user_enter (void ) +{ +unsigned long flags; + +/* +* Some contexts may involve an exception occuring in an irq, +* leading to that nesting: +* rcu_irq_enter() rcu_user_exit() rcu_user_exit() rcu_irq_exit() +* This would mess up the dyntick_nesting count though. And rcu_irq_*() +* helpers are enough to protect RCU uses inside the exception. So +* just return immediately if we detect we are in an IRQ. +*/ +if (in_interrupt ()) +return ; + +WARN_ON_ONCE (!current->mm); + +local_irq_save (flags); +if (__this_cpu_read (context_tracking.active) && +__this_cpu_read (context_tracking.state) !=IN_USER ) { +__this_cpu_write (context_tracking.state,IN_USER ); +rcu_user_enter (); + } +local_irq_restore (flags); +} + +void user_exit (void ) +{ +unsigned long flags; + +/* +* Some contexts may involve an exception occuring in an irq, +* leading to that nesting: +* rcu_irq_enter() rcu_user_exit() rcu_user_exit() rcu_irq_exit() +* This would mess up the dyntick_nesting count though. And rcu_irq_*() +* helpers are enough to protect RCU uses inside the exception. So +* just return immediately if we detect we are in an IRQ. +*/ +if (in_interrupt ()) +return ; + +local_irq_save (flags); +if (__this_cpu_read (context_tracking.state) ==IN_USER ) { +__this_cpu_write (context_tracking.state,IN_KERNEL ); +rcu_user_exit (); + } +local_irq_restore (flags); +} + +void context_tracking_task_switch (struct task_struct *prev, +struct task_struct *next) +{ +if (__this_cpu_read (context_tracking.active)) { +clear_tsk_thread_flag (prev,TIF_NOHZ ); +set_tsk_thread_flag (next,TIF_NOHZ ); + } +}kernel/rcutree.c +2
-62@@ -207,9 +207,6 @@ EXPORT_SYMBOL_GPL(rcu_note_context_switch); DEFINE_PER_CPU(struct rcu_dynticks, rcu_dynticks) = { .dynticks_nesting =DYNTICK_TASK_EXIT_IDLE , .dynticks =ATOMIC_INIT (1 ), -#if defined(CONFIG_RCU_USER_QS) && !defined(CONFIG_RCU_USER_QS_FORCE) - .ignore_user_qs = true, -#endif };static long blimit =10 ;/* Maximum callbacks per rcu_do_batch. */ @@ -420,29 +417,7 @@ EXPORT_SYMBOL_GPL(rcu_idle_enter);*/ void rcu_user_enter (void ) { -unsigned long flags; -struct rcu_dynticks *rdtp; - -/* -* Some contexts may involve an exception occuring in an irq, -* leading to that nesting: -* rcu_irq_enter() rcu_user_exit() rcu_user_exit() rcu_irq_exit() -* This would mess up the dyntick_nesting count though. And rcu_irq_*() -* helpers are enough to protect RCU uses inside the exception. So -* just return immediately if we detect we are in an IRQ. -*/ -if (in_interrupt ()) -return ; - -WARN_ON_ONCE (!current->mm); - -local_irq_save (flags); - rdtp = &__get_cpu_var (rcu_dynticks); -if (!rdtp->ignore_user_qs && !rdtp->in_user) { - rdtp->in_user = true; -rcu_eqs_enter (true); - } -local_irq_restore (flags); +rcu_eqs_enter (1 ); }/** @@ -579,27 +554,7 @@ EXPORT_SYMBOL_GPL(rcu_idle_exit);*/ void rcu_user_exit (void ) { -unsigned long flags; -struct rcu_dynticks *rdtp; - -/* -* Some contexts may involve an exception occuring in an irq, -* leading to that nesting: -* rcu_irq_enter() rcu_user_exit() rcu_user_exit() rcu_irq_exit() -* This would mess up the dyntick_nesting count though. And rcu_irq_*() -* helpers are enough to protect RCU uses inside the exception. So -* just return immediately if we detect we are in an IRQ. -*/ -if (in_interrupt ()) -return ; - -local_irq_save (flags); - rdtp = &__get_cpu_var (rcu_dynticks); -if (rdtp->in_user) { - rdtp->in_user = false; -rcu_eqs_exit (true); - } -local_irq_restore (flags); +rcu_eqs_exit (1 ); }/** @@ -722,21 +677,6 @@ int rcu_is_cpu_idle(void) }EXPORT_SYMBOL (rcu_is_cpu_idle); -#ifdef CONFIG_RCU_USER_QS -void rcu_user_hooks_switch (struct task_struct *prev, -struct task_struct *next) -{ -struct rcu_dynticks *rdtp; - -/* Interrupts are disabled in context switch */ - rdtp = &__get_cpu_var (rcu_dynticks); -if (!rdtp->ignore_user_qs) { -clear_tsk_thread_flag (prev,TIF_NOHZ ); -set_tsk_thread_flag (next,TIF_NOHZ ); - } -} -#endif /* #ifdef CONFIG_RCU_USER_QS */ -#if defined(CONFIG_PROVE_RCU ) && defined(CONFIG_HOTPLUG_CPU )/* kernel/sched/core.c +6
-5@@ -72,6 +72,7 @@#include <linux/slab.h> #include <linux/init_task.h> #include <linux/binfmts.h> +#include <linux/context_tracking.h> #include <asm/switch_to.h> #include <asm/tlb.h> @@ -1886,8 +1887,8 @@ context_switch(struct rq *rq, struct task_struct *prev,spin_release (&rq->lock.dep_map,1 , _THIS_IP_);#endif +context_tracking_task_switch (prev, next);/* Here we just switch the register state and the stack. */ -rcu_user_hooks_switch (prev, next);switch_to (prev, next, prev);barrier ();@@ -2911,7 +2912,7 @@ asmlinkage void __sched schedule(void) }EXPORT_SYMBOL (schedule); -#ifdef CONFIG_RCU_USER_QS +#ifdef CONFIG_CONTEXT_TRACKING asmlinkage void __sched schedule_user(void) {/* @@ -2920,9 +2921,9 @@ asmlinkage void __sched schedule_user(void)* we haven't yet exited the RCU idle mode. Do it here manually until * we find a better solution. */ -rcu_user_exit (); +user_exit ();schedule (); - rcu_user_enter(); + user_enter(); }#endif @@ -3027,7 +3028,7 @@ asmlinkage void __sched preempt_schedule_irq(void)/* Catch callers which need to be fixed */ BUG_ON (ti->preempt_count || !irqs_disabled ()); -rcu_user_exit (); +user_exit (); do { add_preempt_count(PREEMPT_ACTIVE); local_irq_enable();Signature · 1 line
1.7.5.4
Quoted 8 lines · Paul E. McKenney
Quoted 7 lines · Frederic Weisbecker
Create a new subsystem that probes on kernel boundaries to keep track of the transitions between level contexts with two basic initial contexts: user or kernel.
This is an abstraction of some RCU code that use such tracking to implement its userspace extended quiescent state.
Quoted 8 lines
Quoted 4 lines
We need to pull this up from RCU into this new level of indirection because this tracking is also going to be used to implement an "on demand" generic virtual cputime accounting. A necessary step to shutdown the tick while still accounting the cputime.
I have queued this, and if it passes tests and inspection will try pushing it for 3.8.
You can add my Reviewed-by: Steven Rostedt <[email protected]> if you like.
-- Steve
Quoted 14 lines · Steven Rostedt
Quoted 13 lines · Paul E. McKenney
Quoted 11 lines · Frederic Weisbecker
Create a new subsystem that probes on kernel boundaries to keep track of the transitions between level contexts with two basic initial contexts: user or kernel.
This is an abstraction of some RCU code that use such tracking to implement its userspace extended quiescent state.
We need to pull this up from RCU into this new level of indirection because this tracking is also going to be used to implement an "on demand" generic virtual cputime accounting. A necessary step to shutdown the tick while still accounting the cputime.
Quoted 6 lines
Quoted 3 lines
I have queued this, and if it passes tests and inspection will try pushing it for 3.8.
You can add my Reviewed-by: Steven Rostedt <[email protected]> if you like.
Very happy to do so! ;-)
Thanx, Paul
On Tue, 2012-11-27 at 19:33 +0100, Frederic Weisbecker wrote:
[....]
Review
Quoted 9 lines
(quoted diff) +0
-9- - WARN_ON_ONCE(!current->mm); - - local_irq_save(flags); - rdtp = &__get_cpu_var(rcu_dynticks); - if (!rdtp->ignore_user_qs && !rdtp->in_user) { - rdtp->in_user = true; - rcu_eqs_enter(true); - }
It seems to me that ignore_user_qs and in_user defined in struct rcu_dynticks are no longer needed?
If so, then maybe we could remove them, code below:
==========
kernel/rcutree.c +0 -3
@@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu (rcu_dynticks, cpu);WARN_ON_ONCE (rdp->dynticks->dynticks_nesting !=DYNTICK_TASK_EXIT_IDLE );WARN_ON_ONCE (atomic_read (&rdp->dynticks->dynticks) !=1 ); -#ifdef CONFIG_RCU_USER_QS -WARN_ON_ONCE (rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp;rcu_boot_init_nocb_percpu_data (rdp);
kernel/rcutree.h +0 -4
@@ -102,10 +102,6 @@ struct rcu_dynticks {/* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap;/* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS -bool ignore_user_qs;/* Treat userspace as extended QS or not */ -bool in_user;/* Is the CPU in userland from RCU POV? */ -#endif };/* RCU's kthread states for tracing. */
2012/11/29 Li Zhong <[email protected]>:
Quoted 39 lines · Frederic Weisbecker
[....]
Review
Quoted 9 lines
(quoted diff) +0
-9- - WARN_ON_ONCE(!current->mm); - - local_irq_save(flags); - rdtp = &__get_cpu_var(rcu_dynticks); - if (!rdtp->ignore_user_qs && !rdtp->in_user) { - rdtp->in_user = true; - rcu_eqs_enter(true); - }It seems to me that
ignore_user_qsandin_userdefined in structrcu_dynticksare no longer needed?If so, then maybe we could remove them, code below:
==========
kernel/rcutree.c +0
-3@@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu (rcu_dynticks, cpu);WARN_ON_ONCE (rdp->dynticks->dynticks_nesting !=DYNTICK_TASK_EXIT_IDLE );WARN_ON_ONCE (atomic_read (&rdp->dynticks->dynticks) !=1 ); -#ifdef CONFIG_RCU_USER_QS -WARN_ON_ONCE (rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp;rcu_boot_init_nocb_percpu_data (rdp);kernel/rcutree.h +0
-0
kernel/rcutree.h struct rcu_dynticks { · line 107
Quoted 10 lines
kernel/rcutree.h +0
-4@@ -102,10 +102,6 @@ struct rcu_dynticks {/* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap;/* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS -bool ignore_user_qs;/* Treat userspace as extended QS or not */ -bool in_user;/* Is the CPU in userland from RCU POV? */ -#endif };/* RCU's kthread states for tracing. */
Good point. Paul, do you prefer to fold these changes into my patch or do we add a new one? In any case Li we need your Signed-off-by tag.
Thanks.
Quoted 47 lines · Frederic Weisbecker
2012/11/29 Li Zhong <[email protected]>:
Quoted 46 lines · Frederic Weisbecker
[....]
Review
Quoted 9 lines
(quoted diff) +0
-9- - WARN_ON_ONCE(!current->mm); - - local_irq_save(flags); - rdtp = &__get_cpu_var(rcu_dynticks); - if (!rdtp->ignore_user_qs && !rdtp->in_user) { - rdtp->in_user = true; - rcu_eqs_enter(true); - }It seems to me that
ignore_user_qsandin_userdefined in structrcu_dynticksare no longer needed?If so, then maybe we could remove them, code below:
==========
kernel/rcutree.c +0
-3@@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu (rcu_dynticks, cpu);WARN_ON_ONCE (rdp->dynticks->dynticks_nesting !=DYNTICK_TASK_EXIT_IDLE );WARN_ON_ONCE (atomic_read (&rdp->dynticks->dynticks) !=1 ); -#ifdef CONFIG_RCU_USER_QS -WARN_ON_ONCE (rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp;rcu_boot_init_nocb_percpu_data (rdp);kernel/rcutree.h +0
-4@@ -102,10 +102,6 @@ struct rcu_dynticks {/* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap;/* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS -bool ignore_user_qs;/* Treat userspace as extended QS or not */ -bool in_user;/* Is the CPU in userland from RCU POV? */ -#endif };
Quoted 6 lines
kernel/rcutree.h struct rcu_dynticks { · line 107
Quoted 3 lines
kernel/rcutree.h +0
-0/* RCU's kthread states for tracing. */ Good point. Paul, do you prefer to fold these changes into my patch or do we add a new one? In any case Li we need your Signed-off-by tag.
A separate patch works fine here because there should be no complaints from compilers or tests about these. Zhong, please do send with your Signed-off-by, and I will queue them.
Thanx, Paul
PATCH 1/1 Remove unused code originally used for context tracking
As new context tracking subsystem added, it seems ignore_user_qs and in_user defined in struct rcu_dynticks are no longer needed, so remove them.
--- kernel/rcutree.c | 3 --- kernel/rcutree.h | 4 ---- 2 files changed, 7 deletions(-)
kernel/rcutree.c +0 -3
@@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu (rcu_dynticks, cpu);WARN_ON_ONCE (rdp->dynticks->dynticks_nesting !=DYNTICK_TASK_EXIT_IDLE );WARN_ON_ONCE (atomic_read (&rdp->dynticks->dynticks) !=1 ); -#ifdef CONFIG_RCU_USER_QS -WARN_ON_ONCE (rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp;rcu_boot_init_nocb_percpu_data (rdp);
kernel/rcutree.h +0 -4
@@ -102,10 +102,6 @@ struct rcu_dynticks {/* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap;/* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS -bool ignore_user_qs;/* Treat userspace as extended QS or not */ -bool in_user;/* Is the CPU in userland from RCU POV? */ -#endif };/* RCU's kthread states for tracing. */
Signature · 1 line
1.7.11.4
Re: [PATCH rcu] Remove unused code originally used for context tracking
Quoted 5 lines · Li Zhong
As new context tracking subsystem added, it seems
ignore_user_qsandin_userdefined in structrcu_dynticksare no longer needed, so remove them.Signed-off-by Li Zhong <[email protected]>
Hearing no objections from Frederic, I have queued this patch for 3.9
Thanx, Paul
Quoted 38 lines
--- kernel/rcutree.c | 3 --- kernel/rcutree.h | 4 ---- 2 files changed, 7 deletions(-)kernel/rcutree.c +0
-3@@ -2719,9 +2719,6 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp) rdp->dynticks = &per_cpu (rcu_dynticks, cpu);WARN_ON_ONCE (rdp->dynticks->dynticks_nesting !=DYNTICK_TASK_EXIT_IDLE );WARN_ON_ONCE (atomic_read (&rdp->dynticks->dynticks) !=1 ); -#ifdef CONFIG_RCU_USER_QS -WARN_ON_ONCE (rdp->dynticks->in_user); -#endif rdp->cpu = cpu; rdp->rsp = rsp;rcu_boot_init_nocb_percpu_data (rdp);kernel/rcutree.h +0
-4@@ -102,10 +102,6 @@ struct rcu_dynticks {/* idle-period nonlazy_posted snapshot. */ int tick_nohz_enabled_snap;/* Previously seen value from sysfs. */ #endif /* #ifdef CONFIG_RCU_FAST_NO_HZ */ -#ifdef CONFIG_RCU_USER_QS -bool ignore_user_qs;/* Treat userspace as extended QS or not */ -bool in_user;/* Is the CPU in userland from RCU POV? */ -#endif };/* RCU's kthread states for tracing. */ Signature · 1 line
1.7.11.4
Re: [PATCH rcu] Remove unused code originally used for context tracking
2013/1/7 Paul E. McKenney <[email protected]>:
Quoted 8 lines · Li Zhong
Quoted 5 lines
As new context tracking subsystem added, it seems
ignore_user_qsandin_userdefined in structrcu_dynticksare no longer needed, so remove them.Signed-off-by Li Zhong <[email protected]>Hearing no objections from Frederic, I have queued this patch for 3.9
Thanks Paul!
And feel free to add my ack.
Re: [PATCH rcu] Remove unused code originally used for context tracking
Quoted 6 lines · Frederic Weisbecker
2013/1/7 Paul E. McKenney <[email protected]>:
Quoted 5 lines · Li Zhong
Quoted 4 lines
As new context tracking subsystem added, it seems
ignore_user_qsandin_userdefined in structrcu_dynticksare no longer needed, so remove them.
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Li Zhong <[email protected]>Hearing no objections from Frederic, I have queued this patch for 3.9
Thanks Paul!
And feel free to add my ack.
Done, thank you!
Thanx, Paul