From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753011AbbC3Ndz (ORCPT ); Mon, 30 Mar 2015 09:33:55 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:53424 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752347AbbC3Ndx (ORCPT ); Mon, 30 Mar 2015 09:33:53 -0400 Message-ID: <5519509C.5090804@huawei.com> Date: Mon, 30 Mar 2015 21:33:16 +0800 From: "Ouyang Zhaowei (Charles)" User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Konrad Rzeszutek Wilk , Boris Ostrovsky , David Vrabel CC: , Dingweiping , Yanqiangjun , Huanglinglong , "Ouyangzhaowei (Charles)" Subject: [PATCH] xen: vcpu_info reinit error after hold/release if VM has multi-cpu Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.30.65] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.551950A9.02AE,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: f155f7fb683668b82c166bbdfc85206f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If the VM has multi-cpu the vcpu_info of cpu0 is the member of the structure HYPERVISOR_shared_info, and the others is not, but after hold/release the VM, the vcpu_info will be reinitialized, the vcpu_info of all the vcpus will be considered as the member of HYPERVISOR_shared_info. This will cause the cpu1 and other cpu keep receiving interrupts, and the cpu0 is waiting them to finish the job. So we do not reinit the vcpu_info if it's doing hold/release. Signed-off-by: Charles Ouyang --- 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 c4df9db..832480c 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)) {