xen/manage: fix potential deadlock when resuming the console
authorDavid Vrabel <david.vrabel@citrix.com>
Wed, 2 Jul 2014 16:25:23 +0000 (17:25 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 6 Aug 2014 17:07:34 +0000 (18:07 +0100)
commit8a9c266c7bbac51a32d70ca0bc9e70a54233b89e
treec0eb2385c63fe7ac7e4eabda28e53c7d4cc92cbd
parent74d31de64a0bc7a37a0020e9ddb10af1047ddbbf
xen/manage: fix potential deadlock when resuming the console

commit 1b6478231c6f5f844185acb32045cf195028cfce upstream.

Calling xen_console_resume() in xen_suspend() causes a warning because
it locks irq_mapping_update_lock (a mutex) and this may sleep.  If a
userspace process is using the evtchn device then this mutex may be
locked at the point of the stop_machine() call and
xen_console_resume() would then deadlock.

Resuming the console after stop_machine() returns avoids this
deadlock.

Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/xen/manage.c