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] 2 participants 4 messages May 23, 2017 – Jun 12, 2017 Stable branch

lore

Share & tools

lore

[email protected]

author maintainer Applied

2017-05-23 14:50 UTC #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")

Signed-off-by Marc Zyngier <[email protected]>

Reviewed-by Christoffer Dall <[email protected]>

Signed-off-by Christoffer Dall <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 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_is_pending(irq))
+			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-do-not-use-stack-protector-to-compile-el2-code.patch queue-4.9/arm-kvm-do-not-use-stack-protector-to-compile-hyp-code.patch queue-4.9/kvm-arm-arm64-vgic-v3-do-not-use-active-pending-state-for-a-hw-interrupt.patch queue-4.9/kvm-arm-arm64-vgic-v2-do-not-use-active-pending-state-for-a-hw-interrupt.patch

Greg KH

author maintainer

2017-05-24 07:08 UTC #1 lore raw

Quoted 44 lines · On Tue, May 23, 2017 at 04:48:28PM +0200, [email protected] 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 <[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")
Signed-off-by Marc Zyngier <[email protected]>
Reviewed-by Christoffer Dall <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 virt/kvm/arm/vgic/vgic-v3.c |    7 +++++++
 1 file changed, 7 insertions(+)

virt/kvm/arm/vgic/vgic-v3.c void vgic_v3_populate_lr(struct kvm_vcpu · line 159

Quoted 9 lines

virt/kvm/arm/vgic/vgic-v3.c +6 -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_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.

thanks,

greg k-h

Marc Zyngier

Reviewed-by Christoffer Dall

2017-05-24 07:55 UTC #2 lore raw

Quoted 42 lines · Greg KH

Quoted 41 lines · On Tue, May 23, 2017 at 04:48:28PM +0200, [email protected] 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 <[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")
Signed-off-by Marc Zyngier <[email protected]>
Reviewed-by Christoffer Dall <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 virt/kvm/arm/vgic/vgic-v3.c |    7 +++++++
 1 file changed, 7 insertions(+)

Quoted 16 lines

virt/kvm/arm/vgic/vgic-v3.c void vgic_v3_populate_lr(struct kvm_vcpu · line 159
Quoted 12 lines
virt/kvm/arm/vgic/vgic-v3.c +6 -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_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:

Quoted 1 line

From b50e5df239df83ca4698f96bec6111f20a7634ed Mon Sep 17 00:00:00 2001

From: Marc Zyngier <[email protected]>
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.

Cc [email protected]

Fixes 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend")

Signed-off-by Marc Zyngier <[email protected]>

Reviewed-by Christoffer Dall <[email protected]>

Signed-off-by Christoffer Dall <[email protected]>

---
 virt/kvm/arm/vgic/vgic-v3.c | 7 +++++++
 1 file changed, 7 insertions(+)

virt/kvm/arm/vgic/vgic-v3.c +7 -0

index e6b03fd8c374..f1320063db28 100644
@@ -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;

Signature · 7 lines

2.11.0

Thanks,

	M.
-- 
Jazz is not dead. It just smells funny...

Greg KH

author maintainer

2017-06-12 08:20 UTC #3 lore raw

Quoted 60 lines · Marc Zyngier

Quoted 42 lines · Greg KH
Quoted 41 lines · On Tue, May 23, 2017 at 04:48:28PM +0200, [email protected] 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 <[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")
Signed-off-by Marc Zyngier <[email protected]>
Reviewed-by Christoffer Dall <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 virt/kvm/arm/vgic/vgic-v3.c |    7 +++++++
 1 file changed, 7 insertions(+)
Quoted 16 lines
virt/kvm/arm/vgic/vgic-v3.c void vgic_v3_populate_lr(struct kvm_vcpu · line 159
Quoted 12 lines
virt/kvm/arm/vgic/vgic-v3.c +6 -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_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.

Quoted 1 line

Here's the amended patch:

Thanks, now applied.

greg k-h