Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 135a06c3 authored by Chao Gao's avatar Chao Gao Committed by Paolo Bonzini
Browse files

KVM: nVMX: Don't halt vcpu when L1 is injecting events to L2 



Although L2 is in halt state, it will be in the active state after
VM entry if the VM entry is vectoring according to SDM 26.6.2 Activity
State. Halting the vcpu here means the event won't be injected to L2
and this decision isn't reported to L1. Thus L0 drops an event that
should be injected to L2.

Cc: Liran Alon <liran.alon@oracle.com>
Reviewed-by: default avatarLiran Alon <liran.alon@oracle.com>
Signed-off-by: default avatarChao Gao <chao.gao@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b28676bb

arch/x86/kvm/vmx.c

+6 −1
Original line number Diff line number Diff line
@@ -11197,7 +11197,12 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) 
	if (ret)

		return ret;



	if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT)

	/*

	 * If we're entering a halted L2 vcpu and the L2 vcpu won't be woken

	 * by event injection, halt vcpu.

	 */

	if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) &&

	    !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK))

		return kvm_vcpu_halt(vcpu);



	vmx->nested.nested_run_pending = 1;