On 24/05/17 08:08, Greg KH wrote: > On Tue, May 23, 2017 at 04:48:28PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: >> >> 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 <stable@xxxxxxxxxxxxxxx> know about it. >> >> >> >From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001 >> From: Marc Zyngier <marc.zyngier@xxxxxxx> >> 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 <marc.zyngier@xxxxxxx> >> >> 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") >> Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> >> Reviewed-by: Christoffer Dall <cdall@xxxxxxxxxx> >> Signed-off-by: Christoffer Dall <cdall@xxxxxxxxxx> >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> >> >> --- >> virt/kvm/arm/vgic/vgic-v3.c | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> --- a/virt/kvm/arm/vgic/vgic-v3.c >> +++ b/virt/kvm/arm/vgic/vgic-v3.c >> @@ -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_is_pending(irq)) > > irq_is_pending() isn't in 4.9, so can someone please send me a proper > backported patch? I've dropped this from the tree now as it causes a > build breakage. Here's the amended patch: >From b50e5df239df83ca4698f96bec6111f20a7634ed Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@xxxxxxx> Date: Tue, 2 May 2017 14:30:40 +0100 Subject: [PATCH 1/2] KVM: arm/arm64: vgic-v3: Do not use Active+Pending state for a HW interrupt 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). Cc: stable@xxxxxxxxxxxxxxx Fixes: 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend") Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> Reviewed-by: Christoffer Dall <cdall@xxxxxxxxxx> Signed-off-by: Christoffer Dall <cdall@xxxxxxxxxx> --- virt/kvm/arm/vgic/vgic-v3.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index e6b03fd8c374..f1320063db28 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -151,6 +151,13 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr) 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; -- 2.11.0 Thanks, M. -- Jazz is not dead. It just smells funny...