Skip to content

Commit e271314

Browse files
nathanlynchgregkh
authored andcommitted
powerpc/paravirt: correct preempt debug splat in vcpu_is_preempted()
[ Upstream commit fda0eb2 ] vcpu_is_preempted() can be used outside of preempt-disabled critical sections, yielding warnings such as: BUG: using smp_processor_id() in preemptible [00000000] code: systemd-udevd/185 caller is rwsem_spin_on_owner+0x1cc/0x2d0 CPU: 1 PID: 185 Comm: systemd-udevd Not tainted 5.15.0-rc2+ #33 Call Trace: [c000000012907ac0] [c000000000aa30a8] dump_stack_lvl+0xac/0x108 (unreliable) [c000000012907b00] [c000000001371f70] check_preemption_disabled+0x150/0x160 [c000000012907b90] [c0000000001e0e8c] rwsem_spin_on_owner+0x1cc/0x2d0 [c000000012907be0] [c0000000001e1408] rwsem_down_write_slowpath+0x478/0x9a0 [c000000012907ca0] [c000000000576cf4] filename_create+0x94/0x1e0 [c000000012907d10] [c00000000057ac08] do_symlinkat+0x68/0x1a0 [c000000012907d70] [c00000000057ae18] sys_symlink+0x58/0x70 [c000000012907da0] [c00000000002e448] system_call_exception+0x198/0x3c0 [c000000012907e10] [c00000000000c54c] system_call_common+0xec/0x250 The result of vcpu_is_preempted() is always used speculatively, and the function does not access per-cpu resources in a (Linux) preempt-unsafe way. Use raw_smp_processor_id() to avoid such warnings, adding explanatory comments. Fixes: ca3f969 ("powerpc/paravirt: Use is_kvm_guest() in vcpu_is_preempted()") Signed-off-by: Nathan Lynch <[email protected]> Reviewed-by: Srikar Dronamraju <[email protected]> Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sasha Levin <[email protected]>
1 parent ddd95eb commit e271314

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

arch/powerpc/include/asm/paravirt.h

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,23 @@ static inline bool vcpu_is_preempted(int cpu)
9797

9898
#ifdef CONFIG_PPC_SPLPAR
9999
if (!is_kvm_guest()) {
100-
int first_cpu = cpu_first_thread_sibling(smp_processor_id());
100+
int first_cpu;
101+
102+
/*
103+
* The result of vcpu_is_preempted() is used in a
104+
* speculative way, and is always subject to invalidation
105+
* by events internal and external to Linux. While we can
106+
* be called in preemptable context (in the Linux sense),
107+
* we're not accessing per-cpu resources in a way that can
108+
* race destructively with Linux scheduler preemption and
109+
* migration, and callers can tolerate the potential for
110+
* error introduced by sampling the CPU index without
111+
* pinning the task to it. So it is permissible to use
112+
* raw_smp_processor_id() here to defeat the preempt debug
113+
* warnings that can arise from using smp_processor_id()
114+
* in arbitrary contexts.
115+
*/
116+
first_cpu = cpu_first_thread_sibling(raw_smp_processor_id());
101117

102118
/*
103119
* Preemption can only happen at core granularity. This CPU

0 commit comments

Comments
 (0)