]> git.baikalelectronics.ru Git - kernel.git/commitdiff
KVM: nVMX: Consult only the "basic" exit reason when routing nested exit
authorSean Christopherson <sean.j.christopherson@intel.com>
Thu, 27 Feb 2020 17:44:30 +0000 (09:44 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 11 Jun 2020 15:28:11 +0000 (11:28 -0400)
Consult only the basic exit reason, i.e. bits 15:0 of vmcs.EXIT_REASON,
when determining whether a nested VM-Exit should be reflected into L1 or
handled by KVM in L0.

For better or worse, the switch statement in nested_vmx_exit_reflected()
currently defaults to "true", i.e. reflects any nested VM-Exit without
dedicated logic.  Because the case statements only contain the basic
exit reason, any VM-Exit with modifier bits set will be reflected to L1,
even if KVM intended to handle it in L0.

Practically speaking, this only affects EXIT_REASON_MCE_DURING_VMENTRY,
i.e. a #MC that occurs on nested VM-Enter would be incorrectly routed to
L1, as "failed VM-Entry" is the only modifier that KVM can currently
encounter.  The SMM modifiers will never be generated as KVM doesn't
support/employ a SMI Transfer Monitor.  Ditto for "exit from enclave",
as KVM doesn't yet support virtualizing SGX, i.e. it's impossible to
enter an enclave in a KVM guest (L1 or L2).

Fixes: e002b955ff6f ("KVM: nVMX: Deciding if L0 or L1 should handle an L2 exit")
Cc: Jim Mattson <jmattson@google.com>
Cc: Xiaoyao Li <xiaoyao.li@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200227174430.26371-1-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/vmx/nested.c

index e44f33c82332505b057ae016cf0d5a5c0cba23d0..c80ffd94086c255a1068370a75814c17f73e8804 100644 (file)
@@ -5577,7 +5577,7 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason)
                                vmcs_read32(VM_EXIT_INTR_ERROR_CODE),
                                KVM_ISA_VMX);
 
-       switch (exit_reason) {
+       switch ((u16)exit_reason) {
        case EXIT_REASON_EXCEPTION_NMI:
                if (is_nmi(intr_info))
                        return false;