leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KVM: x86: Move #UD injection for failed emulation into emulation code

Browse Source 
Immediately inject a #UD and return EMULATE done if emulation fails when
handling an intercepted #UD.  This helps pave the way for removing
EMULATE_FAIL altogether.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2019-08-27 14:40:33 -07:00 committed by Paolo Bonzini
parent b400060620
commit c83fad65e2
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kvm/x86.c
View File

@ -5440,7 +5440,6 @@ EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);
int handle_ud(struct kvm_vcpu *vcpu) int handle_ud(struct kvm_vcpu *vcpu)
{ {
int emul_type = EMULTYPE_TRAP_UD; int emul_type = EMULTYPE_TRAP_UD;
enum emulation_result er;
char sig[5]; /* ud2; .ascii "kvm" */ char sig[5]; /* ud2; .ascii "kvm" */
struct x86_exception e; struct x86_exception e;
@ -5452,12 +5451,7 @@ int handle_ud(struct kvm_vcpu *vcpu)
emul_type = EMULTYPE_TRAP_UD_FORCED; emul_type = EMULTYPE_TRAP_UD_FORCED;
} }
er = kvm_emulate_instruction(vcpu, emul_type); return kvm_emulate_instruction(vcpu, emul_type) != EMULATE_USER_EXIT;
if (er == EMULATE_USER_EXIT)
return 0;
if (er != EMULATE_DONE)
kvm_queue_exception(vcpu, UD_VECTOR);
return 1;
} }
EXPORT_SYMBOL_GPL(handle_ud); EXPORT_SYMBOL_GPL(handle_ud);
@ -6630,8 +6624,10 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
++vcpu->stat.insn_emulation; ++vcpu->stat.insn_emulation;
if (r != EMULATION_OK) { if (r != EMULATION_OK) {
if ((emulation_type & EMULTYPE_TRAP_UD) || if ((emulation_type & EMULTYPE_TRAP_UD) ||
(emulation_type & EMULTYPE_TRAP_UD_FORCED)) (emulation_type & EMULTYPE_TRAP_UD_FORCED)) {
return EMULATE_FAIL; kvm_queue_exception(vcpu, UD_VECTOR);
return EMULATE_DONE;
}
if (reexecute_instruction(vcpu, cr2, write_fault_to_spt, if (reexecute_instruction(vcpu, cr2, write_fault_to_spt,
emulation_type)) emulation_type))
return EMULATE_DONE; return EMULATE_DONE;