Commit b2868b55 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: nVMX: Drop manual vmcs01.GUEST_INTERRUPT_STATUS.RVI check at VM-Enter 

Drop the manual check for a pending IRQ in vmcs01's RVI field during
nested VM-Enter, as the recently added call to kvm_apic_has_interrupt()
when checking for pending events after successful VM-Enter is a superset
of the RVI check (IRQs that are pending in RVI are also pending in L1's
IRR).

Link: https://lore.kernel.org/r/20241101191447.1807602-4-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 4f09ebd0

arch/x86/kvm/vmx/nested.c

+0 −10
Original line number Diff line number Diff line
@@ -3481,14 +3481,6 @@ static int nested_vmx_check_permission(struct kvm_vcpu *vcpu) 
	return 1;

}



static u8 vmx_has_apicv_interrupt(struct kvm_vcpu *vcpu)

{

	u8 rvi = vmx_get_rvi();

	u8 vppr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_PROCPRI);



	return ((rvi & 0xf0) > (vppr & 0xf0));

}



static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,

				   struct vmcs12 *vmcs12);
@@ -3529,8 +3521,6 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, 


	evaluate_pending_interrupts = exec_controls_get(vmx) &

		(CPU_BASED_INTR_WINDOW_EXITING | CPU_BASED_NMI_WINDOW_EXITING);

	if (likely(!evaluate_pending_interrupts) && kvm_vcpu_apicv_active(vcpu))

		evaluate_pending_interrupts |= vmx_has_apicv_interrupt(vcpu);



	if (!vmx->nested.nested_run_pending ||

	    !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS))