p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu: Defer smpboot kthread unparking until CPU known to scheduler 

Currently, smpboot_unpark_threads() is invoked before the incoming CPU
has been added to the scheduler's runqueue structures.  This might
potentially cause the unparked kthread to run on the wrong CPU, since the
correct CPU isn't fully set up yet.

That causes a sporadic, hard to debug boot crash triggering on some
systems, reported by Borislav Petkov, and bisected down to:

  2a442c9c64 ("x86: Use common outgoing-CPU-notification code")

This patch places smpboot_unpark_threads() in a CPU hotplug
notifier with priority set so that these kthreads are unparked just after
the CPU has been added to the runqueues.

Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Paul E. McKenney 2015-04-12 08:06:55 -07:00 committed by Ingo Molnar
parent 4bfe186dbe
commit 00df35f991
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/cpu.h
View File

@ -73,6 +73,7 @@ enum {
/* migration should happen before other stuff but after perf */ /* migration should happen before other stuff but after perf */
CPU_PRI_PERF = 20, CPU_PRI_PERF = 20,
CPU_PRI_MIGRATION = 10, CPU_PRI_MIGRATION = 10,
CPU_PRI_SMPBOOT = 9,
/* bring up workqueues before normal notifiers and down after */ /* bring up workqueues before normal notifiers and down after */
CPU_PRI_WORKQUEUE_UP = 5, CPU_PRI_WORKQUEUE_UP = 5,
CPU_PRI_WORKQUEUE_DOWN = -5, CPU_PRI_WORKQUEUE_DOWN = -5,
@ -165,6 +166,7 @@ static inline void __unregister_cpu_notifier(struct notifier_block *nb)
} }
#endif #endif
void smpboot_thread_init(void);
int cpu_up(unsigned int cpu); int cpu_up(unsigned int cpu);
void notify_cpu_starting(unsigned int cpu); void notify_cpu_starting(unsigned int cpu);
extern void cpu_maps_update_begin(void); extern void cpu_maps_update_begin(void);

1
init/main.c
View File

@ -384,6 +384,7 @@ static noinline void __init_refok rest_init(void)
int pid; int pid;
rcu_scheduler_starting(); rcu_scheduler_starting();
smpboot_thread_init();
/* /*
* We need to spawn init first so that it obtains pid 1, however * We need to spawn init first so that it obtains pid 1, however
* the init task will end up wanting to create kthreads, which, if * the init task will end up wanting to create kthreads, which, if

34
kernel/cpu.c
View File

@ -448,6 +448,37 @@ int __ref cpu_down(unsigned int cpu)
EXPORT_SYMBOL(cpu_down); EXPORT_SYMBOL(cpu_down);
#endif /*CONFIG_HOTPLUG_CPU*/ #endif /*CONFIG_HOTPLUG_CPU*/
/*
* Unpark per-CPU smpboot kthreads at CPU-online time.
*/
static int smpboot_thread_call(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
int cpu = (long)hcpu;
switch (action & ~CPU_TASKS_FROZEN) {
case CPU_ONLINE:
smpboot_unpark_threads(cpu);
break;
default:
break;
}
return NOTIFY_OK;
}
static struct notifier_block smpboot_thread_notifier = {
.notifier_call = smpboot_thread_call,
.priority = CPU_PRI_SMPBOOT,
};
void __cpuinit smpboot_thread_init(void)
{
register_cpu_notifier(&smpboot_thread_notifier);
}
/* Requires cpu_add_remove_lock to be held */ /* Requires cpu_add_remove_lock to be held */
static int _cpu_up(unsigned int cpu, int tasks_frozen) static int _cpu_up(unsigned int cpu, int tasks_frozen)
{ {
@ -487,9 +518,6 @@ static int _cpu_up(unsigned int cpu, int tasks_frozen)
goto out_notify; goto out_notify;
BUG_ON(!cpu_online(cpu)); BUG_ON(!cpu_online(cpu));
/* Wake the per cpu threads */
smpboot_unpark_threads(cpu);
/* Now call notifier in preparation. */ /* Now call notifier in preparation. */
cpu_notify(CPU_ONLINE | mod, hcpu); cpu_notify(CPU_ONLINE | mod, hcpu);