diff options
| author | Zefan Li <lizefan@huawei.com> | 2016-08-09 11:25:01 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-11-20 01:17:08 +0000 |
| commit | c4b341a9ef8ef88c696d3e2d18012fbfa901b773 (patch) | |
| tree | 0736331806f63d094b1ee03c7fde69c8f8ef9f68 /kernel | |
| parent | 3b58c5a174e23c5a580121e328ee25c25d42b5a8 (diff) | |
cpuset: make sure new tasks conform to the current config of the cpuset
commit 06f4e94898918bcad00cdd4d349313a439d6911e upstream.
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>
[bwh: Backported to 3.16: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
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 524a8eef2965..533494236c12 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c @@ -1963,6 +1963,20 @@ static void cpuset_css_free(struct cgroup_subsys_state *css) kfree(cs); } +/* + * 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, @@ -1971,6 +1985,7 @@ struct cgroup_subsys cpuset_cgrp_subsys = { .can_attach = cpuset_can_attach, .cancel_attach = cpuset_cancel_attach, .attach = cpuset_attach, + .fork = cpuset_fork, .base_cftypes = files, .early_init = 1, }; |