From: Joao Martins <[email protected]> Declare various causes of emulation and use them as appropriate.
Signed-off-by: Joao Martins <[email protected]> Signed-off-by: David Edmondson <[email protected]> --- arch/x86/include/asm/kvm_host.h | 6 ++++++ arch/x86/kvm/mmu/mmu.c | 4 ++-- arch/x86/kvm/x86.c | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 556dc51e322a..79e9ca756742 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1529,6 +1529,12 @@ extern u64 kvm_mce_cap_supported; enum { EMULREASON_UNKNOWN = 0, + EMULREASON_SKIP, + EMULREASON_GP, + EMULREASON_IO, + EMULREASON_IO_COMPLETE, + EMULREASON_UD, + EMULREASON_PF, }; int kvm_emulate_instruction(struct kvm_vcpu *vcpu, int emulation_type, diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 515ff790b7c5..14ddf1a5ac12 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5056,8 +5056,8 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 error_code, if (!mmio_info_in_cache(vcpu, cr2_or_gpa, direct) && !is_guest_mode(vcpu)) emulation_type |= EMULTYPE_ALLOW_RETRY_PF; emulate: - return x86_emulate_instruction(vcpu, cr2_or_gpa, emulation_type, 0, - insn, insn_len); + return x86_emulate_instruction(vcpu, cr2_or_gpa, emulation_type, + EMULREASON_PF, insn, insn_len); } EXPORT_SYMBOL_GPL(kvm_mmu_page_fault); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 88519bf6bd00..41020eba8e21 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -6197,7 +6197,7 @@ int handle_ud(struct kvm_vcpu *vcpu) emul_type = EMULTYPE_TRAP_UD_FORCED; } - return kvm_emulate_instruction(vcpu, emul_type, 0); + return kvm_emulate_instruction(vcpu, emul_type, EMULREASON_UD); } EXPORT_SYMBOL_GPL(handle_ud); @@ -9343,7 +9343,8 @@ static inline int complete_emulated_io(struct kvm_vcpu *vcpu) int r; vcpu->srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); - r = kvm_emulate_instruction(vcpu, EMULTYPE_NO_DECODE, 0); + r = kvm_emulate_instruction(vcpu, EMULTYPE_NO_DECODE, + EMULREASON_IO_COMPLETE); srcu_read_unlock(&vcpu->kvm->srcu, vcpu->srcu_idx); return r; } -- 2.30.2
