diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-05-23 16:57:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-23 23:14:11 -0400 |
commit | a076e4bca2fdabb9e45d86722cc72c0944da5f94 (patch) | |
tree | b11684f4b39dabb84584773f1b7811b5207e7f01 | |
parent | 49b12d4f5e274517b8bc032d507abf31cc2f4150 (diff) |
freezer: fix kthread_create vs freezer theoretical race
kthread() sleeps in TASK_INTERRUPTIBLE state waiting for the first wakeup. In
theory, this wakeup may come from freeze_process()->signal_wake_up(), so the
task can disappear even before kthread_create() sets its ->comm.
Change kthread() to use TASK_UNINTERRUPTIBLE.
[akpm@linux-foundation.org: s/BUG_ON/WARN_ON+recover]
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Gautham R Shenoy <ego@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/kthread.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index df8a8e8f6ca4..bbd51b81a3e8 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -70,7 +70,7 @@ static int kthread(void *_create) | |||
70 | data = create->data; | 70 | data = create->data; |
71 | 71 | ||
72 | /* OK, tell user we're spawned, wait for stop or wakeup */ | 72 | /* OK, tell user we're spawned, wait for stop or wakeup */ |
73 | __set_current_state(TASK_INTERRUPTIBLE); | 73 | __set_current_state(TASK_UNINTERRUPTIBLE); |
74 | complete(&create->started); | 74 | complete(&create->started); |
75 | schedule(); | 75 | schedule(); |
76 | 76 | ||
@@ -162,7 +162,10 @@ EXPORT_SYMBOL(kthread_create); | |||
162 | */ | 162 | */ |
163 | void kthread_bind(struct task_struct *k, unsigned int cpu) | 163 | void kthread_bind(struct task_struct *k, unsigned int cpu) |
164 | { | 164 | { |
165 | BUG_ON(k->state != TASK_INTERRUPTIBLE); | 165 | if (k->state != TASK_UNINTERRUPTIBLE) { |
166 | WARN_ON(1); | ||
167 | return; | ||
168 | } | ||
166 | /* Must have done schedule() in kthread() before we set_task_cpu */ | 169 | /* Must have done schedule() in kthread() before we set_task_cpu */ |
167 | wait_task_inactive(k); | 170 | wait_task_inactive(k); |
168 | set_task_cpu(k, cpu); | 171 | set_task_cpu(k, cpu); |