]> git.karo-electronics.de Git - karo-tx-linux.git/commit
KVM: SVM: fix interrupt injection (apic->isr_count always 0)
authorRadim Krčmář <rkrcmar@redhat.com>
Fri, 27 Feb 2015 15:32:38 +0000 (16:32 +0100)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 2 Mar 2015 22:04:40 +0000 (19:04 -0300)
commitf563db4bdb8ef5ea73d0f5ea2b20384c10fbd617
tree1536e267fe320ec62c2b6b788a88c8c831a37f3f
parent4ff6f8e61eb7f96d3ca535c6d240f863ccd6fb7d
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>
arch/x86/kvm/lapic.c
arch/x86/kvm/svm.c