Skip to contentSkip to conversation

Patch "KVM: arm/arm64: vgic: Don't notify EOI for non-SPIs" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Dec 4, 2016 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

KVM: arm/arm64: vgic: Don't notify EOI for non-SPIs

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
kvm-arm-arm64-vgic-don-t-notify-eoi-for-non-spis.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 8ca18eec2b2276b449c1dc86b98bf083c5fe4e09 Mon Sep 17 00:00:00 2001

From: Marc Zyngier <[email protected]>
Date: Wed, 23 Nov 2016 10:11:21 +0000
Subject: KVM: arm/arm64: vgic: Don't notify EOI for non-SPIs

From: Marc Zyngier <[email protected]>

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")
---
 virt/kvm/arm/vgic/vgic-v2.c |    6 ++++--
 virt/kvm/arm/vgic/vgic-v3.c |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
virt/kvm/arm/vgic/vgic-v2.c +4 -2
@@ -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);
 		}
 	}
 
virt/kvm/arm/vgic/vgic-v3.c +4 -2
@@ -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);
 		}
 
 		/*

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/kvm-arm-arm64-vgic-don-t-notify-eoi-for-non-spis.patch