From: Tejun Heo <tj@kernel.org> To: torvalds@linux-foundation.org, akpm@linux-foundation.org, a.p.zijlstra@chello.nl, mingo@redhat.com, lizefan@huawei.com, hannes@cmpxchg.org, pjt@google.com Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-api@vger.kernel.org, kernel-team@fb.com, Tejun Heo <tj@kernel.org>, Peter Zijlstra <peterz@infradead.org>, Oleg Nesterov <oleg@redhat.com> Subject: [PATCH 08/10] cgroup: implement rgroup control mask handling Date: Fri, 11 Mar 2016 10:41:26 -0500 [thread overview] Message-ID: <1457710888-31182-9-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1457710888-31182-1-git-send-email-tj@kernel.org> To support in-process resource control, the previous patch implemented the basic rgroup infrastructure which allows creating rgroups by specifying CLONE_NEWRGRP during clone(2). This patch implements control mask handling for rgroups so that controllers can be enabled on them. There can be multiple top-level rgroups per process, all nested right below the sgroup that the process belongs to. They should share the same control masks which can be different from those of top-level rgroups belonging to different processes or peer tasks. These top-level rgroup control masks are added to signal_struct and all control mask handling functions are updated accordingly. Note that a top-level rgroup should behave the same as a peer task rather than a peer sibling cgroup. As such, the set of controllers avaialble to a rgroup should be the same as the set for peer tasks. To satisfy this requirement, controller availability for a top-level rgroup is constrainted by cgroup_{control|ss_mask}(nearest_sgrp) instead of nearest_sgrp->subtree_{control|ss_mask}. After this change, csses can be created on rgroups. The css_{clear|populate}_dir() are updated to become noops for csses on rgroups. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Paul Turner <pjt@google.com> --- include/linux/sched.h | 4 ++++ kernel/cgroup.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 7886919..d3849ad 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -781,6 +781,10 @@ struct signal_struct { #ifdef CONFIG_CGROUPS struct list_head rgrps; /* top-level rgroups under this sig */ struct list_head rgrp_node; /* parent_sgrp->child_rgrp_sigs list */ + u16 rgrp_subtree_control; /* control for top-level rgroups */ + u16 rgrp_subtree_ss_mask; /* ss_mask for top-level rgroups */ + u16 rgrp_old_subtree_control; /* used during control updates */ + u16 rgrp_old_subtree_ss_mask; /* used during control updates */ #endif oom_flags_t oom_flags; diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 53f479c..283b7ed 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -413,8 +413,8 @@ static u16 cgroup_control(struct cgroup *cgrp) struct cgroup *parent = cgroup_parent(cgrp); u16 root_ss_mask = cgrp->root->subsys_mask; - if (is_rgroup(cgrp)) - return 0; + if (is_rgroup(cgrp) && !is_rgroup(parent)) + return cgrp->rgrp_sig->rgrp_subtree_control; if (parent) return parent->subtree_control; @@ -430,8 +430,8 @@ static u16 cgroup_ss_mask(struct cgroup *cgrp) { struct cgroup *parent = cgroup_parent(cgrp); - if (is_rgroup(cgrp)) - return 0; + if (is_rgroup(cgrp) && !is_rgroup(parent)) + return cgrp->rgrp_sig->rgrp_subtree_ss_mask; if (parent) return parent->subtree_ss_mask; @@ -1565,6 +1565,9 @@ static void css_clear_dir(struct cgroup_subsys_state *css) css->flags &= ~CSS_VISIBLE; + if (is_rgroup(cgrp)) + return; + list_for_each_entry(cfts, &css->ss->cfts, node) cgroup_addrm_files(css, cgrp, cfts, false); } @@ -1584,6 +1587,9 @@ static int css_populate_dir(struct cgroup_subsys_state *css) if ((css->flags & CSS_VISIBLE) || !cgrp->kn) return 0; + if (is_rgroup(cgrp)) + goto done; + if (!css->ss) { if (cgroup_on_dfl(cgrp)) cfts = cgroup_dfl_base_files; @@ -1600,9 +1606,8 @@ static int css_populate_dir(struct cgroup_subsys_state *css) goto err; } } - +done: css->flags |= CSS_VISIBLE; - return 0; err: list_for_each_entry(cfts, &css->ss->cfts, node) { @@ -3116,8 +3121,15 @@ static void cgroup_save_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_pre(dsct, d_css, cgrp) { + struct signal_struct *sig; + dsct->old_subtree_control = dsct->subtree_control; dsct->old_subtree_ss_mask = dsct->subtree_ss_mask; + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_old_subtree_control = sig->rgrp_subtree_control; + sig->rgrp_old_subtree_ss_mask = sig->rgrp_subtree_ss_mask; + } } } @@ -3135,10 +3147,19 @@ static void cgroup_propagate_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_pre(dsct, d_css, cgrp) { + struct signal_struct *sig; + dsct->subtree_control &= cgroup_control(dsct); dsct->subtree_ss_mask = cgroup_calc_subtree_ss_mask(dsct->subtree_control, cgroup_ss_mask(dsct)); + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_subtree_control &= cgroup_control(dsct); + sig->rgrp_subtree_ss_mask = + cgroup_calc_subtree_ss_mask(sig->rgrp_subtree_control, + cgroup_ss_mask(dsct)); + } } } @@ -3155,6 +3176,13 @@ static void cgroup_restore_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_post(dsct, d_css, cgrp) { + struct signal_struct *sig; + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_subtree_control = sig->rgrp_old_subtree_control; + sig->rgrp_subtree_ss_mask = sig->rgrp_old_subtree_ss_mask; + } + dsct->subtree_control = dsct->old_subtree_control; dsct->subtree_ss_mask = dsct->old_subtree_ss_mask; } @@ -5326,6 +5354,15 @@ static struct cgroup *rgroup_create(struct cgroup *parent, lockdep_assert_held(&cgroup_mutex); + if (list_empty(&sig->rgrps)) { + WARN_ON_ONCE(is_rgroup(parent)); + + sig->rgrp_subtree_control = 0; + sig->rgrp_subtree_ss_mask = + cgroup_calc_subtree_ss_mask(sig->rgrp_subtree_control, + cgroup_ss_mask(parent)); + } + rgrp = cgroup_create(parent, sig); if (IS_ERR(rgrp)) return rgrp; -- 2.5.0
WARNING: multiple messages have this Message-ID (diff)
From: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org, a.p.zijlstra-/NLkJaSkS4VmR6Xm/wNWPw@public.gmane.org, mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org, hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org, pjt-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-team-b10kYP2dOMg@public.gmane.org, Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org>, Oleg Nesterov <oleg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Subject: [PATCH 08/10] cgroup: implement rgroup control mask handling Date: Fri, 11 Mar 2016 10:41:26 -0500 [thread overview] Message-ID: <1457710888-31182-9-git-send-email-tj@kernel.org> (raw) In-Reply-To: <1457710888-31182-1-git-send-email-tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To support in-process resource control, the previous patch implemented the basic rgroup infrastructure which allows creating rgroups by specifying CLONE_NEWRGRP during clone(2). This patch implements control mask handling for rgroups so that controllers can be enabled on them. There can be multiple top-level rgroups per process, all nested right below the sgroup that the process belongs to. They should share the same control masks which can be different from those of top-level rgroups belonging to different processes or peer tasks. These top-level rgroup control masks are added to signal_struct and all control mask handling functions are updated accordingly. Note that a top-level rgroup should behave the same as a peer task rather than a peer sibling cgroup. As such, the set of controllers avaialble to a rgroup should be the same as the set for peer tasks. To satisfy this requirement, controller availability for a top-level rgroup is constrainted by cgroup_{control|ss_mask}(nearest_sgrp) instead of nearest_sgrp->subtree_{control|ss_mask}. After this change, csses can be created on rgroups. The css_{clear|populate}_dir() are updated to become noops for csses on rgroups. Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: Ingo Molnar <mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: Peter Zijlstra <peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org> Cc: Oleg Nesterov <oleg-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: Paul Turner <pjt-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> --- include/linux/sched.h | 4 ++++ kernel/cgroup.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 7886919..d3849ad 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -781,6 +781,10 @@ struct signal_struct { #ifdef CONFIG_CGROUPS struct list_head rgrps; /* top-level rgroups under this sig */ struct list_head rgrp_node; /* parent_sgrp->child_rgrp_sigs list */ + u16 rgrp_subtree_control; /* control for top-level rgroups */ + u16 rgrp_subtree_ss_mask; /* ss_mask for top-level rgroups */ + u16 rgrp_old_subtree_control; /* used during control updates */ + u16 rgrp_old_subtree_ss_mask; /* used during control updates */ #endif oom_flags_t oom_flags; diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 53f479c..283b7ed 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -413,8 +413,8 @@ static u16 cgroup_control(struct cgroup *cgrp) struct cgroup *parent = cgroup_parent(cgrp); u16 root_ss_mask = cgrp->root->subsys_mask; - if (is_rgroup(cgrp)) - return 0; + if (is_rgroup(cgrp) && !is_rgroup(parent)) + return cgrp->rgrp_sig->rgrp_subtree_control; if (parent) return parent->subtree_control; @@ -430,8 +430,8 @@ static u16 cgroup_ss_mask(struct cgroup *cgrp) { struct cgroup *parent = cgroup_parent(cgrp); - if (is_rgroup(cgrp)) - return 0; + if (is_rgroup(cgrp) && !is_rgroup(parent)) + return cgrp->rgrp_sig->rgrp_subtree_ss_mask; if (parent) return parent->subtree_ss_mask; @@ -1565,6 +1565,9 @@ static void css_clear_dir(struct cgroup_subsys_state *css) css->flags &= ~CSS_VISIBLE; + if (is_rgroup(cgrp)) + return; + list_for_each_entry(cfts, &css->ss->cfts, node) cgroup_addrm_files(css, cgrp, cfts, false); } @@ -1584,6 +1587,9 @@ static int css_populate_dir(struct cgroup_subsys_state *css) if ((css->flags & CSS_VISIBLE) || !cgrp->kn) return 0; + if (is_rgroup(cgrp)) + goto done; + if (!css->ss) { if (cgroup_on_dfl(cgrp)) cfts = cgroup_dfl_base_files; @@ -1600,9 +1606,8 @@ static int css_populate_dir(struct cgroup_subsys_state *css) goto err; } } - +done: css->flags |= CSS_VISIBLE; - return 0; err: list_for_each_entry(cfts, &css->ss->cfts, node) { @@ -3116,8 +3121,15 @@ static void cgroup_save_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_pre(dsct, d_css, cgrp) { + struct signal_struct *sig; + dsct->old_subtree_control = dsct->subtree_control; dsct->old_subtree_ss_mask = dsct->subtree_ss_mask; + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_old_subtree_control = sig->rgrp_subtree_control; + sig->rgrp_old_subtree_ss_mask = sig->rgrp_subtree_ss_mask; + } } } @@ -3135,10 +3147,19 @@ static void cgroup_propagate_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_pre(dsct, d_css, cgrp) { + struct signal_struct *sig; + dsct->subtree_control &= cgroup_control(dsct); dsct->subtree_ss_mask = cgroup_calc_subtree_ss_mask(dsct->subtree_control, cgroup_ss_mask(dsct)); + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_subtree_control &= cgroup_control(dsct); + sig->rgrp_subtree_ss_mask = + cgroup_calc_subtree_ss_mask(sig->rgrp_subtree_control, + cgroup_ss_mask(dsct)); + } } } @@ -3155,6 +3176,13 @@ static void cgroup_restore_control(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; cgroup_for_each_live_descendant_post(dsct, d_css, cgrp) { + struct signal_struct *sig; + + list_for_each_entry(sig, &dsct->rgrp_child_sigs, rgrp_node) { + sig->rgrp_subtree_control = sig->rgrp_old_subtree_control; + sig->rgrp_subtree_ss_mask = sig->rgrp_old_subtree_ss_mask; + } + dsct->subtree_control = dsct->old_subtree_control; dsct->subtree_ss_mask = dsct->old_subtree_ss_mask; } @@ -5326,6 +5354,15 @@ static struct cgroup *rgroup_create(struct cgroup *parent, lockdep_assert_held(&cgroup_mutex); + if (list_empty(&sig->rgrps)) { + WARN_ON_ONCE(is_rgroup(parent)); + + sig->rgrp_subtree_control = 0; + sig->rgrp_subtree_ss_mask = + cgroup_calc_subtree_ss_mask(sig->rgrp_subtree_control, + cgroup_ss_mask(parent)); + } + rgrp = cgroup_create(parent, sig); if (IS_ERR(rgrp)) return rgrp; -- 2.5.0
next prev parent reply other threads:[~2016-03-11 15:42 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-11 15:41 [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 15:41 ` [PATCH 01/10] cgroup: introduce cgroup_[un]lock() Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 15:41 ` [PATCH 02/10] cgroup: un-inline cgroup_path() and friends Tejun Heo 2016-03-11 15:41 ` [PATCH 03/10] cgroup: introduce CGRP_MIGRATE_* flags Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 15:41 ` [PATCH 04/10] signal: make put_signal_struct() public Tejun Heo 2016-03-11 15:41 ` [PATCH 05/10] cgroup, fork: add @new_rgrp_cset[p] and @clone_flags to cgroup fork callbacks Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 15:41 ` [PATCH 06/10] cgroup, fork: add @child and @clone_flags to threadgroup_change_begin/end() Tejun Heo 2016-03-11 15:41 ` [PATCH 07/10] cgroup: introduce resource group Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 15:41 ` Tejun Heo [this message] 2016-03-11 15:41 ` [PATCH 08/10] cgroup: implement rgroup control mask handling Tejun Heo 2016-03-11 15:41 ` [PATCH 09/10] cgroup: implement rgroup subtree migration Tejun Heo 2016-03-11 15:41 ` [PATCH 10/10] cgroup, sched: implement PRIO_RGRP for {set|get}priority() Tejun Heo 2016-03-11 15:41 ` Tejun Heo 2016-03-11 16:05 ` Example program for PRIO_RGRP Tejun Heo 2016-03-11 16:05 ` Tejun Heo 2016-03-12 6:26 ` [PATCHSET RFC cgroup/for-4.6] cgroup, sched: implement resource group and PRIO_RGRP Mike Galbraith 2016-03-12 6:26 ` Mike Galbraith 2016-03-12 17:04 ` Mike Galbraith 2016-03-12 17:04 ` Mike Galbraith 2016-03-12 17:13 ` cgroup NAKs ignored? " Ingo Molnar 2016-03-12 17:13 ` Ingo Molnar 2016-03-13 14:42 ` Tejun Heo 2016-03-13 14:42 ` Tejun Heo 2016-03-13 15:00 ` Tejun Heo 2016-03-13 15:00 ` Tejun Heo 2016-03-13 17:40 ` Mike Galbraith 2016-03-13 17:40 ` Mike Galbraith 2016-04-07 0:00 ` Tejun Heo 2016-04-07 0:00 ` Tejun Heo 2016-04-07 3:26 ` Mike Galbraith 2016-04-07 3:26 ` Mike Galbraith 2016-03-14 2:23 ` Mike Galbraith 2016-03-14 2:23 ` Mike Galbraith 2016-03-14 11:30 ` Peter Zijlstra 2016-03-14 11:30 ` Peter Zijlstra 2016-04-06 15:58 ` Tejun Heo 2016-04-06 15:58 ` Tejun Heo 2016-04-06 15:58 ` Tejun Heo 2016-04-07 6:45 ` Peter Zijlstra 2016-04-07 6:45 ` Peter Zijlstra 2016-04-07 7:35 ` Johannes Weiner 2016-04-07 7:35 ` Johannes Weiner 2016-04-07 8:05 ` Mike Galbraith 2016-04-07 8:05 ` Mike Galbraith 2016-04-07 8:08 ` Peter Zijlstra 2016-04-07 8:08 ` Peter Zijlstra 2016-04-07 9:28 ` Johannes Weiner 2016-04-07 9:28 ` Johannes Weiner 2016-04-07 10:42 ` Peter Zijlstra 2016-04-07 10:42 ` Peter Zijlstra 2016-04-07 19:45 ` Tejun Heo 2016-04-07 19:45 ` Tejun Heo 2016-04-07 20:25 ` Peter Zijlstra 2016-04-07 20:25 ` Peter Zijlstra 2016-04-08 20:11 ` Tejun Heo 2016-04-08 20:11 ` Tejun Heo 2016-04-09 6:16 ` Mike Galbraith 2016-04-09 6:16 ` Mike Galbraith 2016-04-09 13:39 ` Peter Zijlstra 2016-04-09 13:39 ` Peter Zijlstra 2016-04-12 22:29 ` Tejun Heo 2016-04-12 22:29 ` Tejun Heo 2016-04-13 7:43 ` Mike Galbraith 2016-04-13 7:43 ` Mike Galbraith 2016-04-13 15:59 ` Tejun Heo 2016-04-13 19:15 ` Mike Galbraith 2016-04-13 19:15 ` Mike Galbraith 2016-04-14 6:07 ` Mike Galbraith 2016-04-14 19:57 ` Tejun Heo 2016-04-14 19:57 ` Tejun Heo 2016-04-15 2:42 ` Mike Galbraith 2016-04-15 2:42 ` Mike Galbraith 2016-04-09 16:02 ` Peter Zijlstra 2016-04-09 16:02 ` Peter Zijlstra 2016-04-07 8:28 ` Peter Zijlstra 2016-04-07 8:28 ` Peter Zijlstra 2016-04-07 19:04 ` Johannes Weiner 2016-04-07 19:04 ` Johannes Weiner 2016-04-07 19:31 ` Peter Zijlstra 2016-04-07 19:31 ` Peter Zijlstra 2016-04-07 20:23 ` Johannes Weiner 2016-04-07 20:23 ` Johannes Weiner 2016-04-08 3:13 ` Mike Galbraith 2016-04-08 3:13 ` Mike Galbraith 2016-03-15 17:21 ` Michal Hocko 2016-03-15 17:21 ` Michal Hocko 2016-04-06 21:53 ` Tejun Heo 2016-04-06 21:53 ` Tejun Heo 2016-04-07 6:40 ` Peter Zijlstra 2016-04-07 6:40 ` Peter Zijlstra
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1457710888-31182-9-git-send-email-tj@kernel.org \ --to=tj@kernel.org \ --cc=a.p.zijlstra@chello.nl \ --cc=akpm@linux-foundation.org \ --cc=cgroups@vger.kernel.org \ --cc=hannes@cmpxchg.org \ --cc=kernel-team@fb.com \ --cc=linux-api@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lizefan@huawei.com \ --cc=mingo@redhat.com \ --cc=oleg@redhat.com \ --cc=peterz@infradead.org \ --cc=pjt@google.com \ --cc=torvalds@linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.