diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-04-04 06:39:25 -0400 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-05-11 07:57:01 -0400 |
| commit | d09beabd7cd4cf70d982ff54656dc6431df80fa4 (patch) | |
| tree | bfb3d5996f6d2b51d79e0ccc543cbe63d9eaba01 /arch/x86/kvm/emulate.c | |
| parent | 775fde8648ebc588d07de39457aadc7c2131df2e (diff) | |
KVM: x86 emulator: Add check_perm callback
This patch adds a check_perm callback for each opcode into
the instruction emulator. This will be used to do all
necessary permission checks on instructions before checking
whether they are intercepted or not.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a2c31e527a99..4822824b608b 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c | |||
| @@ -111,6 +111,7 @@ struct opcode { | |||
| 111 | struct group_dual *gdual; | 111 | struct group_dual *gdual; |
| 112 | struct gprefix *gprefix; | 112 | struct gprefix *gprefix; |
| 113 | } u; | 113 | } u; |
| 114 | int (*check_perm)(struct x86_emulate_ctxt *ctxt); | ||
| 114 | }; | 115 | }; |
| 115 | 116 | ||
| 116 | struct group_dual { | 117 | struct group_dual { |
| @@ -2425,12 +2426,17 @@ static int em_movdqu(struct x86_emulate_ctxt *ctxt) | |||
| 2425 | 2426 | ||
| 2426 | #define D(_y) { .flags = (_y) } | 2427 | #define D(_y) { .flags = (_y) } |
| 2427 | #define DI(_y, _i) { .flags = (_y), .intercept = x86_intercept_##_i } | 2428 | #define DI(_y, _i) { .flags = (_y), .intercept = x86_intercept_##_i } |
| 2429 | #define DIP(_y, _i, _p) { .flags = (_y), .intercept = x86_intercept_##_i, \ | ||
| 2430 | .check_perm = (_p) } | ||
| 2428 | #define N D(0) | 2431 | #define N D(0) |
| 2429 | #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) } | 2432 | #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) } |
| 2430 | #define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) } | 2433 | #define GD(_f, _g) { .flags = ((_f) | Group | GroupDual), .u.gdual = (_g) } |
| 2431 | #define I(_f, _e) { .flags = (_f), .u.execute = (_e) } | 2434 | #define I(_f, _e) { .flags = (_f), .u.execute = (_e) } |
| 2432 | #define II(_f, _e, _i) \ | 2435 | #define II(_f, _e, _i) \ |
| 2433 | { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i } | 2436 | { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i } |
| 2437 | #define IIP(_f, _e, _i, _p) \ | ||
| 2438 | { .flags = (_f), .u.execute = (_e), .intercept = x86_intercept_##_i, \ | ||
| 2439 | .check_perm = (_p) } | ||
| 2434 | #define GP(_f, _g) { .flags = ((_f) | Prefix), .u.gprefix = (_g) } | 2440 | #define GP(_f, _g) { .flags = ((_f) | Prefix), .u.gprefix = (_g) } |
| 2435 | 2441 | ||
| 2436 | #define D2bv(_f) D((_f) | ByteOp), D(_f) | 2442 | #define D2bv(_f) D((_f) | ByteOp), D(_f) |
| @@ -2873,6 +2879,7 @@ done_prefixes: | |||
| 2873 | } | 2879 | } |
| 2874 | 2880 | ||
| 2875 | c->execute = opcode.u.execute; | 2881 | c->execute = opcode.u.execute; |
| 2882 | c->check_perm = opcode.check_perm; | ||
| 2876 | c->intercept = opcode.intercept; | 2883 | c->intercept = opcode.intercept; |
| 2877 | 2884 | ||
| 2878 | /* Unrecognised? */ | 2885 | /* Unrecognised? */ |
| @@ -3136,6 +3143,13 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt) | |||
| 3136 | goto done; | 3143 | goto done; |
| 3137 | } | 3144 | } |
| 3138 | 3145 | ||
| 3146 | /* Do instruction specific permission checks */ | ||
| 3147 | if (c->check_perm) { | ||
| 3148 | rc = c->check_perm(ctxt); | ||
| 3149 | if (rc != X86EMUL_CONTINUE) | ||
| 3150 | goto done; | ||
| 3151 | } | ||
| 3152 | |||
| 3139 | if (unlikely(ctxt->guest_mode) && c->intercept) { | 3153 | if (unlikely(ctxt->guest_mode) && c->intercept) { |
| 3140 | rc = ops->intercept(ctxt, c->intercept, | 3154 | rc = ops->intercept(ctxt, c->intercept, |
| 3141 | X86_ICPT_POST_EXCEPT); | 3155 | X86_ICPT_POST_EXCEPT); |