diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2009-12-15 00:29:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-15 12:07:09 -0400 |
| commit | 36725f4d9636cea24ce6ea463b1ba50a03315236 (patch) | |
| tree | cba2ddc32b24c56b4d6f2460f2548ca1e8927faf /arch/x86/include | |
| parent | 6c46bff05fb1889ff5581dcd7274db69fd4a4da3 (diff) | |
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')
| -rw-r--r-- | arch/x86/include/asm/vmx.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 2b4945419a84..8f6b0111446a 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h | |||
| @@ -251,6 +251,7 @@ enum vmcs_field { | |||
| 251 | #define EXIT_REASON_MSR_READ 31 | 251 | #define EXIT_REASON_MSR_READ 31 |
| 252 | #define EXIT_REASON_MSR_WRITE 32 | 252 | #define EXIT_REASON_MSR_WRITE 32 |
| 253 | #define EXIT_REASON_MWAIT_INSTRUCTION 36 | 253 | #define EXIT_REASON_MWAIT_INSTRUCTION 36 |
| 254 | #define EXIT_REASON_MONITOR_INSTRUCTION 39 | ||
| 254 | #define EXIT_REASON_PAUSE_INSTRUCTION 40 | 255 | #define EXIT_REASON_PAUSE_INSTRUCTION 40 |
| 255 | #define EXIT_REASON_MCE_DURING_VMENTRY 41 | 256 | #define EXIT_REASON_MCE_DURING_VMENTRY 41 |
| 256 | #define EXIT_REASON_TPR_BELOW_THRESHOLD 43 | 257 | #define EXIT_REASON_TPR_BELOW_THRESHOLD 43 |