Commit f27ad73a authored Apr 27, 2020 by Sean Christopherson Committed by Paolo Bonzini May 13, 2020

KVM: VMX: Use accessor to read vmcs.INTR_INFO when handling exception

Use vmx_get_intr_info() when grabbing the cached vmcs.INTR_INFO in
handle_exception_nmi() to ensure the cache isn't stale. Bypassing the
caching accessor doesn't cause any known issues as the cache is always
refreshed by handle_exception_nmi_irqoff(), but the whole point of
adding the proper caching mechanism was to avoid such dependencies.

Fixes: 87915858 ("KVM: VMX: Cache vmcs.EXIT_INTR_INFO using arch avail_reg flags")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200427171837.22613-1-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent fede8076

arch/x86/kvm/vmx/vmx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4705,7 +4705,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)
		u32 vect_info;

		vect_info = vmx->idt_vectoring_info;
		intr_info = vmx->exit_intr_info;
		intr_info = vmx_get_intr_info(vcpu);

		if (is_machine_check(intr_info) \|\| is_nmi(intr_info))
		return 1; /* handled by handle_exception_nmi_irqoff() */

Admin message