Skip to contentSkip to conversation

PATCH: Fix race in cpu_down (hotplug cpu)

PATCH Nigel Cunningham 1 participant 1 message Sep 19, 2005 CPU hotplug

lore
Share & tools
lore
#0 lore raw

Hi.

There is a race condition in taking down a cpu (kernel/cpu.c::cpu_down). A cpu can already be idling when we clear its online flag, and we do not force the idle task to reschedule. This results in __cpu_die timing out. A simple fix is to force the idle task on the cpu going to reschedule.

Without the patch below, Suspend2 get into a deadlock at resume time when this issue occurs. I could not complete 20 cycles without seeing the issue. With the patch below, I have completed 75 cycles on the trot without problems.

Please apply.

kernel/cpu.c +3 -0
diff -ruNp 9910-hotplug-cpu-race.patch-old/kernel/cpu.c 9910-hotplug-cpu-race.patch-new/kernel/cpu.c
@@ -126,6 +126,9 @@ int cpu_down(unsigned int cpu)
 	while (!idle_cpu(cpu))
 		yield();
 
+	/* CPU may have idled before we set its offline flag. */
+	set_tsk_need_resched(idle_task(cpu));
+
 	/* This actually kills the CPU. */
 	__cpu_die(cpu);