[PATCH 4.8 19/35] KVM: arm/arm64: vgic: Dont notify EOI for non-SPIs

[Greg Kroah-Hartman]

4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Marc Zyngier 

commit 8ca18eec2b2276b449c1dc86b98bf083c5fe4e09 upstream.

When we inject a level triggerered interrupt (and unless it
is backed by the physical distributor - timer style), we request
a maintenance interrupt. Part of the processing for that interrupt
is to feed to the rest of KVM (and to the eventfd subsystem) the
information that the interrupt has been EOIed.

But that notification only makes sense for SPIs, and not PPIs
(such as the PMU interrupt). Skip over the notification if
the interrupt is not an SPI.

Fixes: 140b086dd197 ("KVM: arm/arm64: vgic-new: Add GICv2 world switch backend")
Fixes: 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend")
Reported-by: Catalin Marinas 
Tested-by: Catalin Marinas 
Acked-by: Christoffer Dall 
Signed-off-by: Marc Zyngier 
Signed-off-by: Greg Kroah-Hartman 

---
 virt/kvm/arm/vgic/vgic-v2.c |6 --
 virt/kvm/arm/vgic/vgic-v3.c |6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -50,8 +50,10 @@ void vgic_v2_process_maintenance(struct
 
WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);
 
-   kvm_notify_acked_irq(vcpu->kvm, 0,
-intid - VGIC_NR_PRIVATE_IRQS);
+   /* Only SPIs require notification */
+   if (vgic_valid_spi(vcpu->kvm, intid))
+   kvm_notify_acked_irq(vcpu->kvm, 0,
+intid - 
VGIC_NR_PRIVATE_IRQS);
}
}
 
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -41,8 +41,10 @@ void vgic_v3_process_maintenance(struct
 
WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);
 
-   kvm_notify_acked_irq(vcpu->kvm, 0,
-intid - VGIC_NR_PRIVATE_IRQS);
+   /* Only SPIs require notification */
+   if (vgic_valid_spi(vcpu->kvm, intid))
+   kvm_notify_acked_irq(vcpu->kvm, 0,
+intid - 
VGIC_NR_PRIVATE_IRQS);
}
 
/*

[PATCH 4.8 19/35] KVM: arm/arm64: vgic: Dont notify EOI for non-SPIs

[Greg Kroah-Hartman]

4.8-stable review patch.  If anyone has any objections, please let me know.

--

From: Marc Zyngier 

commit 8ca18eec2b2276b449c1dc86b98bf083c5fe4e09 upstream.

When we inject a level triggerered interrupt (and unless it
is backed by the physical distributor - timer style), we request
a maintenance interrupt. Part of the processing for that interrupt
is to feed to the rest of KVM (and to the eventfd subsystem) the
information that the interrupt has been EOIed.

But that notification only makes sense for SPIs, and not PPIs
(such as the PMU interrupt). Skip over the notification if
the interrupt is not an SPI.

Fixes: 140b086dd197 ("KVM: arm/arm64: vgic-new: Add GICv2 world switch backend")
Fixes: 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend")
Reported-by: Catalin Marinas 
Tested-by: Catalin Marinas 
Acked-by: Christoffer Dall 
Signed-off-by: Marc Zyngier 
Signed-off-by: Greg Kroah-Hartman 

---
 virt/kvm/arm/vgic/vgic-v2.c |6 --
 virt/kvm/arm/vgic/vgic-v3.c |6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
@@ -50,8 +50,10 @@ void vgic_v2_process_maintenance(struct
 
WARN_ON(cpuif->vgic_lr[lr] & GICH_LR_STATE);
 
-   kvm_notify_acked_irq(vcpu->kvm, 0,
-intid - VGIC_NR_PRIVATE_IRQS);
+   /* Only SPIs require notification */
+   if (vgic_valid_spi(vcpu->kvm, intid))
+   kvm_notify_acked_irq(vcpu->kvm, 0,
+intid - 
VGIC_NR_PRIVATE_IRQS);
}
}
 
--- a/virt/kvm/arm/vgic/vgic-v3.c
+++ b/virt/kvm/arm/vgic/vgic-v3.c
@@ -41,8 +41,10 @@ void vgic_v3_process_maintenance(struct
 
WARN_ON(cpuif->vgic_lr[lr] & ICH_LR_STATE);
 
-   kvm_notify_acked_irq(vcpu->kvm, 0,
-intid - VGIC_NR_PRIVATE_IRQS);
+   /* Only SPIs require notification */
+   if (vgic_valid_spi(vcpu->kvm, intid))
+   kvm_notify_acked_irq(vcpu->kvm, 0,
+intid - 
VGIC_NR_PRIVATE_IRQS);
}
 
/*