aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/cgroup.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2013-08-08 20:11:23 -0400
committerTejun Heo <tj@kernel.org>2013-08-08 20:11:23 -0400
commiteb95419b023abacb415e2a18fea899023ce7624d (patch)
tree705284469b67cbe440b86c6cb81e1cf27648eba9 /include/linux/cgroup.h
parent6387698699afd72d6304566fb6ccf84bffe07c56 (diff)
cgroup: pass around cgroup_subsys_state instead of cgroup in subsystem methods
cgroup is currently in the process of transitioning to using struct cgroup_subsys_state * as the primary handle instead of struct cgroup * in subsystem implementations for the following reasons. * With unified hierarchy, subsystems will be dynamically bound and unbound from cgroups and thus css's (cgroup_subsys_state) may be created and destroyed dynamically over the lifetime of a cgroup, which is different from the current state where all css's are allocated and destroyed together with the associated cgroup. This in turn means that cgroup_css() should be synchronized and may return NULL, making it more cumbersome to use. * Differing levels of per-subsystem granularity in the unified hierarchy means that the task and descendant iterators should behave differently depending on the specific subsystem the iteration is being performed for. * In majority of the cases, subsystems only care about its part in the cgroup hierarchy - ie. the hierarchy of css's. Subsystem methods often obtain the matching css pointer from the cgroup and don't bother with the cgroup pointer itself. Passing around css fits much better. This patch converts all cgroup_subsys methods to take @css instead of @cgroup. The conversions are mostly straight-forward. A few noteworthy changes are * ->css_alloc() now takes css of the parent cgroup rather than the pointer to the new cgroup as the css for the new cgroup doesn't exist yet. Knowing the parent css is enough for all the existing subsystems. * In kernel/cgroup.c::offline_css(), unnecessary open coded css dereference is replaced with local variable access. This patch shouldn't cause any behavior differences. v2: Unnecessary explicit cgrp->subsys[] deref in css_online() replaced with local variable @css as suggested by Li Zefan. Rebased on top of new for-3.12 which includes for-3.11-fixes so that ->css_free() invocation added by da0a12caff ("cgroup: fix a leak when percpu_ref_init() fails") is converted too. Suggested by Li Zefan. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Li Zefan <lizefan@huawei.com> Acked-by: Michal Hocko <mhocko@suse.cz> Acked-by: Vivek Goyal <vgoyal@redhat.com> Acked-by: Aristeu Rozanski <aris@redhat.com> Acked-by: Daniel Wagner <daniel.wagner@bmw-carit.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Balbir Singh <bsingharora@gmail.com> Cc: Matt Helsley <matthltc@us.ibm.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/linux/cgroup.h')
-rw-r--r--include/linux/cgroup.h24
1 files changed, 14 insertions, 10 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 18112a3bb12b..9c2b9dd9121d 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -579,18 +579,22 @@ int cgroup_taskset_size(struct cgroup_taskset *tset);
579 */ 579 */
580 580
581struct cgroup_subsys { 581struct cgroup_subsys {
582 struct cgroup_subsys_state *(*css_alloc)(struct cgroup *cgrp); 582 struct cgroup_subsys_state *(*css_alloc)(struct cgroup_subsys_state *parent_css);
583 int (*css_online)(struct cgroup *cgrp); 583 int (*css_online)(struct cgroup_subsys_state *css);
584 void (*css_offline)(struct cgroup *cgrp); 584 void (*css_offline)(struct cgroup_subsys_state *css);
585 void (*css_free)(struct cgroup *cgrp); 585 void (*css_free)(struct cgroup_subsys_state *css);
586 586
587 int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset); 587 int (*can_attach)(struct cgroup_subsys_state *css,
588 void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset); 588 struct cgroup_taskset *tset);
589 void (*attach)(struct cgroup *cgrp, struct cgroup_taskset *tset); 589 void (*cancel_attach)(struct cgroup_subsys_state *css,
590 struct cgroup_taskset *tset);
591 void (*attach)(struct cgroup_subsys_state *css,
592 struct cgroup_taskset *tset);
590 void (*fork)(struct task_struct *task); 593 void (*fork)(struct task_struct *task);
591 void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp, 594 void (*exit)(struct cgroup_subsys_state *css,
595 struct cgroup_subsys_state *old_css,
592 struct task_struct *task); 596 struct task_struct *task);
593 void (*bind)(struct cgroup *root); 597 void (*bind)(struct cgroup_subsys_state *root_css);
594 598
595 int subsys_id; 599 int subsys_id;
596 int disabled; 600 int disabled;