Commit a86743eb authored Aug 19, 2020 by Wanpeng Li Committed by Greg Kroah-Hartman Sep 17, 2020

KVM: VMX: Don't freeze guest when event delivery causes an APIC-access exit



commit 99b82a1437cb31340dbb2c437a2923b9814a7b15 upstream.

According to SDM 27.2.4, Event delivery causes an APIC-access VM exit.
Don't report internal error and freeze guest when event delivery causes
an APIC-access exit, it is handleable and the event will be re-injected
during the next vmentry.

Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Message-Id: <1597827327-25055-2-git-send-email-wanpengli@tencent.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 087b6cb1

arch/x86/kvm/vmx/vmx.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5895,6 +5895,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
	(exit_reason != EXIT_REASON_EXCEPTION_NMI &&		(exit_reason != EXIT_REASON_EXCEPTION_NMI &&
	exit_reason != EXIT_REASON_EPT_VIOLATION &&		exit_reason != EXIT_REASON_EPT_VIOLATION &&
	exit_reason != EXIT_REASON_PML_FULL &&		exit_reason != EXIT_REASON_PML_FULL &&
			exit_reason != EXIT_REASON_APIC_ACCESS &&
	exit_reason != EXIT_REASON_TASK_SWITCH)) {		exit_reason != EXIT_REASON_TASK_SWITCH)) {
	vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;		vcpu->run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
	vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;		vcpu->run->internal.suberror = KVM_INTERNAL_ERROR_DELIVERY_EV;