diff options
| author | Ouyang Zhaowei (Charles) <ouyangzhaowei@huawei.com> | 2015-05-06 04:47:04 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2016-02-02 22:09:15 +0300 |
| commit | 6654e6213223a132d4c1ade41fce0a7af558142c (patch) | |
| tree | 7ae3298dd8a91c2a7825dbec621f3598e2b94edc /arch/x86 | |
| parent | be3f616927c1c60cf8fc61ac97be026450839cc6 (diff) | |
| download | linux-6654e6213223a132d4c1ade41fce0a7af558142c.tar.xz | |
x86/xen: don't reset vcpu_info on a cancelled suspend
commit 6a1f513776b78c994045287073e55bae44ed9f8c upstream.
On a cancelled suspend the vcpu_info location does not change (it's
still in the per-cpu area registered by xen_vcpu_setup()). So do not
call xen_hvm_init_shared_info() which would make the kernel think its
back in the shared info. With the wrong vcpu_info, events cannot be
received and the domain will hang after a cancelled suspend.
Signed-off-by: Charles Ouyang <ouyangzhaowei@huawei.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/xen/suspend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index c4df9dbd63b7..2277cc8965fe 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c @@ -32,7 +32,8 @@ static void xen_hvm_post_suspend(int suspend_cancelled) { #ifdef CONFIG_XEN_PVHVM int cpu; - xen_hvm_init_shared_info(); + if (!suspend_cancelled) + xen_hvm_init_shared_info(); xen_callback_vector(); xen_unplug_emulated_devices(); if (xen_feature(XENFEAT_hvm_safe_pvclock)) { |