On Thu, Sep 06, 2012 at 08:27:40PM +0900, Tomoki Sekiyama wrote:
> Initialize rcu related variables to avoid warnings about RCU usage while
> slave CPUs is running specified functions. Also notify RCU subsystem before
> the slave CPU is entered into idle state.
Hello, Tomoki,
A few questions and comments interspersed below.
Thanx, Paul
> Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama.qu@xxxxxxxxxxx>
> Cc: Avi Kivity <avi@xxxxxxxxxx>
> Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: Ingo Molnar <mingo@xxxxxxxxxx>
> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
> ---
>
> arch/x86/kernel/smpboot.c | 4 ++++
> kernel/rcutree.c | 14 ++++++++++++++
> 2 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
> index e8cfe377..45dfc1d 100644
> --- a/arch/x86/kernel/smpboot.c
> +++ b/arch/x86/kernel/smpboot.c
> @@ -382,6 +382,8 @@ notrace static void __cpuinit start_slave_cpu(void *unused)
> f = per_cpu(slave_cpu_func, cpu);
> per_cpu(slave_cpu_func, cpu).func = NULL;
>
> + rcu_note_context_switch(cpu);
> +
Why not use rcu_idle_enter() and rcu_idle_exit()? These would tell
RCU to ignore the slave CPU for the duration of its idle period.
The way you have it, if a slave CPU stayed idle for too long, you
would get RCU CPU stall warnings, and possibly system hangs as well.
Or is this being called from some task that is not the idle task?
If so, you instead want the new rcu_user_enter() and rcu_user_exit()
that are hopefully on their way into 3.7. Or maybe better, use a real
idle task, so that idle_task(smp_processor_id()) returns true and RCU
stops complaining. ;-)
Note that CPUs that RCU believes to be idle are not permitted to contain
RCU read-side critical sections, which in turn means no entering the
scheduler, no sleeping, and so on. There is an RCU_NONIDLE() macro
to tell RCU to pay attention to the CPU only for the duration of the
statement passed to RCU_NONIDLE, and there are also an _rcuidle variant
of the tracing statement to allow tracing from idle.
> if (!f.func) {
> native_safe_halt();
> continue;
> @@ -1005,6 +1007,8 @@ int __cpuinit slave_cpu_up(unsigned int cpu)
> if (IS_ERR(idle))
> return PTR_ERR(idle);
>
> + slave_cpu_notify(CPU_SLAVE_UP_PREPARE, cpu);
> +
> ret = __native_cpu_up(cpu, idle, 1);
>
> cpu_maps_update_done();
> diff --git a/kernel/rcutree.c b/kernel/rcutree.c
> index f280e54..31a7c8c 100644
> --- a/kernel/rcutree.c
> +++ b/kernel/rcutree.c
> @@ -2589,6 +2589,9 @@ static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
> switch (action) {
> case CPU_UP_PREPARE:
> case CPU_UP_PREPARE_FROZEN:
> +#ifdef CONFIG_SLAVE_CPU
> + case CPU_SLAVE_UP_PREPARE:
> +#endif
Why do you need #ifdef here? Why not define CPU_SLAVE_UP_PREPARE
unconditionally? Then if CONFIG_SLAVE_CPU=n, rcu_cpu_notify() would
never be invoked with CPU_SLAVE_UP_PREPARE, so no problems.
> rcu_prepare_cpu(cpu);
> rcu_prepare_kthreads(cpu);
> break;
> @@ -2603,6 +2606,9 @@ static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
> break;
> case CPU_DYING:
> case CPU_DYING_FROZEN:
> +#ifdef CONFIG_SLAVE_CPU
> + case CPU_SLAVE_DYING:
> +#endif
Same here.
> /*
> * The whole machine is "stopped" except this CPU, so we can
> * touch any data without introducing corruption. We send the
> @@ -2616,6 +2622,9 @@ static int __cpuinit rcu_cpu_notify(struct notifier_block *self,
> case CPU_DEAD_FROZEN:
> case CPU_UP_CANCELED:
> case CPU_UP_CANCELED_FROZEN:
> +#ifdef CONFIG_SLAVE_CPU
> + case CPU_SLAVE_DEAD:
> +#endif
And here.
> for_each_rcu_flavor(rsp)
> rcu_cleanup_dead_cpu(cpu, rsp);
> break;
> @@ -2797,6 +2806,10 @@ static void __init rcu_init_geometry(void)
> rcu_num_nodes -= n;
> }
>
> +static struct notifier_block __cpuinitdata rcu_slave_nb = {
> + .notifier_call = rcu_cpu_notify,
> +};
> +
> void __init rcu_init(void)
> {
> int cpu;
> @@ -2814,6 +2827,7 @@ void __init rcu_init(void)
> * or the scheduler are operational.
> */
> cpu_notifier(rcu_cpu_notify, 0);
> + register_slave_cpu_notifier(&rcu_slave_nb);
> for_each_online_cpu(cpu)
> rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
> check_cpu_stall_init();
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
