lkml.org 
[lkml]   [2016]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 080/268] x86/xen: don't reset vcpu_info on a cancelled suspend
    Date
    4.2.8-ckt3 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    arch/x86/xen/suspend.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c
    index 53b4c08..6d34151 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)) {
    --
    1.9.1
    \
     
     \ /
      Last update: 2016-01-27 23:01    [W:3.408 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site