You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
cgroups: relax ns_can_attach checks to allow attaching to grandchild cgroups
The ns_proxy cgroup allows moving processes to child cgroups only one level deep at a time. This commit relaxes this restriction and makes it possible to attach tasks directly to grandchild cgroups, e.g.: ($pid is in the root cgroup) echo $pid > /cgroup/CG1/CG2/tasks Previously this operation would fail with -EPERM and would have to be performed as two steps: echo $pid > /cgroup/CG1/tasks echo $pid > /cgroup/CG1/CG2/tasks Also, the target cgroup no longer needs to be empty to move a task there. Signed-off-by: Grzegorz Nosek <root@localdomain.pl> Acked-by: Serge Hallyn <serue@us.ibm.com> Reviewed-by: Li Zefan <lizf@cn.fujitsu.com> Cc: Paul Menage <menage@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
d20a390a0e
commit
313e924c08
+6
-5
@@ -3084,18 +3084,19 @@ int cgroup_clone(struct task_struct *tsk, struct cgroup_subsys *subsys,
|
||||
}
|
||||
|
||||
/**
|
||||
* cgroup_is_descendant - see if @cgrp is a descendant of current task's cgrp
|
||||
* cgroup_is_descendant - see if @cgrp is a descendant of @task's cgrp
|
||||
* @cgrp: the cgroup in question
|
||||
* @task: the task in question
|
||||
*
|
||||
* See if @cgrp is a descendant of the current task's cgroup in
|
||||
* the appropriate hierarchy.
|
||||
* See if @cgrp is a descendant of @task's cgroup in the appropriate
|
||||
* hierarchy.
|
||||
*
|
||||
* If we are sending in dummytop, then presumably we are creating
|
||||
* the top cgroup in the subsystem.
|
||||
*
|
||||
* Called only by the ns (nsproxy) cgroup.
|
||||
*/
|
||||
int cgroup_is_descendant(const struct cgroup *cgrp)
|
||||
int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task)
|
||||
{
|
||||
int ret;
|
||||
struct cgroup *target;
|
||||
@@ -3105,7 +3106,7 @@ int cgroup_is_descendant(const struct cgroup *cgrp)
|
||||
return 1;
|
||||
|
||||
get_first_subsys(cgrp, NULL, &subsys_id);
|
||||
target = task_cgroup(current, subsys_id);
|
||||
target = task_cgroup(task, subsys_id);
|
||||
while (cgrp != target && cgrp!= cgrp->top_cgroup)
|
||||
cgrp = cgrp->parent;
|
||||
ret = (cgrp == target);
|
||||
|
||||
Reference in New Issue
Block a user