Skip to content

Commit cc0600d

Browse files
vittyvkgregkh
authored andcommitted
x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested
[ Upstream commit d391f12 ] I was investigating an issue with seabios >= 1.10 which stopped working for nested KVM on Hyper-V. The problem appears to be in handle_ept_violation() function: when we do fast mmio we need to skip the instruction so we do kvm_skip_emulated_instruction(). This, however, depends on VM_EXIT_INSTRUCTION_LEN field being set correctly in VMCS. However, this is not the case. Intel's manual doesn't mandate VM_EXIT_INSTRUCTION_LEN to be set when EPT MISCONFIG occurs. While on real hardware it was observed to be set, some hypervisors follow the spec and don't set it; we end up advancing IP with some random value. I checked with Microsoft and they confirmed they don't fill VM_EXIT_INSTRUCTION_LEN on EPT MISCONFIG. Fix the issue by doing instruction skip through emulator when running nested. Fixes: 68c3b4d Suggested-by: Radim Krčmář <[email protected]> Suggested-by: Paolo Bonzini <[email protected]> Signed-off-by: Vitaly Kuznetsov <[email protected]> Acked-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Radim Krčmář <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d757c3a commit cc0600d

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

arch/x86/kvm/vmx.c

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6765,7 +6765,21 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)
67656765
if (!is_guest_mode(vcpu) &&
67666766
!kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) {
67676767
trace_kvm_fast_mmio(gpa);
6768-
return kvm_skip_emulated_instruction(vcpu);
6768+
/*
6769+
* Doing kvm_skip_emulated_instruction() depends on undefined
6770+
* behavior: Intel's manual doesn't mandate
6771+
* VM_EXIT_INSTRUCTION_LEN to be set in VMCS when EPT MISCONFIG
6772+
* occurs and while on real hardware it was observed to be set,
6773+
* other hypervisors (namely Hyper-V) don't set it, we end up
6774+
* advancing IP with some random value. Disable fast mmio when
6775+
* running nested and keep it for real hardware in hope that
6776+
* VM_EXIT_INSTRUCTION_LEN will always be set correctly.
6777+
*/
6778+
if (!static_cpu_has(X86_FEATURE_HYPERVISOR))
6779+
return kvm_skip_emulated_instruction(vcpu);
6780+
else
6781+
return x86_emulate_instruction(vcpu, gpa, EMULTYPE_SKIP,
6782+
NULL, 0) == EMULATE_DONE;
67696783
}
67706784

67716785
ret = kvm_mmu_page_fault(vcpu, gpa, PFERR_RSVD_MASK, NULL, 0);

arch/x86/kvm/x86.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5699,7 +5699,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
56995699
* handle watchpoints yet, those would be handled in
57005700
* the emulate_ops.
57015701
*/
5702-
if (kvm_vcpu_check_breakpoint(vcpu, &r))
5702+
if (!(emulation_type & EMULTYPE_SKIP) &&
5703+
kvm_vcpu_check_breakpoint(vcpu, &r))
57035704
return r;
57045705

57055706
ctxt->interruptibility = 0;

0 commit comments

Comments
 (0)