diff options
| author | Zefan Li <lizefan@huawei.com> | 2016-08-09 11:25:01 +0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-09-12 09:30:26 -0400 |
| commit | 24628b51d97ff55e9a39ed87ea631af29604112f (patch) | |
| tree | af3b780d410644580306fc4b4c6157b7842e16ab /kernel | |
| parent | 214b2dab8107b130deeabec6db8d18439a64e738 (diff) | |
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: Zefan Li <lizefan@huawei.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index f0acff0f66c9..388fc6f78c6f 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -2042,6 +2042,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, ¤t->cpus_allowed); + task->mems_allowed = current->mems_allowed; +} + struct cgroup_subsys cpuset_cgrp_subsys = { .css_alloc = cpuset_css_alloc, .css_online = cpuset_css_online, @@ -2051,6 +2065,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, }; |