Skip to content

Commit 42dc938

Browse files
Vincent DonnefortPeter Zijlstra
authored andcommitted
sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
Nothing protects the access to the per_cpu variable sd_llc_id. When testing the same CPU (i.e. this_cpu == that_cpu), a race condition exists with update_top_cache_domain(). One scenario being: CPU1 CPU2 ================================================================== per_cpu(sd_llc_id, CPUX) => 0 partition_sched_domains_locked() detach_destroy_domains() cpus_share_cache(CPUX, CPUX) update_top_cache_domain(CPUX) per_cpu(sd_llc_id, CPUX) => 0 per_cpu(sd_llc_id, CPUX) = CPUX per_cpu(sd_llc_id, CPUX) => CPUX return false ttwu_queue_cond() wouldn't catch smp_processor_id() == cpu and the result is a warning triggered from ttwu_queue_wakelist(). Avoid a such race in cpus_share_cache() by always returning true when this_cpu == that_cpu. Fixes: 518cd62 ("sched: Only queue remote wakeups when crossing cache boundaries") Reported-by: Jing-Ting Wu <[email protected]> Signed-off-by: Vincent Donnefort <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Valentin Schneider <[email protected]> Reviewed-by: Vincent Guittot <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ce2612b commit 42dc938

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

kernel/sched/core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3726,6 +3726,9 @@ void wake_up_if_idle(int cpu)
37263726

37273727
bool cpus_share_cache(int this_cpu, int that_cpu)
37283728
{
3729+
if (this_cpu == that_cpu)
3730+
return true;
3731+
37293732
return per_cpu(sd_llc_id, this_cpu) == per_cpu(sd_llc_id, that_cpu);
37303733
}
37313734

0 commit comments

Comments
 (0)