Commit a709c46f authored by Sean Christopherson's avatar Sean Christopherson Committed by Greg Kroah-Hartman

KVM: VMX: Do not allow reexecute_instruction() when skipping MMIO instr

commit c4409905 upstream.

Re-execution after an emulation decode failure is only intended to
handle a case where two or vCPUs race to write a shadowed page, i.e.
we should never re-execute an instruction as part of MMIO emulation.
As handle_ept_misconfig() is only used for MMIO emulation, it should
pass EMULTYPE_NO_REEXECUTE when using the emulator to skip an instr
in the fast-MMIO case where VM_EXIT_INSTRUCTION_LEN is invalid.

And because the cr2 value passed to x86_emulate_instruction() is only
destined for use when retrying or reexecuting, we can simply call

Fixes: d391f120 ("x86/kvm/vmx: do not use vm-exit instruction length
                      for fast MMIO when running nested")
Cc: Vitaly Kuznetsov <>
Signed-off-by: default avatarSean Christopherson <>
Signed-off-by: default avatarRadim Krčmář <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent d5fca531
......@@ -6965,8 +6965,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)
if (!static_cpu_has(X86_FEATURE_HYPERVISOR))
return kvm_skip_emulated_instruction(vcpu);
return x86_emulate_instruction(vcpu, gpa, EMULTYPE_SKIP,
return emulate_instruction(vcpu, EMULTYPE_SKIP) ==
ret = kvm_mmu_page_fault(vcpu, gpa, PFERR_RSVD_MASK, NULL, 0);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment