diff options
author | Ben Blum <bblum@andrew.cmu.edu> | 2010-03-10 18:22:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:36 -0500 |
commit | aae8aab40367036931608fdaf9e2dc568b516f19 (patch) | |
tree | b2a06ee21042eb3972ecd9e4153d61a8f6ed53cb /include | |
parent | d7b9fff711d5e8db8c844161c684017e556c38a0 (diff) |
cgroups: revamp subsys array
This patch series provides the ability for cgroup subsystems to be
compiled as modules both within and outside the kernel tree. This is
mainly useful for classifiers and subsystems that hook into components
that are already modules. cls_cgroup and blkio-cgroup serve as the
example use cases for this feature.
It provides an interface cgroup_load_subsys() and cgroup_unload_subsys()
which modular subsystems can use to register and depart during runtime.
The net_cls classifier subsystem serves as the example for a subsystem
which can be converted into a module using these changes.
Patch #1 sets up the subsys[] array so its contents can be dynamic as
modules appear and (eventually) disappear. Iterations over the array are
modified to handle when subsystems are absent, and the dynamic section of
the array is protected by cgroup_mutex.
Patch #2 implements an interface for modules to load subsystems, called
cgroup_load_subsys, similar to cgroup_init_subsys, and adds a module
pointer in struct cgroup_subsys.
Patch #3 adds a mechanism for unloading modular subsystems, which includes
a more advanced rework of the rudimentary reference counting introduced in
patch 2.
Patch #4 modifies the net_cls subsystem, which already had some module
declarations, to be configurable as a module, which also serves as a
simple proof-of-concept.
Part of implementing patches 2 and 4 involved updating css pointers in
each css_set when the module appears or leaves. In doing this, it was
discovered that css_sets always remain linked to the dummy cgroup,
regardless of whether or not any subsystems are actually bound to it
(i.e., not mounted on an actual hierarchy). The subsystem loading and
unloading code therefore should keep in mind the special cases where the
added subsystem is the only one in the dummy cgroup (and therefore all
css_sets need to be linked back into it) and where the removed subsys was
the only one in the dummy cgroup (and therefore all css_sets should be
unlinked from it) - however, as all css_sets always stay attached to the
dummy cgroup anyway, these cases are ignored. Any fix that addresses this
issue should also make sure these cases are addressed in the subsystem
loading and unloading code.
This patch:
Make subsys[] able to be dynamically populated to support modular
subsystems
This patch reworks the way the subsys[] array is used so that subsystems
can register themselves after boot time, and enables the internals of
cgroups to be able to handle when subsystems are not present or may
appear/disappear.
Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
Acked-by: Li Zefan <lizf@cn.fujitsu.com>
Cc: Paul Menage <menage@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/cgroup.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 14160b5b693f..28319a9fe569 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
@@ -40,13 +40,19 @@ extern int cgroupstats_build(struct cgroupstats *stats, | |||
40 | 40 | ||
41 | extern const struct file_operations proc_cgroup_operations; | 41 | extern const struct file_operations proc_cgroup_operations; |
42 | 42 | ||
43 | /* Define the enumeration of all cgroup subsystems */ | 43 | /* Define the enumeration of all builtin cgroup subsystems */ |
44 | #define SUBSYS(_x) _x ## _subsys_id, | 44 | #define SUBSYS(_x) _x ## _subsys_id, |
45 | enum cgroup_subsys_id { | 45 | enum cgroup_subsys_id { |
46 | #include <linux/cgroup_subsys.h> | 46 | #include <linux/cgroup_subsys.h> |
47 | CGROUP_SUBSYS_COUNT | 47 | CGROUP_BUILTIN_SUBSYS_COUNT |
48 | }; | 48 | }; |
49 | #undef SUBSYS | 49 | #undef SUBSYS |
50 | /* | ||
51 | * This define indicates the maximum number of subsystems that can be loaded | ||
52 | * at once. We limit to this many since cgroupfs_root has subsys_bits to keep | ||
53 | * track of all of them. | ||
54 | */ | ||
55 | #define CGROUP_SUBSYS_COUNT (BITS_PER_BYTE*sizeof(unsigned long)) | ||
50 | 56 | ||
51 | /* Per-subsystem/per-cgroup state maintained by the system. */ | 57 | /* Per-subsystem/per-cgroup state maintained by the system. */ |
52 | struct cgroup_subsys_state { | 58 | struct cgroup_subsys_state { |