Skip to content

Commit 0ac824f

Browse files
committed
Merge branch 'for-5.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fix from Tejun Heo: "Waiman's fix for a cgroup2 cpuset bug where it could miss nodes which were hot-added" * 'for-5.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup/cpuset: Remove cpus_allowed/mems_allowed setup in cpuset_init_smp()
2 parents c37dba6 + 2685027 commit 0ac824f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

kernel/cgroup/cpuset.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3390,8 +3390,11 @@ static struct notifier_block cpuset_track_online_nodes_nb = {
33903390
*/
33913391
void __init cpuset_init_smp(void)
33923392
{
3393-
cpumask_copy(top_cpuset.cpus_allowed, cpu_active_mask);
3394-
top_cpuset.mems_allowed = node_states[N_MEMORY];
3393+
/*
3394+
* cpus_allowd/mems_allowed set to v2 values in the initial
3395+
* cpuset_bind() call will be reset to v1 values in another
3396+
* cpuset_bind() call when v1 cpuset is mounted.
3397+
*/
33953398
top_cpuset.old_mems_allowed = top_cpuset.mems_allowed;
33963399

33973400
cpumask_copy(top_cpuset.effective_cpus, cpu_active_mask);

0 commit comments

Comments
 (0)