Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

KVM: SVM: fix interrupt injection (apic->isr_count always 0)

In commit b4eef9b36db4, we started to use hwapic_isr_update() != NULL
instead of kvm_apic_vid_enabled(vcpu->kvm). This didn't work because
SVM had it defined and "apicv" path in apic_{set,clear}_isr() does not
change apic->isr_count, because it should always be 1. The initial
value of apic->isr_count was based on kvm_apic_vid_enabled(vcpu->kvm),
which is always 0 for SVM, so KVM could have injected interrupts when it
shouldn't.

Fix it by implicitly setting SVM's hwapic_isr_update to NULL and make the
initial isr_count depend on hwapic_isr_update() for good measure.

Fixes: b4eef9b36db4 ("kvm: x86: vmx: NULL out hwapic_isr_update() in case of !enable_apicv")
Reported-and-tested-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

authored by

Radim Krčmář and committed by
Marcelo Tosatti
f563db4b 4ff6f8e6

+2 -8
+2 -2
arch/x86/kvm/lapic.c
··· 1572 1572 apic_set_reg(apic, APIC_TMR + 0x10 * i, 0); 1573 1573 } 1574 1574 apic->irr_pending = kvm_apic_vid_enabled(vcpu->kvm); 1575 - apic->isr_count = kvm_apic_vid_enabled(vcpu->kvm); 1575 + apic->isr_count = kvm_x86_ops->hwapic_isr_update ? 1 : 0; 1576 1576 apic->highest_isr_cache = -1; 1577 1577 update_divide_count(apic); 1578 1578 atomic_set(&apic->lapic_timer.pending, 0); ··· 1782 1782 update_divide_count(apic); 1783 1783 start_apic_timer(apic); 1784 1784 apic->irr_pending = true; 1785 - apic->isr_count = kvm_apic_vid_enabled(vcpu->kvm) ? 1785 + apic->isr_count = kvm_x86_ops->hwapic_isr_update ? 1786 1786 1 : count_vectors(apic->regs + APIC_ISR); 1787 1787 apic->highest_isr_cache = -1; 1788 1788 if (kvm_x86_ops->hwapic_irr_update)
-6
arch/x86/kvm/svm.c
··· 3649 3649 return; 3650 3650 } 3651 3651 3652 - static void svm_hwapic_isr_update(struct kvm *kvm, int isr) 3653 - { 3654 - return; 3655 - } 3656 - 3657 3652 static void svm_sync_pir_to_irr(struct kvm_vcpu *vcpu) 3658 3653 { 3659 3654 return; ··· 4398 4403 .set_virtual_x2apic_mode = svm_set_virtual_x2apic_mode, 4399 4404 .vm_has_apicv = svm_vm_has_apicv, 4400 4405 .load_eoi_exitmap = svm_load_eoi_exitmap, 4401 - .hwapic_isr_update = svm_hwapic_isr_update, 4402 4406 .sync_pir_to_irr = svm_sync_pir_to_irr, 4403 4407 4404 4408 .set_tss_addr = svm_set_tss_addr,