* 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
@ 2017-05-23 14:48 gregkh
2017-05-24 7:08 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: gregkh @ 2017-05-23 14:48 UTC (permalink / raw)
To: marc.zyngier, cdall, gregkh; +Cc: stable, stable-commits
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@vger.kernel.org> know about it.
>From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
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@arm.com>
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@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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))
+ 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 marc.zyngier@arm.com 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 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
2017-05-23 14:48 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 gregkh
@ 2017-05-24 7:08 ` Greg KH
2017-05-24 7:54 ` Marc Zyngier
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2017-05-24 7:08 UTC (permalink / raw)
To: marc.zyngier, cdall; +Cc: stable, stable-commits
On Tue, May 23, 2017 at 04:48:28PM +0200, gregkh@linuxfoundation.org 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@vger.kernel.org> know about it.
>
>
> >From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001
> From: Marc Zyngier <marc.zyngier@arm.com>
> 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@arm.com>
>
> 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@arm.com>
> Reviewed-by: Christoffer Dall <cdall@linaro.org>
> Signed-off-by: Christoffer Dall <cdall@linaro.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> 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.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: 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
2017-05-24 7:08 ` Greg KH
@ 2017-05-24 7:54 ` Marc Zyngier
2017-06-12 8:19 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Marc Zyngier @ 2017-05-24 7:54 UTC (permalink / raw)
To: Greg KH, cdall; +Cc: stable, stable-commits
On 24/05/17 08:08, Greg KH wrote:
> On Tue, May 23, 2017 at 04:48:28PM +0200, gregkh@linuxfoundation.org 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@vger.kernel.org> know about it.
>>
>>
>> >From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001
>> From: Marc Zyngier <marc.zyngier@arm.com>
>> 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@arm.com>
>>
>> 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@arm.com>
>> Reviewed-by: Christoffer Dall <cdall@linaro.org>
>> Signed-off-by: Christoffer Dall <cdall@linaro.org>
>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>
>> ---
>> 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@arm.com>
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@vger.kernel.org
Fixes: 59529f69f504 ("KVM: arm/arm64: vgic-new: Add GICv3 world switch backend")
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
---
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...
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: 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
2017-05-24 7:54 ` Marc Zyngier
@ 2017-06-12 8:19 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2017-06-12 8:19 UTC (permalink / raw)
To: Marc Zyngier; +Cc: cdall, stable, stable-commits
On Wed, May 24, 2017 at 08:54:58AM +0100, Marc Zyngier wrote:
> On 24/05/17 08:08, Greg KH wrote:
> > On Tue, May 23, 2017 at 04:48:28PM +0200, gregkh@linuxfoundation.org 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@vger.kernel.org> know about it.
> >>
> >>
> >> >From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001
> >> From: Marc Zyngier <marc.zyngier@arm.com>
> >> 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@arm.com>
> >>
> >> 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@arm.com>
> >> Reviewed-by: Christoffer Dall <cdall@linaro.org>
> >> Signed-off-by: Christoffer Dall <cdall@linaro.org>
> >> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >>
> >> ---
> >> 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:
Thanks, now applied.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* 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
@ 2017-06-12 9:07 gregkh
0 siblings, 0 replies; 5+ messages in thread
From: gregkh @ 2017-06-12 9:07 UTC (permalink / raw)
To: marc.zyngier, cdall, gregkh; +Cc: stable, stable-commits
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@vger.kernel.org> know about it.
>From 3d6e77ad1489650afa20da92bb589c8778baa8da Mon Sep 17 00:00:00 2001
From: Marc Zyngier <marc.zyngier@arm.com>
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@arm.com>
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@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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->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 marc.zyngier@arm.com 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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-06-12 9:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-23 14:48 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 gregkh
2017-05-24 7:08 ` Greg KH
2017-05-24 7:54 ` Marc Zyngier
2017-06-12 8:19 ` Greg KH
2017-06-12 9:07 gregkh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.