aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoffer Dall <christoffer.dall@linaro.org>2016-09-26 21:51:47 -0400
committerChristoffer Dall <christoffer.dall@linaro.org>2016-09-27 12:57:07 -0400
commit6fe407f2d18a4f94216263f91cb7d1f08fa5887c (patch)
tree7dbeb6562c31a5a2ec73bae880966bdbd115c1c0
parent3d9cd95f90b2987ef95182a4340a9150e06c4253 (diff)
KVM: arm64: Require in-kernel irqchip for PMU support
If userspace creates a PMU for the VCPU, but doesn't create an in-kernel irqchip, then we end up in a nasty path where we try to take an uninitialized spinlock, which can lead to all sorts of breakages. Luckily, QEMU always creates the VGIC before the PMU, so we can establish this as ABI and check for the VGIC in the PMU init stage. This can be relaxed at a later time if we want to support PMU with a userspace irqchip. Cc: stable@vger.kernel.org Cc: Shannon Zhao <shannon.zhao@linaro.org> Acked-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
-rw-r--r--Documentation/virtual/kvm/devices/vcpu.txt4
-rw-r--r--virt/kvm/arm/pmu.c8
2 files changed, 11 insertions, 1 deletions
diff --git a/Documentation/virtual/kvm/devices/vcpu.txt b/Documentation/virtual/kvm/devices/vcpu.txt
index c04165868faf..02f50686c418 100644
--- a/Documentation/virtual/kvm/devices/vcpu.txt
+++ b/Documentation/virtual/kvm/devices/vcpu.txt
@@ -30,4 +30,6 @@ Returns: -ENODEV: PMUv3 not supported
30 attribute 30 attribute
31 -EBUSY: PMUv3 already initialized 31 -EBUSY: PMUv3 already initialized
32 32
33Request the initialization of the PMUv3. 33Request the initialization of the PMUv3. This must be done after creating the
34in-kernel irqchip. Creating a PMU with a userspace irqchip is currently not
35supported.
diff --git a/virt/kvm/arm/pmu.c b/virt/kvm/arm/pmu.c
index a027569facfa..6e9c40eea208 100644
--- a/virt/kvm/arm/pmu.c
+++ b/virt/kvm/arm/pmu.c
@@ -423,6 +423,14 @@ static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu)
423 if (!kvm_arm_support_pmu_v3()) 423 if (!kvm_arm_support_pmu_v3())
424 return -ENODEV; 424 return -ENODEV;
425 425
426 /*
427 * We currently require an in-kernel VGIC to use the PMU emulation,
428 * because we do not support forwarding PMU overflow interrupts to
429 * userspace yet.
430 */
431 if (!irqchip_in_kernel(vcpu->kvm) || !vgic_initialized(vcpu->kvm))
432 return -ENODEV;
433
426 if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features) || 434 if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features) ||
427 !kvm_arm_pmu_irq_initialized(vcpu)) 435 !kvm_arm_pmu_irq_initialized(vcpu))
428 return -ENXIO; 436 return -ENXIO;