diff options
| author | Marc Zyngier <maz@kernel.org> | 2019-08-28 11:10:16 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-28 11:21:42 +0100 |
| commit | 82e40f558de566fdee214bec68096bbd5e64a6a4 (patch) | |
| tree | af1de026d68fd0011ed5a476649ea827fe8d3c76 /virt/kvm/arm/vgic/vgic-v3.c | |
| parent | d4a8061a7c5f7c27a2dc002ee4cb89b3e6637e44 (diff) | |
| download | linux-stable-82e40f558de566fdee214bec68096bbd5e64a6a4.tar.gz linux-stable-82e40f558de566fdee214bec68096bbd5e64a6a4.tar.bz2 linux-stable-82e40f558de566fdee214bec68096bbd5e64a6a4.zip | |
KVM: arm/arm64: vgic-v2: Handle SGI bits in GICD_I{S,C}PENDR0 as WI
A guest is not allowed to inject a SGI (or clear its pending state)
by writing to GICD_ISPENDR0 (resp. GICD_ICPENDR0), as these bits are
defined as WI (as per ARM IHI 0048B 4.3.7 and 4.3.8).
Make sure we correctly emulate the architecture.
Fixes: 96b298000db4 ("KVM: arm/arm64: vgic-new: Add PENDING registers handlers")
Cc: stable@vger.kernel.org # 4.7+
Reported-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v3.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-v3.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v3.c b/virt/kvm/arm/vgic/vgic-v3.c index c2c9ce009f63..f7a4219f4617 100644 --- a/virt/kvm/arm/vgic/vgic-v3.c +++ b/virt/kvm/arm/vgic/vgic-v3.c @@ -167,7 +167,10 @@ void vgic_v3_populate_lr(struct kvm_vcpu *vcpu, struct vgic_irq *irq, int lr) model == KVM_DEV_TYPE_ARM_VGIC_V2) { u32 src = ffs(irq->source); - BUG_ON(!src); + if (WARN_RATELIMIT(!src, "No SGI source for INTID %d\n", + irq->intid)) + return; + val |= (src - 1) << GICH_LR_PHYSID_CPUID_SHIFT; irq->source &= ~(1 << (src - 1)); if (irq->source) { |