Skip to content

Commit

Permalink
sched: Relax the set_cpus_allowed_ptr() semantics
Browse files Browse the repository at this point in the history
Now that we have KTHREAD_IS_PER_CPU to denote the critical per-cpu
tasks to retain during CPU offline, we can relax the warning in
set_cpus_allowed_ptr(). Any spurious kthread that wants to get on at
the last minute will get pushed off before it can run.

While during CPU online there is no harm, and actual benefit, to
allowing kthreads back on early, it simplifies hotplug code and fixes
a number of outstanding races.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Lai jiangshan <jiangshanlai@gmail.com>
Reviewed-by: Valentin Schneider <valentin.schneider@arm.com>
Tested-by: Valentin Schneider <valentin.schneider@arm.com>
Link: https://lkml.kernel.org/r/20210121103507.240724591@infradead.org
  • Loading branch information
Peter Zijlstra committed Jan 22, 2021
1 parent 5ba2ffb commit 741ba80
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2342,7 +2342,9 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,

if (p->flags & PF_KTHREAD || is_migration_disabled(p)) {
/*
* Kernel threads are allowed on online && !active CPUs.
* Kernel threads are allowed on online && !active CPUs,
* however, during cpu-hot-unplug, even these might get pushed
* away if not KTHREAD_IS_PER_CPU.
*
* Specifically, migration_disabled() tasks must not fail the
* cpumask_any_and_distribute() pick below, esp. so on
Expand Down Expand Up @@ -2386,16 +2388,6 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,

__do_set_cpus_allowed(p, new_mask, flags);

if (p->flags & PF_KTHREAD) {
/*
* For kernel threads that do indeed end up on online &&
* !active we want to ensure they are strict per-CPU threads.
*/
WARN_ON(cpumask_intersects(new_mask, cpu_online_mask) &&
!cpumask_intersects(new_mask, cpu_active_mask) &&
p->nr_cpus_allowed != 1);
}

return affine_move_task(rq, p, &rf, dest_cpu, flags);

out:
Expand Down Expand Up @@ -7518,6 +7510,13 @@ int sched_cpu_deactivate(unsigned int cpu)
int ret;

set_cpu_active(cpu, false);

/*
* From this point forward, this CPU will refuse to run any task that
* is not: migrate_disable() or KTHREAD_IS_PER_CPU, and will actively
* push those tasks away until this gets cleared, see
* sched_cpu_dying().
*/
balance_push_set(cpu, true);

/*
Expand Down

0 comments on commit 741ba80

Please sign in to comment.