Commit d471045e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7a8bdc7f 39b5ef79
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1116,9 +1116,11 @@ void cpuset_update_tasks_cpumask(struct cpuset *cs, struct cpumask *new_cpus)

		if (top_cs) {
			/*
			 * Percpu kthreads in top_cpuset are ignored
			 * PF_NO_SETAFFINITY tasks are ignored.
			 * All per cpu kthreads should have PF_NO_SETAFFINITY
			 * flag set, see kthread_set_per_cpu().
			 */
			if (kthread_is_per_cpu(task))
			if (task->flags & PF_NO_SETAFFINITY)
				continue;
			cpumask_andnot(new_cpus, possible_mask, subpartitions_cpus);
		} else {