summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2009-12-15 13:29:54 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 09:07:09 -0700
commit36725f4d9636cea24ce6ea463b1ba50a03315236 (patch)
treecba2ddc32b24c56b4d6f2460f2548ca1e8927faf /arch/x86/include/asm
parent6c46bff05fb1889ff5581dcd7274db69fd4a4da3 (diff)
downloadkernel-crypto-36725f4d9636cea24ce6ea463b1ba50a03315236.tar.gz
kernel-crypto-36725f4d9636cea24ce6ea463b1ba50a03315236.tar.xz
kernel-crypto-36725f4d9636cea24ce6ea463b1ba50a03315236.zip
KVM: VMX: Trap and invalid MWAIT/MONITOR instruction
commit 59708670b639bff00f92e519df1ae14da240e919 upstream. We don't support these instructions, but guest can execute them even if the feature('monitor') haven't been exposed in CPUID. So we would trap and inject a #UD if guest try this way. Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r--arch/x86/include/asm/vmx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
index 2b4945419a8..8f6b0111446 100644
--- a/arch/x86/include/asm/vmx.h
+++ b/arch/x86/include/asm/vmx.h
@@ -251,6 +251,7 @@ enum vmcs_field {
#define EXIT_REASON_MSR_READ 31
#define EXIT_REASON_MSR_WRITE 32
#define EXIT_REASON_MWAIT_INSTRUCTION 36
+#define EXIT_REASON_MONITOR_INSTRUCTION 39
#define EXIT_REASON_PAUSE_INSTRUCTION 40
#define EXIT_REASON_MCE_DURING_VMENTRY 41
#define EXIT_REASON_TPR_BELOW_THRESHOLD 43