[Xen-changelog] [xen-3.4-testing] x86: Fix possible S3 suspend hangs

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269429197 0
# Node ID 9ec8ed715b0958774267f5aded33d8eceaa97645
# Parent  6e72f8c3c01733ae5e6f9db4db61a2a9db344a11
x86: Fix possible S3 suspend hangs

It is possible for cpu to become offlined before irq disabled in idle
loop, which will cause this cpu stay in C state and can't wakeup to
play dead.

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>
Signed-off-by: Yu Ke <ke.yu@xxxxxxxxx>
xen-unstable changeset:   21030:bce90bb3ce2c
xen-unstable date:        Mon Mar 15 13:17:38 2010 +0000
---
 xen/arch/x86/acpi/cpu_idle.c |    3 ++-
 xen/arch/x86/domain.c        |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -r 6e72f8c3c017 -r 9ec8ed715b09 xen/arch/x86/acpi/cpu_idle.c
--- a/xen/arch/x86/acpi/cpu_idle.c      Tue Mar 09 18:15:52 2010 +0000
+++ b/xen/arch/x86/acpi/cpu_idle.c      Wed Mar 24 11:13:17 2010 +0000
@@ -209,7 +209,8 @@ static void acpi_processor_idle(void)
      */
     local_irq_disable();
 
-    if ( softirq_pending(smp_processor_id()) )
+    if ( softirq_pending(smp_processor_id()) ||
+         cpu_is_offline(smp_processor_id()) )
     {
         local_irq_enable();
         sched_tick_resume();
diff -r 6e72f8c3c017 -r 9ec8ed715b09 xen/arch/x86/domain.c
--- a/xen/arch/x86/domain.c     Tue Mar 09 18:15:52 2010 +0000
+++ b/xen/arch/x86/domain.c     Wed Mar 24 11:13:17 2010 +0000
@@ -81,7 +81,8 @@ static void default_idle(void)
 static void default_idle(void)
 {
     local_irq_disable();
-    if ( !softirq_pending(smp_processor_id()) )
+    if ( !softirq_pending(smp_processor_id()) &&
+         cpu_online(smp_processor_id()) )
         safe_halt();
     else
         local_irq_enable();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog