summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorZefan Li <lizefan@huawei.com>2015-02-13 11:19:49 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 13:59:42 +0100
commitfbbca5e8cc61da1665212b97745b9898eeab8045 (patch)
treeaf6beb51609ebd09155f82698911eb29159c126f /kernel
parent0dab26655a339605c62387405d83ad02a4f25a1f (diff)
downloadlwn-fbbca5e8cc61da1665212b97745b9898eeab8045.tar.gz
lwn-fbbca5e8cc61da1665212b97745b9898eeab8045.zip
cpuset: initialize effective masks when clone_children is enabled
commit 790317e1b266c776765a4bdcedefea706ff0fada upstream. If clone_children is enabled, effective masks won't be initialized due to the bug: # mount -t cgroup -o cpuset xxx /mnt # echo 1 > cgroup.clone_children # mkdir /mnt/tmp # cat /mnt/tmp/ # cat cpuset.effective_cpus # cat cpuset.cpus 0-15 And then this cpuset won't constrain the tasks in it. Either the bug or the fix has no effect on unified hierarchy, as there's no clone_chidren flag there any more. Reported-by: Christian Brauner <christianvanbrauner@gmail.com> Reported-by: Serge Hallyn <serge.hallyn@ubuntu.com> Signed-off-by: Zefan Li <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Tested-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cpuset.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 64b257f6bca2..7e9d71130015 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1992,7 +1992,9 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
spin_lock_irq(&callback_lock);
cs->mems_allowed = parent->mems_allowed;
+ cs->effective_mems = parent->mems_allowed;
cpumask_copy(cs->cpus_allowed, parent->cpus_allowed);
+ cpumask_copy(cs->effective_cpus, parent->cpus_allowed);
spin_unlock_irq(&callback_lock);
out_unlock:
mutex_unlock(&cpuset_mutex);