cgroup changes for v3.3-rc1
Subsystems (11)
Tejun Heo
maintainerHello, Linus.
Please pull from the following branch to receive cgroup changes.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git for-3.3
The big change is threadgroup locking, which was discussed in the following thread.
http://thread.gmane.org/gmane.linux.kernel.containers/21716/focus=26390
The change enabled cgroup core cleanups and removal of corner cases, which Frederic and Mandeep have been working on and more should be coming.
Thank you.
Dan Carpenter (1):
cgroup: move assignement out of condition in cgroup_attach_proc()
Davidlohr Bueso (1):
resource cgroups: remove bogus cast
Frederic Weisbecker (3):
cgroup: Drop task_lock(parent) on cgroup_fork()
cgroup: Remove unnecessary task_lock before fetching css_set on migration
cgroup: Remove task_lock() from cgroup_post_fork()
Kirill A. Shutemov (2):
cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static
cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()
Li Zefan (1):
cgroup: fix to allow mounting a hierarchy by name
Mandeep Singh Baines (4):
cgroups: remove redundant get/put of css_set from css_set_check_fetched()
cgroup: remove redundant get/put of old css_set from migrate
cgroup: remove redundant get/put of task struct
cgroup: only need to check oldcgrp==newgrp once
Tejun Heo (9):
cgroup: add cgroup_root_mutex
threadgroup: rename signal->threadgroup_fork_lock to ->group_rwsem
threadgroup: extend threadgroup_lock() to cover exit and exec
cgroup: always lock threadgroup during migration
cgroup: improve old cgroup handling in cgroup_attach_proc()
cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach()
cgroup: don't use subsys->can_attach_task() or ->attach_task()
cgroup, cpuset: don't use ss->pre_attach()
cgroup: kill subsys->can_attach_task(), pre_attach() and attach_task()Documentation/cgroups/cgroups.txt | 51 ++--- block/blk-cgroup.c | 45 +++-- include/linux/cgroup.h | 31 +++- include/linux/init_task.h | 9 +- include/linux/sched.h | 73 +++++-- kernel/cgroup.c | 406 +++++++++++++++++++++---------------- kernel/cgroup_freezer.c | 16 +- kernel/cpuset.c | 105 +++++----- kernel/events/core.c | 13 +- kernel/fork.c | 8 +- kernel/res_counter.c | 3 +- kernel/sched.c | 31 ++- kernel/signal.c | 10 + mm/memcontrol.c | 16 +- security/device_cgroup.c | 7 +- 15 files changed, 470 insertions(+), 354 deletions(-)
Documentation/cgroups/cgroups.txt +21 -30
@@ -594,53 +594,44 @@ rmdir() will fail with it. From this behavior, pre_destroy() can be called multiple times against a cgroup. int can_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, - struct task_struct *task) + struct cgroup_taskset *tset) (cgroup_mutex held by caller) -Called prior to moving a task into a cgroup; if the subsystem -returns an error, this will abort the attach operation. If a NULL -task is passed, then a successful result indicates that *any* -unspecified task can be moved into the cgroup. Note that this isn't -called on a fork. If this method returns 0 (success) then this should -remain valid while the caller holds cgroup_mutex and it is ensured that either +Called prior to moving one or more tasks into a cgroup; if the +subsystem returns an error, this will abort the attach operation. +@tset contains the tasks to be attached and is guaranteed to have at +least one task in it. + +If there are multiple tasks in the taskset, then: + - it's guaranteed that all are from the same thread group + - @tset contains all tasks from the thread group whether or not + they're switching cgroups + - the first task is the leader + +Each @tset entry also contains the task's old cgroup and tasks which +aren't switching cgroup can be skipped easily using the +cgroup_taskset_for_each() iterator. Note that this isn't called on a +fork. If this method returns 0 (success) then this should remain valid +while the caller holds cgroup_mutex and it is ensured that either attach() or cancel_attach() will be called in future. -int can_attach_task(struct cgroup *cgrp, struct task_struct *tsk); -(cgroup_mutex held by caller) - -As can_attach, but for operations that must be run once per task to be -attached (possibly many when using cgroup_attach_proc). Called after -can_attach. - void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp, - struct task_struct *task, bool threadgroup) + struct cgroup_taskset *tset) (cgroup_mutex held by caller) Called when a task attach operation has failed after can_attach() has succeeded. A subsystem whose can_attach() has some side-effects should provide this function, so that the subsystem can implement a rollback. If not, not necessary. This will be called only about subsystems whose can_attach() operation have -succeeded. - -void pre_attach(struct cgroup *cgrp); -(cgroup_mutex held by caller) - -For any non-per-thread attachment work that needs to happen before -attach_task. Needed by cpuset. +succeeded. The parameters are identical to can_attach(). void attach(struct cgroup_subsys *ss, struct cgroup *cgrp, - struct cgroup *old_cgrp, struct task_struct *task) + struct cgroup_taskset *tset) (cgroup_mutex held by caller) Called after the task has been attached to the cgroup, to allow any post-attachment activity that requires memory allocations or blocking. - -void attach_task(struct cgroup *cgrp, struct task_struct *tsk); -(cgroup_mutex held by caller) - -As attach, but for operations that must be run once per task to be attached, -like can_attach_task. Called before attach. Currently does not support any -subsystem that might need the old_cgrp for every thread in the group. +The parameters are identical to can_attach(). void fork(struct cgroup_subsy *ss, struct task_struct *task)
block/blk-cgroup.c +28 -17
74 lines not on this page · raw message
include/linux/cgroup.h +25 -6
@@ -457,6 +457,28 @@ void cgroup_exclude_rmdir(struct cgroup_subsys_state *css);void cgroup_release_and_wakeup_rmdir (struct cgroup_subsys_state *css);/* +* Control Group taskset, used to pass around set of tasks to cgroup_subsys +* methods. +*/ +struct cgroup_taskset ; +struct task_struct *cgroup_taskset_first (struct cgroup_taskset *tset); +struct task_struct *cgroup_taskset_next (struct cgroup_taskset *tset); +struct cgroup *cgroup_taskset_cur_cgroup (struct cgroup_taskset *tset); +int cgroup_taskset_size (struct cgroup_taskset *tset); + +/** +* cgroup_taskset_for_each - iterate cgroup_taskset +* @task: the loop cursor +* @skip_cgrp: skip if task's cgroup matches this, %NULL to iterate through all +* @tset: taskset to iterate +*/ +#define cgroup_taskset_for_each (task, skip_cgrp, tset) \ + for ((task) = cgroup_taskset_first((tset)); (task); \ + (task) = cgroup_taskset_next((tset))) \ + if (!(skip_cgrp) || \ + cgroup_taskset_cur_cgroup((tset)) != (skip_cgrp)) + +/* * Control Group subsystem type. * See Documentation/cgroups/cgroups.txt for details */
@@ -467,14 +489,11 @@ struct cgroup_subsys {int (*pre_destroy)(struct cgroup_subsys *ss,struct cgroup *cgrp);void (*destroy)(struct cgroup_subsys *ss,struct cgroup *cgrp);int (*can_attach)(struct cgroup_subsys *ss,struct cgroup *cgrp, -struct task_struct *tsk); -int (*can_attach_task)(struct cgroup *cgrp,struct task_struct *tsk); +struct cgroup_taskset *tset);void (*cancel_attach)(struct cgroup_subsys *ss,struct cgroup *cgrp, -struct task_struct *tsk); -void (*pre_attach)(struct cgroup *cgrp); -void (*attach_task)(struct cgroup *cgrp,struct task_struct *tsk); +struct cgroup_taskset *tset);void (*attach)(struct cgroup_subsys *ss,struct cgroup *cgrp, -struct cgroup *old_cgrp,struct task_struct *tsk); +struct cgroup_taskset *tset);void (*fork)(struct cgroup_subsys *ss,struct task_struct *task);void (*exit)(struct cgroup_subsys *ss,struct cgroup *cgrp,struct cgroup *old_cgrp,struct task_struct *task);
include/linux/init_task.h +4 -5
@@ -23,11 +23,10 @@ extern struct files_struct init_files;extern struct fs_struct init_fs;#ifdef CONFIG_CGROUPS -#define INIT_THREADGROUP_FORK_LOCK (sig) \ - .threadgroup_fork_lock = \ - __RWSEM_INITIALIZER(sig.threadgroup_fork_lock), +#define INIT_GROUP_RWSEM (sig) \ + .group_rwsem = __RWSEM_INITIALIZER(sig.group_rwsem),#else -#define INIT_THREADGROUP_FORK_LOCK (sig) +#define INIT_GROUP_RWSEM (sig)#endif #define INIT_SIGNALS (sig) { \
@@ -46,7 +45,7 @@ extern struct fs_struct init_fs; }, \ .cred_guard_mutex = \ __MUTEX_INITIALIZER(sig.cred_guard_mutex), \ - INIT_THREADGROUP_FORK_LOCK(sig) \ + INIT_GROUP_RWSEM(sig) \ }extern struct nsproxy init_nsproxy;
include/linux/sched.h +54 -19
96 lines not on this page · raw message
kernel/cgroup.c +231 -175
741 lines not on this page · raw message
kernel/cgroup_freezer.c +5 -11
@@ -159,13 +159,17 @@ static void freezer_destroy(struct cgroup_subsys *ss,*/ static int freezer_can_attach (struct cgroup_subsys *ss,struct cgroup *new_cgroup, -struct task_struct *task) +struct cgroup_taskset *tset) {struct freezer *freezer; +struct task_struct *task;/* * Anything frozen can't move or be moved to/from. */ +cgroup_taskset_for_each (task, new_cgroup, tset) +if (cgroup_freezing (task)) +return -EBUSY ; freezer =cgroup_freezer (new_cgroup);if (freezer->state !=CGROUP_THAWED )
@@ -174,11 +178,6 @@ static int freezer_can_attach(struct cgroup_subsys *ss,return 0 ; } -static int freezer_can_attach_task (struct cgroup *cgrp,struct task_struct *tsk) -{ -return cgroup_freezing (tsk) ? -EBUSY :0 ; -} -static void freezer_fork (struct cgroup_subsys *ss,struct task_struct *task) {struct freezer *freezer;
@@ -374,10 +373,5 @@ struct cgroup_subsys freezer_subsys = { .populate = freezer_populate, .subsys_id = freezer_subsys_id, .can_attach = freezer_can_attach, - .can_attach_task = freezer_can_attach_task, - .pre_attach = NULL, - .attach_task = NULL, - .attach = NULL, .fork = freezer_fork, - .exit = NULL, };
kernel/cpuset.c +48 -57
143 lines not on this page · raw message
kernel/events/core.c +8 -5
@@ -7044,10 +7044,13 @@ static int __perf_cgroup_move(void *info)return 0 ; } -static void -perf_cgroup_attach_task (struct cgroup *cgrp,struct task_struct *task) +static void perf_cgroup_attach (struct cgroup_subsys *ss,struct cgroup *cgrp, +struct cgroup_taskset *tset) { -task_function_call (task, __perf_cgroup_move, task); +struct task_struct *task; + +cgroup_taskset_for_each (task, cgrp, tset) +task_function_call (task, __perf_cgroup_move, task); } static void perf_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp,
@@ -7061,7 +7064,7 @@ static void perf_cgroup_exit(struct cgroup_subsys *ss, struct cgroup *cgrp,if (!(task->flags &PF_EXITING ))return ; -perf_cgroup_attach_task (cgrp, task); +task_function_call (task, __perf_cgroup_move, task); }struct cgroup_subsys perf_subsys = {
@@ -7070,6 +7073,6 @@ struct cgroup_subsys perf_subsys = { .create = perf_cgroup_create, .destroy = perf_cgroup_destroy, .exit = perf_cgroup_exit, - .attach_task = perf_cgroup_attach_task, + .attach = perf_cgroup_attach, };#endif /* CONFIG_CGROUP_PERF */
kernel/fork.c +4 -4
@@ -972,7 +972,7 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)sched_autogroup_fork (sig);#ifdef CONFIG_CGROUPS -init_rwsem (&sig->threadgroup_fork_lock); +init_rwsem (&sig->group_rwsem);#endif sig->oom_adj = current->signal->oom_adj;
@@ -1157,7 +1157,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->io_context =NULL ; p->audit_context =NULL ;if (clone_flags &CLONE_THREAD ) -threadgroup_fork_read_lock (current); +threadgroup_change_begin (current);cgroup_fork (p);#ifdef CONFIG_NUMA p->mempolicy =mpol_dup (p->mempolicy);
@@ -1372,7 +1372,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,proc_fork_connector (p);cgroup_post_fork (p);if (clone_flags &CLONE_THREAD ) -threadgroup_fork_read_unlock (current); +threadgroup_change_end (current);perf_event_fork (p);return p;
@@ -1407,7 +1407,7 @@ bad_fork_cleanup_policy: bad_fork_cleanup_cgroup: #endifif (clone_flags &CLONE_THREAD ) -threadgroup_fork_read_unlock (current); +threadgroup_change_end (current);cgroup_exit (p, cgroup_callbacks_done);delayacct_tsk_free (p);module_put (task_thread_info (p)->exec_domain->module);
kernel/res_counter.c +1 -2
@@ -159,8 +159,7 @@ int res_counter_memparse_write_strategy(const char *buf,return 0 ; } -/* FIXME - make memparse() take const char* args */ - *res =memparse ((char *)buf, &end); + *res =memparse (buf, &end);if (*end !='\0' )return -EINVAL ;
kernel/sched.c +19 -12
@@ -9127,24 +9127,31 @@ cpu_cgroup_destroy(struct cgroup_subsys *ss, struct cgroup *cgrp)sched_destroy_group (tg); } -static int -cpu_cgroup_can_attach_task (struct cgroup *cgrp,struct task_struct *tsk) +static int cpu_cgroup_can_attach (struct cgroup_subsys *ss,struct cgroup *cgrp, +struct cgroup_taskset *tset) { +struct task_struct *task; + +cgroup_taskset_for_each (task, cgrp, tset) {#ifdef CONFIG_RT_GROUP_SCHED -if (!sched_rt_can_attach (cgroup_tg (cgrp), tsk)) -return -EINVAL ; +if (!sched_rt_can_attach (cgroup_tg (cgrp), task)) +return -EINVAL ;#else -/* We don't support RT-tasks being in separate groups */ -if (tsk->sched_class != &fair_sched_class) -return -EINVAL ; +/* We don't support RT-tasks being in separate groups */ +if (task->sched_class != &fair_sched_class) +return -EINVAL ;#endif + }return 0 ; } -static void -cpu_cgroup_attach_task (struct cgroup *cgrp,struct task_struct *tsk) +static void cpu_cgroup_attach (struct cgroup_subsys *ss,struct cgroup *cgrp, +struct cgroup_taskset *tset) { -sched_move_task (tsk); +struct task_struct *task; + +cgroup_taskset_for_each (task, cgrp, tset) +sched_move_task (task); } static void
@@ -9480,8 +9487,8 @@ struct cgroup_subsys cpu_cgroup_subsys = { .name = "cpu", .create = cpu_cgroup_create, .destroy = cpu_cgroup_destroy, - .can_attach_task = cpu_cgroup_can_attach_task, - .attach_task = cpu_cgroup_attach_task, + .can_attach = cpu_cgroup_can_attach, + .attach = cpu_cgroup_attach, .exit = cpu_cgroup_exit, .populate = cpu_cgroup_populate, .subsys_id = cpu_cgroup_subsys_id,
kernel/signal.c +10 -0
@@ -2359,8 +2359,15 @@ void exit_signals(struct task_struct *tsk)int group_stop =0 ;sigset_t unblocked; +/* +* @tsk is about to have PF_EXITING set - lock out users which +* expect stable threadgroup. +*/ +threadgroup_change_begin (tsk); +if (thread_group_empty (tsk) ||signal_group_exit (tsk->signal)) { tsk->flags |=PF_EXITING ; +threadgroup_change_end (tsk);return ; }
@@ -2370,6 +2377,9 @@ void exit_signals(struct task_struct *tsk)* see wants_signal(), do_signal_stop(). */ tsk->flags |=PF_EXITING ; + +threadgroup_change_end (tsk); +if (!signal_pending (tsk)) goto out;
mm/memcontrol.c +8 -8
@@ -5298,8 +5298,9 @@ static void mem_cgroup_clear_mc(void)static int mem_cgroup_can_attach (struct cgroup_subsys *ss,struct cgroup *cgroup, -struct task_struct *p) +struct cgroup_taskset *tset) { +struct task_struct *p =cgroup_taskset_first (tset);int ret =0 ;struct mem_cgroup *memcg =mem_cgroup_from_cont (cgroup);
@@ -5337,7 +5338,7 @@ static int mem_cgroup_can_attach(struct cgroup_subsys *ss,static void mem_cgroup_cancel_attach (struct cgroup_subsys *ss,struct cgroup *cgroup, -struct task_struct *p) +struct cgroup_taskset *tset) {mem_cgroup_clear_mc (); }
@@ -5454,9 +5455,9 @@ retry:static void mem_cgroup_move_task (struct cgroup_subsys *ss,struct cgroup *cont, -struct cgroup *old_cont, -struct task_struct *p) +struct cgroup_taskset *tset) { +struct task_struct *p =cgroup_taskset_first (tset);struct mm_struct *mm =get_task_mm (p);if (mm) {
@@ -5471,19 +5472,18 @@ static void mem_cgroup_move_task(struct cgroup_subsys *ss,#else /* !CONFIG_MMU */ static int mem_cgroup_can_attach (struct cgroup_subsys *ss,struct cgroup *cgroup, -struct task_struct *p) +struct cgroup_taskset *tset) {return 0 ; }static void mem_cgroup_cancel_attach (struct cgroup_subsys *ss,struct cgroup *cgroup, -struct task_struct *p) +struct cgroup_taskset *tset) { }static void mem_cgroup_move_task (struct cgroup_subsys *ss,struct cgroup *cont, -struct cgroup *old_cont, -struct task_struct *p) +struct cgroup_taskset *tset) { }#endif
security/device_cgroup.c +4 -3
@@ -62,11 +62,12 @@ static inline struct dev_cgroup *task_devcgroup(struct task_struct *task)struct cgroup_subsys devices_subsys;static int devcgroup_can_attach (struct cgroup_subsys *ss, -struct cgroup *new_cgroup,struct task_struct *task) +struct cgroup *new_cgrp,struct cgroup_taskset *set) { -if (current != task && !capable (CAP_SYS_ADMIN )) -return -EPERM ; +struct task_struct *task =cgroup_taskset_first (set); +if (current != task && !capable (CAP_SYS_ADMIN )) +return -EPERM ;return 0 ; }
Tejun Heo
maintainerQuoted 5 lines · Tejun Heo
Hello, Linus.
Please pull from the following branch to receive cgroup changes.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.gitfor-3.3
Oops, forgot writing about conflicts. There will be the following conflict in kernel/cgroup.c.
/*
* step 2: make sure css_sets exist for all threads to be migrated.
* we use find_css_set, which allocates a new one if necessary.
*/
INIT_LIST_HEAD(&newcg_list);
for (i = 0; i < group_size; i++) {
<<<<<<< HEAD
tc = flex_array_get(group, i);
oldcg = tc->task->cgroups;
/* if we don't already have it in the list get a new one */
if (!css_set_check_fetched(cgrp, tc->task, oldcg,
&newcg_list)) {
=======
tsk = flex_array_get_ptr(group, i);
/* nothing to do if this task is already in the cgroup */
oldcgrp = task_cgroup_from_root(tsk, root);
if (cgrp == oldcgrp)
continue;
/* get old css_set pointer */
task_lock(tsk);
oldcg = tsk->cgroups;
get_css_set(oldcg);
task_unlock(tsk);
/* see if the new one for us is already in the list? */
if (css_set_check_fetched(cgrp, tsk, oldcg, &newcg_list)) {
/* was already there, nothing to do. */
put_css_set(oldcg);
} else {
/* we don't already have it. get new one. */Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
a0e86bd4252519321b0d102dc4ed90557aa7bee9
retval = css_set_prefetch(cgrp, oldcg, &newcg_list); if (retval) goto out_list_teardown; } }
This is caused by e0197aae59 "cgroups: fix a css_set not found bug in cgroup_attach_proc" in mainline fixing a bug in code removed in for-3.3 branch and taking the part from for-3.3 is the correct resolution. Just in case, the following is my test merge branch.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git test-merge
Thanks.
Signature · 1 line
tejun