[kernel] r16680 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Ian Campbell]

Author: ijc-guest
Date: Tue Dec  7 13:42:34 2010
New Revision: 16680

Log:
xen: don't bother to stop other cpus on shutdown/reboot (Closes: #605448)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/x86/xen-don-t-bother-to-stop-other-cpus-on-shutdown-reb.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/29

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Dec  7 13:30:01 2010	(r16679)
+++ dists/sid/linux-2.6/debian/changelog	Tue Dec  7 13:42:34 2010	(r16680)
@@ -29,6 +29,7 @@
   * xen: disable ACPI NUMA for PV guests and allow IRQ desc allocation on any
     node (Closes: #603632)
   * xen: handle potential time discontinuity on resume (Closes: #602273)
+  * xen: don't bother to stop other cpus on shutdown/reboot (Closes: #605448)
 
   [ Martin Michlmayr ]
   * Kirkwood: Add support for 6282 based QNAP devices.

Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/xen-don-t-bother-to-stop-other-cpus-on-shutdown-reb.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/xen-don-t-bother-to-stop-other-cpus-on-shutdown-reb.patch	Tue Dec  7 13:42:34 2010	(r16680)
@@ -0,0 +1,41 @@
+From 31e323cca9d5c8afd372976c35a5d46192f540d1 Mon Sep 17 00:00:00 2001
+From: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+Date: Mon, 29 Nov 2010 14:16:53 -0800
+Subject: [PATCH] xen: don't bother to stop other cpus on shutdown/reboot
+
+Xen will shoot all the VCPUs when we do a shutdown hypercall, so there's
+no need to do it manually.
+
+In any case it will fail because all the IPI irqs have been pulled
+down by this point, so the cross-CPU calls will simply hang forever.
+
+Until change 76fac077db6b34e2c6383a7b4f3f4f7b7d06d8ce the function calls
+were not synchronously waited for, so this wasn't apparent.  However after
+that change the calls became synchronous leading to a hang on shutdown
+on multi-VCPU guests.
+
+Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
+Cc: Stable Kernel <stable at kernel.org>
+Cc: Alok Kataria <akataria at vmware.com>
+---
+ arch/x86/xen/enlighten.c |    4 ----
+ 1 files changed, 0 insertions(+), 4 deletions(-)
+
+diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
+index 235c0f4..4a5973a 100644
+--- a/arch/x86/xen/enlighten.c
++++ b/arch/x86/xen/enlighten.c
+@@ -1016,10 +1016,6 @@ static void xen_reboot(int reason)
+ {
+ 	struct sched_shutdown r = { .reason = reason };
+ 
+-#ifdef CONFIG_SMP
+-	stop_other_cpus();
+-#endif
+-
+ 	if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
+ 		BUG();
+ }
+-- 
+1.5.6.5
+

Modified: dists/sid/linux-2.6/debian/patches/series/29
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/29	Tue Dec  7 13:30:01 2010	(r16679)
+++ dists/sid/linux-2.6/debian/patches/series/29	Tue Dec  7 13:42:34 2010	(r16680)
@@ -19,3 +19,4 @@
 + features/all/bcm5974-report-ABS_MT-events.patch
 + bugfix/all/bcm5974-adjust-major-minor-to-scale.patch
 + bugfix/x86/x86-pvclock-Zero-last_value-on-resume.patch
++ bugfix/x86/xen-don-t-bother-to-stop-other-cpus-on-shutdown-reb.patch