From patchwork Fri Oct 19 05:46:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yanfei Zhang X-Patchwork-Id: 1616691 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id E99E9DF26F for ; Fri, 19 Oct 2012 05:48:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756812Ab2JSFrs (ORCPT ); Fri, 19 Oct 2012 01:47:48 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:40907 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756780Ab2JSFrr (ORCPT ); Fri, 19 Oct 2012 01:47:47 -0400 X-IronPort-AV: E=Sophos;i="4.80,611,1344182400"; d="scan'208";a="6028495" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 19 Oct 2012 13:46:17 +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 q9J5ljAn014587; Fri, 19 Oct 2012 13:47:45 +0800 Received: from localhost.localdomain ([10.167.226.121]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012101913472279-609962 ; Fri, 19 Oct 2012 13:47:22 +0800 Message-ID: <5080E936.6090000@cn.fujitsu.com> Date: Fri, 19 Oct 2012 13:46:30 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.9) Gecko/20100921 Fedora/3.1.4-1.fc14 Thunderbird/3.1.4 MIME-Version: 1.0 To: x86@kernel.org, kexec@lists.infradead.org, Avi Kivity , mtosatti@redhat.com CC: linux-kernel@vger.kernel.org, "kvm@vger.kernel.org" Subject: [PATCH 2/2] KVM: make crash_clear_loaded_vmcss valid when loading kvm_intel module References: <5080E813.7030302@cn.fujitsu.com> In-Reply-To: <5080E813.7030302@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/19 13:47:22, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/10/19 13:47:23, Serialize complete at 2012/10/19 13:47:23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Signed-off-by: zhangyanfei --- arch/x86/kvm/vmx.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 4ff0ab9..f6a16b2 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -41,6 +41,7 @@ #include #include #include +#include #include "trace.h" @@ -7230,6 +7231,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 +7270,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(); }