Skip to content

Commit d471045

Browse files
committed
Merge tag 'cgroup-for-6.15-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "One low-risk patch to fix a cpuset bug where it over-eagerly tries to modify CPU affinity of kernel threads" * tag 'cgroup-for-6.15-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup/cpuset: Extend kthread_is_per_cpu() check to all PF_NO_SETAFFINITY tasks
2 parents 7a8bdc7 + 39b5ef7 commit d471045

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/cgroup/cpuset.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,11 @@ void cpuset_update_tasks_cpumask(struct cpuset *cs, struct cpumask *new_cpus)
11161116

11171117
if (top_cs) {
11181118
/*
1119-
* Percpu kthreads in top_cpuset are ignored
1119+
* PF_NO_SETAFFINITY tasks are ignored.
1120+
* All per cpu kthreads should have PF_NO_SETAFFINITY
1121+
* flag set, see kthread_set_per_cpu().
11201122
*/
1121-
if (kthread_is_per_cpu(task))
1123+
if (task->flags & PF_NO_SETAFFINITY)
11221124
continue;
11231125
cpumask_andnot(new_cpus, possible_mask, subpartitions_cpus);
11241126
} else {

0 commit comments

Comments
 (0)