Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757183AbbEEJLA (ORCPT ); Tue, 5 May 2015 05:11:00 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:62798 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757149AbbEEJKe (ORCPT ); Tue, 5 May 2015 05:10:34 -0400 X-IronPort-AV: E=Sophos;i="5.13,371,1427760000"; d="scan'208";a="261701081" Message-ID: <554888E2.60908@citrix.com> Date: Tue, 5 May 2015 10:09:54 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.4.0 MIME-Version: 1.0 To: "Ouyang Zhaowei (Charles)" , Boris Ostrovsky , Konrad Rzeszutek Wilk CC: , Dingweiping , Yanqiangjun , Subject: Re: [RESEND PATCH] xen: vcpu_info would be reset to wrong place on canceled suspend on PVOPS VM which has multi-cpu References: <5546DFD4.5070909@huawei.com> In-Reply-To: <5546DFD4.5070909@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1467 Lines: 37 On 04/05/15 03:56, Ouyang Zhaowei (Charles) wrote: > The hypervisor continues assuming that vcpu_info is stored in per-cpu data which was set up by xen_vcpu_setup(), > while on canceled suspend, the call to xen_hvm_init_shared_info() will now make the guest think that vcpu_info > is in the shared page, so we do not call xen_hvm_init_shared_info() on suspend canceled. I don't understand what the impact of this fix is. Can you include this in the commit message? David > Signed-off-by: Charles Ouyang > Reviewed-by: Boris Ostrovsky > --- > 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 d949769..b2bed45 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)) { > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/