lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] stop_machine() vs. synchronous IPI send deadlock

Browse Source 
This fixes deadlock of stop_machine() vs.  synchronous IPI send.  The
problem is that stop_machine() disables interrupts before disabling
preemption on other CPUs.  So if another CPU is preempted and then calls
something like flush_tlb_all() it will deadlock with CPU doing
stop_machine() and which can't process IPI due to disabled IRQs.

I changed stop_machine() to do the same things exactly as it does on other
CPUs, i.e.  it should disable preemption first on _all_ CPUs including
itself and only after that disable IRQs.

Signed-off-by: Kirill Korotaev <dev@sw.ru>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: "Andrey Savochkin" <saw@sawoct.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Kirill Korotaev
2005-11-13 16:07:30 -08:00
committed by Linus Torvalds
parent c5b609797b
commit 4557398f8c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/stop_machine.c
View File

@@ -119,13 +119,12 @@ static int stop_machine(void)
return ret; return ret;
} }
/* Don't schedule us away at this point, please. */
local_irq_disable();
/* Now they are all started, make them hold the CPUs, ready. */ /* Now they are all started, make them hold the CPUs, ready. */
preempt_disable();
stopmachine_set_state(STOPMACHINE_PREPARE); stopmachine_set_state(STOPMACHINE_PREPARE);
/* Make them disable irqs. */ /* Make them disable irqs. */
local_irq_disable();
stopmachine_set_state(STOPMACHINE_DISABLE_IRQ); stopmachine_set_state(STOPMACHINE_DISABLE_IRQ);
return 0; return 0;
@@ -135,6 +134,7 @@ static void restart_machine(void)
{ {
stopmachine_set_state(STOPMACHINE_EXIT); stopmachine_set_state(STOPMACHINE_EXIT);
local_irq_enable(); local_irq_enable();
preempt_enable_no_resched();
} }
struct stop_machine_data struct stop_machine_data