iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sched: Optimize migration_cpu_stop()

Browse Source 
When the purpose of migration_cpu_stop() is to migrate the task to
'any' valid CPU, don't migrate the task when it's already running on a
valid CPU.

Fixes: 6d337eab041d ("sched: Fix migrate_disable() vs set_cpus_allowed_ptr()")
Cc: stable@kernel.org
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20210224131355.569238629@infradead.org
This commit is contained in:
Peter Zijlstra 2021-02-24 11:21:35 +01:00 committed by Ingo Molnar
parent 58b1a45086
commit 3f1bc119cd
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/sched/core.c
View File

@ -1936,14 +1936,25 @@ static int migration_cpu_stop(void *data)
complete = true; complete = true;
} }
if (dest_cpu < 0) if (dest_cpu < 0) {
if (cpumask_test_cpu(task_cpu(p), &p->cpus_mask))
goto out;
dest_cpu = cpumask_any_distribute(&p->cpus_mask); dest_cpu = cpumask_any_distribute(&p->cpus_mask);
}
if (task_on_rq_queued(p)) if (task_on_rq_queued(p))
rq = __migrate_task(rq, &rf, p, dest_cpu); rq = __migrate_task(rq, &rf, p, dest_cpu);
else else
p->wake_cpu = dest_cpu; p->wake_cpu = dest_cpu;
/*
* XXX __migrate_task() can fail, at which point we might end
* up running on a dodgy CPU, AFAICT this can only happen
* during CPU hotplug, at which point we'll get pushed out
* anyway, so it's probably not a big deal.
*/
} else if (pending) { } else if (pending) {
/* /*
* This happens when we get migrated between migrate_enable()'s * This happens when we get migrated between migrate_enable()'s