Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87fe0cd8 authored by Zefan Li's avatar Zefan Li Committed by Sasha Levin
Browse files

cpuset: make sure new tasks conform to the current config of the cpuset 



[ Upstream commit 06f4e94898918bcad00cdd4d349313a439d6911e ]

A new task inherits cpus_allowed and mems_allowed masks from its parent,
but if someone changes cpuset's config by writing to cpuset.cpus/cpuset.mems
before this new task is inserted into the cgroup's task list, the new task
won't be updated accordingly.

Signed-off-by: default avatarZefan Li <lizefan@huawei.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 5edbe377

kernel/cpuset.c

+15 −0
Original line number Diff line number Diff line
@@ -2045,6 +2045,20 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css) 
	mutex_unlock(&cpuset_mutex);

}



/*

 * Make sure the new task conform to the current state of its parent,

 * which could have been changed by cpuset just after it inherits the

 * state from the parent and before it sits on the cgroup's task list.

 */

void cpuset_fork(struct task_struct *task)

{

	if (task_css_is_root(task, cpuset_cgrp_id))

		return;



	set_cpus_allowed_ptr(task, &current->cpus_allowed);

	task->mems_allowed = current->mems_allowed;

}



struct cgroup_subsys cpuset_cgrp_subsys = {

	.css_alloc	= cpuset_css_alloc,

	.css_online	= cpuset_css_online,
@@ -2054,6 +2068,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = { 
	.cancel_attach	= cpuset_cancel_attach,

	.attach		= cpuset_attach,

	.bind		= cpuset_bind,

	.fork		= cpuset_fork,

	.legacy_cftypes	= files,

	.early_init	= 1,

};