Skip to contentSkip to conversation

Patch "KVM: arm/arm64: vgic-v3: Do not use Active+Pending state for a HW interrupt" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jun 12, 2017 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-v3: Do not use Active+Pending state for a HW interrupt

to the 4.9-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-v3-do-not-use-active-pending-state-for-a-hw-interrupt.patch
and it can be found in the queue-4.9 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 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001

From: Marc Zyngier <[email protected]>
Date: Tue, 2 May 2017 14:30:40 +0100
Subject: KVM: arm/arm64: vgic-v3: Do not use Active+Pending state for a HW interrupt

From: Marc Zyngier <[email protected]>

commit 3d6e77ad1489650afa20da92bb589c8778baa8da upstream.

When an interrupt is injected with the HW bit set (indicating that deactivation should be propagated to the physical distributor), special care must be taken so that we never mark the corresponding LR with the Active+Pending state (as the pending state is kept in the physycal distributor).

Fixes 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend")
---
 virt/kvm/arm/vgic/vgic-v3.c |    7 +++++++
 1 file changed, 7 insertions(+)
virt/kvm/arm/vgic/vgic-v3.c +7 -0
@@ -151,6 +151,13 @@ void vgic_v3_populate_lr(struct kvm_vcpu
 	if (irq->hw) {
 		val |= ICH_LR_HW;
 		val |= ((u64)irq->hwintid) << ICH_LR_PHYS_ID_SHIFT;
+		/*
+		 * Never set pending+active on a HW interrupt, as the
+		 * pending state is kept at the physical distributor
+		 * level.
+		 */
+		if (irq->active && irq->pending)
+			val &= ~ICH_LR_PENDING_BIT;
 	} else {
 		if (irq->config == VGIC_CONFIG_LEVEL)
 			val |= ICH_LR_EOI;

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

queue-4.9/arm64-kvm-allow-unaligned-accesses-at-el2.patch queue-4.9/arm-kvm-allow-unaligned-accesses-at-hyp.patch queue-4.9/kvm-arm-arm64-vgic-v3-do-not-use-active-pending-state-for-a-hw-interrupt.patch queue-4.9/arm64-kvm-preserve-res1-bits-in-sctlr_el2.patch queue-4.9/kvm-arm-arm64-vgic-v2-do-not-use-active-pending-state-for-a-hw-interrupt.patch