From patchwork Wed Nov 14 09:32:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yanfei Zhang X-Patchwork-Id: 1740131 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3DA253FCF7 for ; Wed, 14 Nov 2012 09:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964789Ab2KNJd6 (ORCPT ); Wed, 14 Nov 2012 04:33:58 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:14392 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S932782Ab2KNJd4 (ORCPT ); Wed, 14 Nov 2012 04:33:56 -0500 X-IronPort-AV: E=Sophos;i="4.83,249,1352044800"; d="scan'208";a="6195914" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 14 Nov 2012 17:32:15 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qAE9XsQa003875; Wed, 14 Nov 2012 17:33:54 +0800 Received: from [10.167.226.121] ([10.167.226.121]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012111417335014-1149087 ; Wed, 14 Nov 2012 17:33:50 +0800 Message-ID: <50A3651F.3020809@cn.fujitsu.com> Date: Wed, 14 Nov 2012 17:32:15 +0800 From: zhangyanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: "x86@kernel.org" , "kexec@lists.infradead.org" , Avi Kivity , Marcelo Tosatti CC: "linux-kernel@vger.kernel.org" , "kvm@vger.kernel.org" Subject: [PATCH v4 2/2] KVM: set/unset crash_clear_loaded_vmcss and vmclear_skipped in kvm_intel module References: <50A3645F.60302@cn.fujitsu.com> In-Reply-To: <50A3645F.60302@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/14 17:33:50, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/11/14 17:33:50, Serialize complete at 2012/11/14 17:33:50 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: Zhang Yanfei --- arch/x86/kvm/vmx.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4ff0ab9..029ec7b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "trace.h" @@ -963,6 +964,20 @@ static void vmcs_load(struct vmcs *vmcs) vmcs, phys_addr); } +static inline void enable_vmclear_in_kdump(int cpu) +{ +#ifdef CONFIG_KEXEC + per_cpu(vmclear_skipped, cpu) = 0; +#endif +} + +static inline void disable_vmclear_in_kdump(int cpu) +{ +#ifdef CONFIG_KEXEC + per_cpu(vmclear_skipped, cpu) = 1; +#endif +} + static void __loaded_vmcs_clear(void *arg) { struct loaded_vmcs *loaded_vmcs = arg; @@ -972,8 +987,10 @@ static void __loaded_vmcs_clear(void *arg) return; /* vcpu migration can race with cpu offline */ if (per_cpu(current_vmcs, cpu) == loaded_vmcs->vmcs) per_cpu(current_vmcs, cpu) = NULL; + disable_vmclear_in_kdump(cpu); list_del(&loaded_vmcs->loaded_vmcss_on_cpu_link); loaded_vmcs_init(loaded_vmcs); + enable_vmclear_in_kdump(cpu); } static void loaded_vmcs_clear(struct loaded_vmcs *loaded_vmcs) @@ -1491,8 +1508,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu); local_irq_disable(); + disable_vmclear_in_kdump(cpu); list_add(&vmx->loaded_vmcs->loaded_vmcss_on_cpu_link, &per_cpu(loaded_vmcss_on_cpu, cpu)); + enable_vmclear_in_kdump(cpu); local_irq_enable(); /* @@ -2302,6 +2321,9 @@ static int hardware_enable(void *garbage) return -EBUSY; INIT_LIST_HEAD(&per_cpu(loaded_vmcss_on_cpu, cpu)); + + enable_vmclear_in_kdump(cpu); + rdmsrl(MSR_IA32_FEATURE_CONTROL, old); test_bits = FEATURE_CONTROL_LOCKED; @@ -2333,6 +2355,8 @@ static void vmclear_local_loaded_vmcss(void) list_for_each_entry_safe(v, n, &per_cpu(loaded_vmcss_on_cpu, cpu), loaded_vmcss_on_cpu_link) __loaded_vmcs_clear(v); + + disable_vmclear_in_kdump(cpu); } @@ -7230,6 +7254,10 @@ static int __init vmx_init(void) if (r) goto out3; +#ifdef CONFIG_KEXEC + crash_clear_loaded_vmcss = vmclear_local_loaded_vmcss; +#endif + vmx_disable_intercept_for_msr(MSR_FS_BASE, false); vmx_disable_intercept_for_msr(MSR_GS_BASE, false); vmx_disable_intercept_for_msr(MSR_KERNEL_GS_BASE, true); @@ -7265,6 +7293,10 @@ static void __exit vmx_exit(void) free_page((unsigned long)vmx_io_bitmap_b); free_page((unsigned long)vmx_io_bitmap_a); +#ifdef CONFIG_KEXEC + crash_clear_loaded_vmcss = NULL; +#endif + kvm_exit(); }