Patch "x86/xen: don't reset vcpu_info on a cancelled suspend" has been added to the 3.10-stable tree

Patch "x86/xen: don't reset vcpu_info on a cancelled suspend" has been added to the 3.10-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    x86/xen: don't reset vcpu_info on a cancelled suspend

to the 3.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-xen-don-t-reset-vcpu_info-on-a-cancelled-suspend.patch
and it can be found in the queue-3.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 6a1f513776b78c994045287073e55bae44ed9f8c Mon Sep 17 00:00:00 2001
From: "Ouyang Zhaowei (Charles)" <ouyangzhaowei@huawei.com>
Date: Wed, 6 May 2015 09:47:04 +0800
Subject: x86/xen: don't reset vcpu_info on a cancelled suspend

From: "Ouyang Zhaowei (Charles)" <ouyangzhaowei@huawei.com>

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 arch/x86/xen/suspend.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/x86/xen/suspend.c
+++ b/arch/x86/xen/suspend.c
@@ -30,7 +30,8 @@ void xen_arch_hvm_post_suspend(int suspe
 {
 #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)) {


Patches currently in stable-queue which might be from ouyangzhaowei@huawei.com are

queue-3.10/x86-xen-don-t-reset-vcpu_info-on-a-cancelled-suspend.patch