Re: [PATCH v2] KVM: SVM: fix interrupt injection (apic->isr_count always 0)

From: Marcelo Tosatti
Date: Mon Mar 02 2015 - 17:15:58 EST


On Fri, Feb 27, 2015 at 04:32:38PM +0100, Radim KrÄmÃÅ wrote:
> 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@xxxxxxx>
> Signed-off-by: Radim KrÄmÃÅ <rkrcmar@xxxxxxxxxx>
> ---
> v2: set hwapic_isr_update to NULL implicitly [Paolo]
>
> arch/x86/kvm/lapic.c | 4 ++--
> arch/x86/kvm/svm.c | 6 ------
> 2 files changed, 2 insertions(+), 8 deletions(-)

Applied, thanks.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/