Skip to content

Commit b2868b5

Browse files
committed
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: Sean Christopherson <seanjc@google.com>
1 parent 4f09ebd commit b2868b5

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

arch/x86/kvm/vmx/nested.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3481,14 +3481,6 @@ static int nested_vmx_check_permission(struct kvm_vcpu *vcpu)
34813481
return 1;
34823482
}
34833483

3484-
static u8 vmx_has_apicv_interrupt(struct kvm_vcpu *vcpu)
3485-
{
3486-
u8 rvi = vmx_get_rvi();
3487-
u8 vppr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_PROCPRI);
3488-
3489-
return ((rvi & 0xf0) > (vppr & 0xf0));
3490-
}
3491-
34923484
static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
34933485
struct vmcs12 *vmcs12);
34943486

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

35303522
evaluate_pending_interrupts = exec_controls_get(vmx) &
35313523
(CPU_BASED_INTR_WINDOW_EXITING | CPU_BASED_NMI_WINDOW_EXITING);
3532-
if (likely(!evaluate_pending_interrupts) && kvm_vcpu_apicv_active(vcpu))
3533-
evaluate_pending_interrupts |= vmx_has_apicv_interrupt(vcpu);
35343524

35353525
if (!vmx->nested.nested_run_pending ||
35363526
!(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS))

0 commit comments

Comments
 (0)