[PULL take #2] KVM/ARM fixes for v4.4-rc6

[PULL take #2] KVM/ARM fixes for v4.4-rc6

[Marc Zyngier]

Hi Paolo,

We have a one line fix for the VGIC this time around, fixing a patch
that went in -rc2. Oh well. Hopefully this is the last one for v4.4.
And yes, the right patch is following the pull-request this time...

Please pull!

Thanks,

	M.

The following changes since commit 0de58f852875a0f0dcfb120bb8433e4e73c7803b:

  ARM/arm64: KVM: correct PTE uncachedness check (2015-12-04 16:30:17 +0000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvm-arm-for-v4.4-rc6

for you to fetch changes up to fdec12c12ed4333afb49c9948c29fbd5fb52da97:

  KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check (2015-12-11 16:33:31 +0000)

----------------------------------------------------------------
KVM/ARM fixes for v4.4-rc6

- Fix for the active interrupt detection code, affecting
  the timer interrupt injection.

----------------------------------------------------------------
Christoffer Dall (1):
      KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check

 virt/kvm/arm/vgic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH] KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check

[Marc Zyngier]

From: Christoffer Dall <christoffer.dall@linaro.org>

External inputs to the vgic from time to time need to poke into the
state of a virtual interrupt, the prime example is the architected timer
code.

Since the IRQ's active state can be represented in two places; the LR or
the distributor, we first loop over the LRs but if not active in the LRs
we just return if *any* IRQ is active on the VCPU in question.

This is of course bogus, as we should check if the specific IRQ in
quesiton is active on the distributor instead.

Reported-by: Eric Auger <eric.auger@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
 virt/kvm/arm/vgic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 65461f8..7a2f449 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map)
 			return true;
 	}
 
-	return dist_active_irq(vcpu);
+	return vgic_irq_is_active(vcpu, map->virt_irq);
 }
 
 /*
-- 
2.1.4

[PULL take #2] KVM/ARM fixes for v4.4-rc6

[Paolo Bonzini]

On 18/12/2015 15:05, Marc Zyngier wrote:
> Hi Paolo,
> 
> We have a one line fix for the VGIC this time around, fixing a patch
> that went in -rc2. Oh well. Hopefully this is the last one for v4.4.
> And yes, the right patch is following the pull-request this time...
> 
> Please pull!

Pulled, thanks.

Paolo

> Thanks,
> 
> 	M.
> 
> The following changes since commit 0de58f852875a0f0dcfb120bb8433e4e73c7803b:
> 
>   ARM/arm64: KVM: correct PTE uncachedness check (2015-12-04 16:30:17 +0000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvm-arm-for-v4.4-rc6
> 
> for you to fetch changes up to fdec12c12ed4333afb49c9948c29fbd5fb52da97:
> 
>   KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check (2015-12-11 16:33:31 +0000)
> 
> ----------------------------------------------------------------
> KVM/ARM fixes for v4.4-rc6
> 
> - Fix for the active interrupt detection code, affecting
>   the timer interrupt injection.
> 
> ----------------------------------------------------------------
> Christoffer Dall (1):
>       KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check
> 
>  virt/kvm/arm/vgic.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>