KVM: emulator: fix unimplemented instruction detection
PATCH 1/4 KVM: emulator: fix unimplemented instruction detection
Unimplemented instruction detection is broken for group instructions since it relies on "flags" field of opcode to be zero, but all instructions in a group inherit flags from a group encoding. Fix that by having a separate flag for unimplemented instructions.
--- arch/x86/kvm/emulate.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/x86/kvm/emulate.c +4 -3
@@ -132,8 +132,9 @@#define Priv (1<<27)/* instruction generates #GP if current CPL != 0 */ #define No64 (1<<28)#define PageTable (1 << 29)/* instruction used to write page table */ +#define NotImpl (1 << 30)/* instruction is not implemented */ /* Source 2 operand type */ -#define Src2Shift (30) +#define Src2Shift (31)#define Src2None (OpNone << Src2Shift)#define Src2CL (OpCL << Src2Shift)#define Src2ImmByte (OpImmByte << Src2Shift)
@@ -3615,7 +3616,7 @@ static int check_perm_out(struct x86_emulate_ctxt *ctxt)#define DI (_y, _i) { .flags = (_y), .intercept = x86_intercept_##_i }#define DIP (_y, _i, _p) { .flags = (_y), .intercept = x86_intercept_##_i, \ .check_perm = (_p) } -#define N D(0) +#define N D(NotImpl)#define EXT (_f, _e) { .flags = ((_f) | RMExt), .u.group = (_e) }#define G (_f, _g) { .flags = ((_f) | Group | ModRM), .u.group = (_g) }#define GD (_f, _g) { .flags = ((_f) | GroupDual | ModRM), .u.gdual = (_g) }
@@ -4373,7 +4374,7 @@ done_prefixes: ctxt->intercept = opcode.intercept;/* Unrecognised? */ -if (ctxt->d ==0 || (ctxt->d & Undefined)) +if ((ctxt->d & NotImpl) || (ctxt->d & Undefined))return EMULATION_FAILED ;if (!(ctxt->d & VendorSpecific) && ctxt->only_vendor_specific_insn)
Signature · 1 line
1.7.10.4
PATCH 2/4 KVM: VMX: do not try to reexecute failed instruction while emulating invalid guest state
During invalid guest state emulation vcpu cannot enter guest mode to try to reexecute instruction that emulator failed to emulate, so emulation will happen again and again. Prevent that by telling the emulator that instruction reexecution should not be attempted.
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx.c | 2 +- arch/x86/kvm/x86.c | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -795,6 +795,7 @@ enum emulation_result {#define EMULTYPE_TRAP_UD (1 << 1)#define EMULTYPE_SKIP (1 << 2)#define EMULTYPE_RETRY (1 << 3) +#define EMULTYPE_NO_REEXECUTE (1 << 4)int x86_emulate_instruction (struct kvm_vcpu *vcpu,unsigned long cr2,int emulation_type,void *insn,int insn_len);
arch/x86/kvm/vmx.c +1 -1
@@ -5189,7 +5189,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)if (test_bit (KVM_REQ_EVENT , &vcpu->requests))return 1 ; - err =emulate_instruction (vcpu,0 ); + err =emulate_instruction (vcpu,EMULTYPE_NO_REEXECUTE );if (err ==EMULATE_DO_MMIO ) { ret =0 ;
arch/x86/kvm/x86.c +9 -4
@@ -4765,11 +4765,15 @@ static int handle_emulation_failure(struct kvm_vcpu *vcpu) }static bool reexecute_instruction (struct kvm_vcpu *vcpu,gva_t cr2, -bool write_fault_to_shadow_pgtable) +bool write_fault_to_shadow_pgtable, +int emulation_type) {gpa_t gpa = cr2;pfn_t pfn; +if (emulation_type &EMULTYPE_NO_REEXECUTE ) +return false; +if (!vcpu->arch.mmu.direct_map) {/* * Write permission should be allowed since only
@@ -4912,8 +4916,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,if (r !=EMULATION_OK ) {if (emulation_type &EMULTYPE_TRAP_UD )return EMULATE_FAIL ; -if (reexecute_instruction (vcpu, cr2, - write_fault_to_spt)) +if (reexecute_instruction (vcpu, cr2, write_fault_to_spt, + emulation_type))return EMULATE_DONE ;if (emulation_type &EMULTYPE_SKIP )return EMULATE_FAIL ;
@@ -4943,7 +4947,8 @@ restart:return EMULATE_DONE ;if (r ==EMULATION_FAILED ) { -if (reexecute_instruction (vcpu, cr2, write_fault_to_spt)) +if (reexecute_instruction (vcpu, cr2, write_fault_to_spt, + emulation_type))return EMULATE_DONE ;return handle_emulation_failure (vcpu);
Signature · 1 line
1.7.10.4
PATCH 3/4 KVM: emulator: Do not fail on emulation of undefined opcode
In reply to Gleb NatapovEmulation of undefined opcode should inject #UD instead of causing emulation failure. Do that by moving Undefined flag check to emulation stage and injection #UD there.
--- arch/x86/kvm/emulate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kvm/emulate.c +3 -2
@@ -4374,7 +4374,7 @@ done_prefixes: ctxt->intercept = opcode.intercept;/* Unrecognised? */ -if ((ctxt->d & NotImpl) || (ctxt->d & Undefined)) +if ((ctxt->d & NotImpl))return EMULATION_FAILED ;if (!(ctxt->d & VendorSpecific) && ctxt->only_vendor_specific_insn)
@@ -4512,7 +4512,8 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ctxt->mem_read.pos =0 ; -if (ctxt->mode ==X86EMUL_MODE_PROT64 && (ctxt->d & No64)) { +if ((ctxt->mode ==X86EMUL_MODE_PROT64 && (ctxt->d & No64)) || + (ctxt->d & Undefined)) { rc =emulate_ud (ctxt); goto done; }
Signature · 1 line
1.7.10.4
PATCH 4/4 KVM: emulator: mark 0xff 0x7d opcode as undefined.
In reply to Gleb Natapov--- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/emulate.c +1 -1
@@ -3714,7 +3714,7 @@ static const struct opcode group5[] = {I (SrcMemFAddr | ImplicitOps | Stack, em_call_far),I (SrcMem | Stack, em_grp45),I (SrcMemFAddr | ImplicitOps, em_grp45), - I(SrcMem | Stack, em_grp45), N, + I(SrcMem | Stack, em_grp45), D(Undefined), }; static const struct opcode group6[] = {
Signature · 1 line
1.7.10.4