From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
To: x86@kernel.org, kexec@lists.infradead.org,
linux-doc@vger.kernel.org, Avi Kivity <avi@redhat.com>,
mtosatti@redhat.com
Cc: linux-kernel@vger.kernel.org,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Subject: [PATCH 2/3] KVM: make crash_clear_loaded_vmcss valid when kvm_intel is loaded
Date: Fri, 12 Oct 2012 14:44:33 +0800 [thread overview]
Message-ID: <5077BC51.50107@cn.fujitsu.com> (raw)
In-Reply-To: <5077BB7B.4030203@cn.fujitsu.com>
Signed-off-by: zhangyanfei <zhangyanfei@cn.fujitsu.com>
---
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 <asm/i387.h>
#include <asm/xcr.h>
#include <asm/perf_event.h>
+#include <asm/kexec.h>
#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();
}
--
1.7.1
next prev parent reply other threads:[~2012-10-12 6:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-12 6:40 [PATCH 0/3] x86: clear vmcss on all cpus when doing kdump if necessary Zhang Yanfei
2012-10-12 6:43 ` [PATCH 1/3] x86/kexec: clear vmcss on all cpus " Zhang Yanfei
2012-10-12 6:44 ` Zhang Yanfei [this message]
2012-10-12 6:45 ` [PATCH 3/3] sysctl: introduce a new interface to control kdump-vmcs-clear behaviour Zhang Yanfei
2012-10-15 15:43 ` [PATCH 0/3] x86: clear vmcss on all cpus when doing kdump if necessary Avi Kivity
2012-10-17 2:28 ` Zhang Yanfei
2012-10-17 10:16 ` Avi Kivity
2012-10-18 1:12 ` Zhang Yanfei
2012-10-18 10:55 ` Avi Kivity
2012-10-19 4:51 ` Zhang Yanfei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5077BC51.50107@cn.fujitsu.com \
--to=zhangyanfei@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kexec@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox