diff options
author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2018-01-25 10:37:07 -0500 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2018-01-31 12:25:34 -0500 |
commit | d391f1207067268261add0485f0f34503539c5b0 (patch) | |
tree | b6fbb28c52ff362013c2ca10763369febb2db1e9 | |
parent | e46b469278a59781f9b25ff608af84892963821b (diff) |
x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested
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: 68c3b4d1676d870f0453c31d5a52e7e65c7448ae
Suggested-by: Radim Krčmář <rkrcmar@redhat.com>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
-rw-r--r-- | arch/x86/kvm/vmx.c | 16 | ||||
-rw-r--r-- | arch/x86/kvm/x86.c | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 1e2ca9e8662f..438802d0b01d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c | |||
@@ -6577,7 +6577,21 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) | |||
6577 | if (!is_guest_mode(vcpu) && | 6577 | if (!is_guest_mode(vcpu) && |
6578 | !kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) { | 6578 | !kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) { |
6579 | trace_kvm_fast_mmio(gpa); | 6579 | trace_kvm_fast_mmio(gpa); |
6580 | return kvm_skip_emulated_instruction(vcpu); | 6580 | /* |
6581 | * Doing kvm_skip_emulated_instruction() depends on undefined | ||
6582 | * behavior: Intel's manual doesn't mandate | ||
6583 | * VM_EXIT_INSTRUCTION_LEN to be set in VMCS when EPT MISCONFIG | ||
6584 | * occurs and while on real hardware it was observed to be set, | ||
6585 | * other hypervisors (namely Hyper-V) don't set it, we end up | ||
6586 | * advancing IP with some random value. Disable fast mmio when | ||
6587 | * running nested and keep it for real hardware in hope that | ||
6588 | * VM_EXIT_INSTRUCTION_LEN will always be set correctly. | ||
6589 | */ | ||
6590 | if (!static_cpu_has(X86_FEATURE_HYPERVISOR)) | ||
6591 | return kvm_skip_emulated_instruction(vcpu); | ||
6592 | else | ||
6593 | return x86_emulate_instruction(vcpu, gpa, EMULTYPE_SKIP, | ||
6594 | NULL, 0) == EMULATE_DONE; | ||
6581 | } | 6595 | } |
6582 | 6596 | ||
6583 | ret = kvm_mmu_page_fault(vcpu, gpa, PFERR_RSVD_MASK, NULL, 0); | 6597 | ret = kvm_mmu_page_fault(vcpu, gpa, PFERR_RSVD_MASK, NULL, 0); |
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0204b2b8a293..01571102b50c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -5773,7 +5773,8 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, | |||
5773 | * handle watchpoints yet, those would be handled in | 5773 | * handle watchpoints yet, those would be handled in |
5774 | * the emulate_ops. | 5774 | * the emulate_ops. |
5775 | */ | 5775 | */ |
5776 | if (kvm_vcpu_check_breakpoint(vcpu, &r)) | 5776 | if (!(emulation_type & EMULTYPE_SKIP) && |
5777 | kvm_vcpu_check_breakpoint(vcpu, &r)) | ||
5777 | return r; | 5778 | return r; |
5778 | 5779 | ||
5779 | ctxt->interruptibility = 0; | 5780 | ctxt->interruptibility = 0; |