Skip to contentSkip to conversation

x86/reboot: Disable scheduler before disabling IO APIC

PATCH New Fenghua Yu 1 participant 1 message Jun 21, 2014 x86

lore
Share & tools
lore

Fenghua Yu

author
#0 lore raw

PATCH 1/1 x86/reboot: Disable scheduler before disabling IO APIC

From: Fenghua Yu <[email protected]>

During reboot, in the middle of disabling IO APIC, the scheduler may be triggered by per cpu timer to do load blance. But since the kernel is already in the process of shutting down and can not execute scheduler's load balance at this point, it triggers invalid TSS exception and hangs during reboot.

This happens on some boards (e.g. AsRock ZT87 Extreme4 BIOS 2.70) in 32-bit kernel reported in Bugzilla 76661 at
https://bugzilla.kernel.org/show_bug.cgi?id=76661

To fix the issue, we disable local irq including per cpu timer before disabling IO APIC. By doing this, the scheduler will not disturb disable_IO_APIC().

---
 arch/x86/kernel/reboot.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
arch/x86/kernel/reboot.c +10 -4
index 52b1157..16111c6 100644
@@ -574,6 +574,15 @@ static void native_machine_emergency_restart(void)
 void native_machine_shutdown(void)
 {
 	/* Stop the cpus and apics */
+
+#ifdef CONFIG_SMP
+	/*
+	 * Disable the local irq to not receive the per-cpu timer interrupt
+	 * which may trigger scheduler's load balance.
+	 */
+	local_irq_disable();
+#endif
+
 #ifdef CONFIG_X86_IO_APIC
 	/*
 	 * Disabling IO APIC before local APIC is a workaround for
@@ -591,11 +600,8 @@ void native_machine_shutdown(void)
 
 #ifdef CONFIG_SMP
 	/*
-	 * Stop all of the others. Also disable the local irq to
-	 * not receive the per-cpu timer interrupt which may trigger
-	 * scheduler's load balance.
+	 * Stop all of the others.
 	 */
-	local_irq_disable();
 	stop_other_cpus();
 #endif
 
Signature · 1 line
1.8.1.2