| author | Shanker Donthineni <shankerd@codeaurora.org> | 2017-02-03 02:30:03 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-12 05:41:48 (GMT) |
| commit | d408d23addbaa9af9e0db492f774d3245ecfeefd (patch) | |
| tree | 56edca2a74ba4bf2811c20114e8b438d7ab9b79c | |
| parent | 7127d43e1843400658e42c0b21dc598a59d603e4 (diff) | |
| download | common-d408d23addbaa9af9e0db492f774d3245ecfeefd.zip common-d408d23addbaa9af9e0db492f774d3245ecfeefd.tar.gz common-d408d23addbaa9af9e0db492f774d3245ecfeefd.tar.bz2 | |
KVM: arm/arm64: vgic: Stop injecting the MSI occurrence twice
commit 0bdbf3b071986ba80731203683cf623d5c0cacb1 upstream.
The IRQFD framework calls the architecture dependent function
twice if the corresponding GSI type is edge triggered. For ARM,
the function kvm_set_msi() is getting called twice whenever the
IRQFD receives the event signal. The rest of the code path is
trying to inject the MSI without any validation checks. No need
to call the function vgic_its_inject_msi() second time to avoid
an unnecessary overhead in IRQ queue logic. It also avoids the
possibility of VM seeing the MSI twice.
Simple fix, return -1 if the argument 'level' value is zero.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Shanker Donthineni <shankerd@codeaurora.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-irqfd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/virt/kvm/arm/vgic/vgic-irqfd.c b/virt/kvm/arm/vgic/vgic-irqfd.c index d918dcf..f138ed2 100644 --- a/virt/kvm/arm/vgic/vgic-irqfd.c +++ b/virt/kvm/arm/vgic/vgic-irqfd.c @@ -99,6 +99,9 @@ int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, if (!vgic_has_its(kvm)) return -ENODEV; + if (!level) + return -1; + return vgic_its_inject_msi(kvm, &msi); } |