From b433c3d4549ae74935b585115f076c6fb7bc48fe Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 28 Jun 2010 16:51:01 +0200 Subject: init, sched: Fix race between init and kthreadd Ilya reported that on a very slow machine he could reliably reproduce a race between forking init and kthreadd. We first fork init so that it obtains pid-1, however since the scheduler is already fully running at this point it can preempt and run the init thread before we spawn and set kthreadd_task. The init thread can then attempt spawning kthreads without kthreadd being present which results in an OOPS. Reported-by: Ilya Loginov Signed-off-by: Peter Zijlstra Acked-by: Linus Torvalds LKML-Reference: <1277736661.3561.110.camel@laptop> Signed-off-by: Ingo Molnar --- init/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'init/main.c') diff --git a/init/main.c b/init/main.c index 3bdb152f412f..633442f79e90 100644 --- a/init/main.c +++ b/init/main.c @@ -422,18 +422,26 @@ static void __init setup_command_line(char *command_line) * gcc-3.4 accidentally inlines this function, so use noinline. */ +static __initdata DECLARE_COMPLETION(kthreadd_done); + static noinline void __init_refok rest_init(void) __releases(kernel_lock) { int pid; rcu_scheduler_starting(); + /* + * 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 + * we schedule it before we create kthreadd, will OOPS. + */ kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND); numa_default_policy(); pid = kernel_thread(kthreadd, NULL, CLONE_FS | CLONE_FILES); rcu_read_lock(); kthreadd_task = find_task_by_pid_ns(pid, &init_pid_ns); rcu_read_unlock(); + complete(&kthreadd_done); unlock_kernel(); /* @@ -855,6 +863,10 @@ static noinline int init_post(void) static int __init kernel_init(void * unused) { + /* + * Wait until kthreadd is all set-up. + */ + wait_for_completion(&kthreadd_done); lock_kernel(); /* -- cgit v1.2.3-59-g8ed1b From 9715856922bf8475f5428c29b6f4a9eebc97d391 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 30 Jun 2010 10:37:11 +0200 Subject: init: Fix comment Apparently "pid-1" confuses people... Requested-by: Randy Dunlap Signed-off-by: Peter Zijlstra Cc: torvalds@linux-foundation.org Cc: randy.dunlap@oracle.com Cc: Ilya Loginov LKML-Reference: <1277887031.1868.82.camel@laptop> Signed-off-by: Ingo Molnar --- init/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'init/main.c') diff --git a/init/main.c b/init/main.c index 633442f79e90..1692df32244a 100644 --- a/init/main.c +++ b/init/main.c @@ -431,7 +431,7 @@ static noinline void __init_refok rest_init(void) rcu_scheduler_starting(); /* - * 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 * we schedule it before we create kthreadd, will OOPS. */ -- cgit v1.2.3-59-g8ed1b