Ian Campbell c5cae661d6 xen: fix hang on suspend. ... In 65f63384 "xen: improve error handling in do_suspend" I said: - xs_suspend()/xs_resume() and dpm_suspend_noirq()/dpm_resume_noirq() were not nested in the obvious way. and changed the ordering of the calls as so: BEFORE AFTER xs_suspend dpm_suspend_noirq dpm_suspend_noirq xs_suspend *SUSPEND* *SUSPEND* dpm_resume_noirq dpm_resume_noirq xs_resume xs_resume Clearly this is not an improvement and I was talking rubbish. In particular the new ordering is susceptible to a hang if a xenstore write is in progress at the point at which the suspend kicks in. When the suspend process calls xs_suspend it tries to take the request_mutex but if a write is in progress it could be looping in xenbus_xs.c:read_reply() waiting for something to arrive on &xs_state.reply_list while holding the request_mutex (taken in the caller of read_reply). However if we have done dpm_suspend_noirq before xs_suspend then we won't get any more xenstore interrupts and process_msg() will never be woken up to add anything to the reply_list. Fix this by calling xs_suspend before dpm_suspend_noirq. If dpm_suspend_noirq fails then make sure we go through the xs_suspend_cancel() code path. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Stable Kernel <stable@kernel.org>		2010-01-13 10:01:35 +00:00
..
accessibility	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
acpi	Merge branch 'resume-sci-force-bootparam' into release	2009-12-30 18:32:32 -05:00
amba
ata	libata: retry link resume if necessary	2010-01-12 14:34:14 -05:00
atm	drivers/atm: Correct code taking the size of a pointer	2009-12-13 19:56:33 -08:00
auxdisplay
base	power: fix kernel-doc notation	2010-01-11 09:34:06 -08:00
block	aoe: switch to the new bio_flush_dcache_pages() interface	2009-12-22 09:12:48 +01:00
bluetooth	Bluetooth: Prevent ill-timed autosuspend in USB driver	2009-12-17 12:12:49 -08:00
cdrom	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2009-12-09 19:03:16 -08:00
char	Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6	2010-01-11 09:47:52 -08:00
clocksource	cs5535: add a generic clock event MFGPT driver	2009-12-15 08:53:28 -08:00
connector
cpufreq	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
cpuidle	drivers/cpuidle/governors/menu.c: fix undefined reference to `__udivdi3'	2010-01-11 09:34:07 -08:00
crypto	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
dca
dio
dma	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-12-30 13:46:29 -08:00
edac	edac, pci: remove pesky debug printk	2009-12-24 11:07:09 +01:00
eisa
firewire	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
firmware	firmware: only allow EDD on x86	2009-12-15 08:53:34 -08:00
gpio	gpio: adp5588-gpio: new driver for ADP5588 GPIO expanders	2010-01-11 09:34:07 -08:00
gpu	lib: Introduce generic list_sort function	2010-01-12 21:02:00 -08:00
hid	drop explicit include of autoconf.h	2009-12-12 13:08:15 +01:00
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging	2010-01-11 09:45:55 -08:00
i2c	i2c-omap: OMAP3: Fix I2C lockup during timeout/error cases	2009-12-24 01:30:54 +00:00
ide	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
idle	cpumask: convert drivers/idle/i7300_idle.c to cpumask_var_t	2009-12-17 11:43:25 +10:30
ieee1394	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
ieee802154
infiniband	Merge branches 'misc' and 'mlx4' into for-next	2010-01-06 13:16:47 -08:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2009-12-31 11:12:35 -08:00
isdn	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
leds	leds: leds-pwm: Set led_classdev max_brightness	2009-12-17 11:42:34 +00:00
lguest	lguest: fix bug in setting guest GDT entry	2010-01-04 12:33:33 -08:00
macintosh	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2009-12-12 14:27:24 -08:00
mca
md	md: allow a resync that is waiting for other resync to complete, to be aborted.	2009-12-30 15:25:23 +11:00
media	firewire: fix use of multiple AV/C devices, allow multiple FCP listeners	2009-12-29 19:58:16 +01:00
memstick
message	i2o: propogate the BKL down into the ioctl method	2010-01-04 12:31:21 -08:00
mfd	twl4030-irq.c: fix compiler warning due to raw-spinlock conversion	2009-12-31 17:26:05 -08:00
misc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-12-17 16:38:48 -08:00
mmc	mmc: allow for MMC v4.4	2010-01-11 09:34:06 -08:00
mtd	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus	2009-12-17 16:38:06 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
nubus
of
oprofile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2009-12-14 09:58:24 -08:00
parisc	parisc: Fixup last users of irq_chip->typename	2009-12-16 03:48:56 +00:00
parport	parport_pc.c: use correct length in strncmp	2009-12-16 07:20:12 -08:00
pci	PCIe AER: prevent AER injection if hardware masks error reporting	2010-01-04 15:52:49 -08:00
pcmcia	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-12-30 13:13:24 -08:00
platform	hp-wmi: remove double free caused by merge conflict	2010-01-01 14:04:25 -05:00
pnp	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-12-16 12:33:19 -08:00
power	pmu_battery: Fix battery full reporting	2009-12-18 03:51:29 +03:00
pps
ps3
rapidio
regulator	regulator: wm831x_reg_read() failure unnoticed in wm831x_aldo_get_mode()	2009-12-17 10:27:30 +00:00
rtc	rtc_cmos: convert shutdown to new pnp_driver->shutdown	2010-01-11 09:34:07 -08:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-01-12 20:53:29 -08:00
sbus	bbc_envctrl: Clean up properly if kthread_run() fails.	2010-01-04 15:31:10 -08:00
scsi	[SCSI] megaraid_sas: remove sysfs poll_mode_io world writeable permissions	2010-01-12 21:12:36 -08:00
serial	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2010-01-12 20:56:01 -08:00
sfi
sh
sn	ioc3/ioc4: fix error path on driver registration	2009-12-15 08:53:27 -08:00
spi	Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6	2009-12-17 15:59:05 -08:00
ssb
staging	Staging/vt66*: kconfig, depends on WLAN	2009-12-23 11:27:50 -08:00
tc
telephony
thermal	Merge branch 'misc-2.6.33' into release	2009-12-16 14:22:32 -05:00
uio	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
usb	USB: Fix a bug on appledisplay.c regarding signedness	2009-12-23 11:34:20 -08:00
uwb
video	Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux	2010-01-12 21:04:04 -08:00
virtio
vlynq
w1
watchdog	[WATCHDOG] use resource_size()	2009-12-23 19:53:04 +00:00
xen	xen: fix hang on suspend.	2010-01-13 10:01:35 +00:00
zorro
Kconfig	firewire, ieee1394: update Kconfig help	2009-12-29 19:58:17 +01:00
Makefile