diff options
author | Avi Kivity <avi@redhat.com> | 2011-04-04 06:39:22 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-05-11 07:57:00 -0400 |
commit | c4f035c60dad45ff8813550dc82540dbbc263df2 (patch) | |
tree | 371e0b43f62b8516870bb777dd967de5aa76b206 /arch/x86/include | |
parent | aa97bb4891b1f1b35e7abef8d1e2bbd3dda07159 (diff) |
KVM: x86 emulator: add framework for instruction intercepts
When running in guest mode, certain instructions can be intercepted by
hardware. This also holds for nested guests running on emulated
virtualization hardware, in particular instructions emulated by kvm
itself.
This patch adds a framework for intercepting instructions. If an
instruction is marked for interception, and if we're running in guest
mode, a callback is called to check whether an intercept is needed or
not. The callback is called at three points in time: immediately after
beginning execution, after checking privilge exceptions, and after
checking memory exception. This suits the different interception points
defined for different instructions and for the various virtualization
instruction sets.
In addition, a new X86EMUL_INTERCEPT is defined, which any callback or
memory access may define, allowing the more complicated intercepts to be
implemented in existing callbacks.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/kvm_emulate.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index 48693f0d3842..2cfea49d4706 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h | |||
@@ -14,6 +14,8 @@ | |||
14 | #include <asm/desc_defs.h> | 14 | #include <asm/desc_defs.h> |
15 | 15 | ||
16 | struct x86_emulate_ctxt; | 16 | struct x86_emulate_ctxt; |
17 | enum x86_intercept; | ||
18 | enum x86_intercept_stage; | ||
17 | 19 | ||
18 | struct x86_exception { | 20 | struct x86_exception { |
19 | u8 vector; | 21 | u8 vector; |
@@ -62,6 +64,7 @@ struct x86_exception { | |||
62 | #define X86EMUL_RETRY_INSTR 3 /* retry the instruction for some reason */ | 64 | #define X86EMUL_RETRY_INSTR 3 /* retry the instruction for some reason */ |
63 | #define X86EMUL_CMPXCHG_FAILED 4 /* cmpxchg did not see expected value */ | 65 | #define X86EMUL_CMPXCHG_FAILED 4 /* cmpxchg did not see expected value */ |
64 | #define X86EMUL_IO_NEEDED 5 /* IO is needed to complete emulation */ | 66 | #define X86EMUL_IO_NEEDED 5 /* IO is needed to complete emulation */ |
67 | #define X86EMUL_INTERCEPTED 6 /* Intercepted by nested VMCB/VMCS */ | ||
65 | 68 | ||
66 | struct x86_emulate_ops { | 69 | struct x86_emulate_ops { |
67 | /* | 70 | /* |
@@ -160,6 +163,9 @@ struct x86_emulate_ops { | |||
160 | int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata); | 163 | int (*get_msr)(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata); |
161 | void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */ | 164 | void (*get_fpu)(struct x86_emulate_ctxt *ctxt); /* disables preempt */ |
162 | void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */ | 165 | void (*put_fpu)(struct x86_emulate_ctxt *ctxt); /* reenables preempt */ |
166 | int (*intercept)(struct x86_emulate_ctxt *ctxt, | ||
167 | enum x86_intercept intercept, | ||
168 | enum x86_intercept_stage stage); | ||
163 | }; | 169 | }; |
164 | 170 | ||
165 | typedef u32 __attribute__((vector_size(16))) sse128_t; | 171 | typedef u32 __attribute__((vector_size(16))) sse128_t; |
@@ -203,6 +209,7 @@ struct read_cache { | |||
203 | struct decode_cache { | 209 | struct decode_cache { |
204 | u8 twobyte; | 210 | u8 twobyte; |
205 | u8 b; | 211 | u8 b; |
212 | u8 intercept; | ||
206 | u8 lock_prefix; | 213 | u8 lock_prefix; |
207 | u8 rep_prefix; | 214 | u8 rep_prefix; |
208 | u8 op_bytes; | 215 | u8 op_bytes; |
@@ -244,6 +251,7 @@ struct x86_emulate_ctxt { | |||
244 | /* interruptibility state, as a result of execution of STI or MOV SS */ | 251 | /* interruptibility state, as a result of execution of STI or MOV SS */ |
245 | int interruptibility; | 252 | int interruptibility; |
246 | 253 | ||
254 | bool guest_mode; /* guest running a nested guest */ | ||
247 | bool perm_ok; /* do not check permissions if true */ | 255 | bool perm_ok; /* do not check permissions if true */ |
248 | bool only_vendor_specific_insn; | 256 | bool only_vendor_specific_insn; |
249 | 257 | ||
@@ -265,6 +273,18 @@ struct x86_emulate_ctxt { | |||
265 | #define X86EMUL_MODE_PROT32 4 /* 32-bit protected mode. */ | 273 | #define X86EMUL_MODE_PROT32 4 /* 32-bit protected mode. */ |
266 | #define X86EMUL_MODE_PROT64 8 /* 64-bit (long) mode. */ | 274 | #define X86EMUL_MODE_PROT64 8 /* 64-bit (long) mode. */ |
267 | 275 | ||
276 | enum x86_intercept_stage { | ||
277 | X86_ICPT_PRE_EXCEPT, | ||
278 | X86_ICPT_POST_EXCEPT, | ||
279 | X86_ICPT_POST_MEMACCESS, | ||
280 | }; | ||
281 | |||
282 | enum x86_intercept { | ||
283 | x86_intercept_none, | ||
284 | |||
285 | nr_x86_intercepts | ||
286 | }; | ||
287 | |||
268 | /* Host execution mode. */ | 288 | /* Host execution mode. */ |
269 | #if defined(CONFIG_X86_32) | 289 | #if defined(CONFIG_X86_32) |
270 | #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32 | 290 | #define X86EMUL_MODE_HOST X86EMUL_MODE_PROT32 |