Skip to content

Commit 30c60dd

Browse files
ouptonMarc Zyngier
authored and
Marc Zyngier
committed
KVM: arm64: Use raw_smp_processor_id() in kvm_pmu_probe_armpmu()
Sebastian reports that commit 1c913a1 ("KVM: arm64: Iterate arm_pmus list to probe for default PMU") introduced the following splat with CONFIG_DEBUG_PREEMPT enabled: [70506.110187] BUG: using smp_processor_id() in preemptible [00000000] code: qemu-system-aar/3078242 [70506.119077] caller is debug_smp_processor_id+0x20/0x30 [70506.124229] CPU: 129 PID: 3078242 Comm: qemu-system-aar Tainted: G W 6.4.0-rc5 #25 [70506.133176] Hardware name: GIGABYTE R181-T92-00/MT91-FS4-00, BIOS F34 08/13/2020 [70506.140559] Call trace: [70506.142993] dump_backtrace+0xa4/0x130 [70506.146737] show_stack+0x20/0x38 [70506.150040] dump_stack_lvl+0x48/0x60 [70506.153704] dump_stack+0x18/0x28 [70506.157007] check_preemption_disabled+0xe4/0x108 [70506.161701] debug_smp_processor_id+0x20/0x30 [70506.166046] kvm_arm_pmu_v3_set_attr+0x460/0x628 [70506.170662] kvm_arm_vcpu_arch_set_attr+0x88/0xd8 [70506.175363] kvm_arch_vcpu_ioctl+0x258/0x4a8 [70506.179632] kvm_vcpu_ioctl+0x32c/0x6b8 [70506.183465] __arm64_sys_ioctl+0xb4/0x100 [70506.187467] invoke_syscall+0x78/0x108 [70506.191205] el0_svc_common.constprop.0+0x4c/0x100 [70506.195984] do_el0_svc+0x34/0x50 [70506.199287] el0_svc+0x34/0x108 [70506.202416] el0t_64_sync_handler+0xf4/0x120 [70506.206674] el0t_64_sync+0x194/0x198 Fix the issue by using the raw variant that bypasses the debug assertion. While at it, stick all of the nuance and UAPI baggage into a comment for posterity. Fixes: 1c913a1 ("KVM: arm64: Iterate arm_pmus list to probe for default PMU") Reported-by: Sebastian Ott <[email protected]> Signed-off-by: Oliver Upton <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1caa71a commit 30c60dd

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

arch/arm64/kvm/pmu-emul.c

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,25 @@ static struct arm_pmu *kvm_pmu_probe_armpmu(void)
700700

701701
mutex_lock(&arm_pmus_lock);
702702

703-
cpu = smp_processor_id();
703+
/*
704+
* It is safe to use a stale cpu to iterate the list of PMUs so long as
705+
* the same value is used for the entirety of the loop. Given this, and
706+
* the fact that no percpu data is used for the lookup there is no need
707+
* to disable preemption.
708+
*
709+
* It is still necessary to get a valid cpu, though, to probe for the
710+
* default PMU instance as userspace is not required to specify a PMU
711+
* type. In order to uphold the preexisting behavior KVM selects the
712+
* PMU instance for the core where the first call to the
713+
* KVM_ARM_VCPU_PMU_V3_CTRL attribute group occurs. A dependent use case
714+
* would be a user with disdain of all things big.LITTLE that affines
715+
* the VMM to a particular cluster of cores.
716+
*
717+
* In any case, userspace should just do the sane thing and use the UAPI
718+
* to select a PMU type directly. But, be wary of the baggage being
719+
* carried here.
720+
*/
721+
cpu = raw_smp_processor_id();
704722
list_for_each_entry(entry, &arm_pmus, entry) {
705723
tmp = entry->arm_pmu;
706724

0 commit comments

Comments
 (0)