diff options
author | Ben Blum <bblum@andrew.cmu.edu> | 2010-03-10 18:22:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:36 -0500 |
commit | 67523c48aa74d5637848edeccf285af1c60bf14a (patch) | |
tree | ebd14992e210c8dfb503ae5fdffc1f5392ad52df /block | |
parent | 8ca712ea84728531d36841ca8f98f9e8680bcf4e (diff) |
cgroups: blkio subsystem as module
Modify the Block I/O cgroup subsystem to be able to be built as a module.
As the CFQ disk scheduler optionally depends on blk-cgroup, config options
in block/Kconfig, block/Kconfig.iosched, and block/blk-cgroup.h are
enhanced to support the new module dependency.
Signed-off-by: Ben Blum <bblum@andrew.cmu.edu>
Cc: 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>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'block')
-rw-r--r-- | block/Kconfig | 2 | ||||
-rw-r--r-- | block/Kconfig.iosched | 2 | ||||
-rw-r--r-- | block/blk-cgroup.c | 53 | ||||
-rw-r--r-- | block/blk-cgroup.h | 10 |
4 files changed, 51 insertions, 16 deletions
diff --git a/block/Kconfig b/block/Kconfig index e20fbde0875c..62a5921321cd 100644 --- a/block/Kconfig +++ b/block/Kconfig | |||
@@ -78,7 +78,7 @@ config BLK_DEV_INTEGRITY | |||
78 | Protection. If in doubt, say N. | 78 | Protection. If in doubt, say N. |
79 | 79 | ||
80 | config BLK_CGROUP | 80 | config BLK_CGROUP |
81 | bool | 81 | tristate |
82 | depends on CGROUPS | 82 | depends on CGROUPS |
83 | default n | 83 | default n |
84 | ---help--- | 84 | ---help--- |
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index b71abfb0d726..fc71cf071fb2 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched | |||
@@ -23,6 +23,7 @@ config IOSCHED_DEADLINE | |||
23 | 23 | ||
24 | config IOSCHED_CFQ | 24 | config IOSCHED_CFQ |
25 | tristate "CFQ I/O scheduler" | 25 | tristate "CFQ I/O scheduler" |
26 | select BLK_CGROUP if CFQ_GROUP_IOSCHED | ||
26 | default y | 27 | default y |
27 | ---help--- | 28 | ---help--- |
28 | The CFQ I/O scheduler tries to distribute bandwidth equally | 29 | The CFQ I/O scheduler tries to distribute bandwidth equally |
@@ -35,7 +36,6 @@ config IOSCHED_CFQ | |||
35 | config CFQ_GROUP_IOSCHED | 36 | config CFQ_GROUP_IOSCHED |
36 | bool "CFQ Group Scheduling support" | 37 | bool "CFQ Group Scheduling support" |
37 | depends on IOSCHED_CFQ && CGROUPS | 38 | depends on IOSCHED_CFQ && CGROUPS |
38 | select BLK_CGROUP | ||
39 | default n | 39 | default n |
40 | ---help--- | 40 | ---help--- |
41 | Enable group IO scheduling in CFQ. | 41 | Enable group IO scheduling in CFQ. |
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index c85d74cae200..4b686ad08eaa 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -23,6 +23,31 @@ static LIST_HEAD(blkio_list); | |||
23 | struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT }; | 23 | struct blkio_cgroup blkio_root_cgroup = { .weight = 2*BLKIO_WEIGHT_DEFAULT }; |
24 | EXPORT_SYMBOL_GPL(blkio_root_cgroup); | 24 | EXPORT_SYMBOL_GPL(blkio_root_cgroup); |
25 | 25 | ||
26 | static struct cgroup_subsys_state *blkiocg_create(struct cgroup_subsys *, | ||
27 | struct cgroup *); | ||
28 | static int blkiocg_can_attach(struct cgroup_subsys *, struct cgroup *, | ||
29 | struct task_struct *, bool); | ||
30 | static void blkiocg_attach(struct cgroup_subsys *, struct cgroup *, | ||
31 | struct cgroup *, struct task_struct *, bool); | ||
32 | static void blkiocg_destroy(struct cgroup_subsys *, struct cgroup *); | ||
33 | static int blkiocg_populate(struct cgroup_subsys *, struct cgroup *); | ||
34 | |||
35 | struct cgroup_subsys blkio_subsys = { | ||
36 | .name = "blkio", | ||
37 | .create = blkiocg_create, | ||
38 | .can_attach = blkiocg_can_attach, | ||
39 | .attach = blkiocg_attach, | ||
40 | .destroy = blkiocg_destroy, | ||
41 | .populate = blkiocg_populate, | ||
42 | #ifdef CONFIG_BLK_CGROUP | ||
43 | /* note: blkio_subsys_id is otherwise defined in blk-cgroup.h */ | ||
44 | .subsys_id = blkio_subsys_id, | ||
45 | #endif | ||
46 | .use_id = 1, | ||
47 | .module = THIS_MODULE, | ||
48 | }; | ||
49 | EXPORT_SYMBOL_GPL(blkio_subsys); | ||
50 | |||
26 | struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) | 51 | struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup) |
27 | { | 52 | { |
28 | return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id), | 53 | return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id), |
@@ -253,7 +278,8 @@ remove_entry: | |||
253 | done: | 278 | done: |
254 | free_css_id(&blkio_subsys, &blkcg->css); | 279 | free_css_id(&blkio_subsys, &blkcg->css); |
255 | rcu_read_unlock(); | 280 | rcu_read_unlock(); |
256 | kfree(blkcg); | 281 | if (blkcg != &blkio_root_cgroup) |
282 | kfree(blkcg); | ||
257 | } | 283 | } |
258 | 284 | ||
259 | static struct cgroup_subsys_state * | 285 | static struct cgroup_subsys_state * |
@@ -319,17 +345,6 @@ static void blkiocg_attach(struct cgroup_subsys *subsys, struct cgroup *cgroup, | |||
319 | task_unlock(tsk); | 345 | task_unlock(tsk); |
320 | } | 346 | } |
321 | 347 | ||
322 | struct cgroup_subsys blkio_subsys = { | ||
323 | .name = "blkio", | ||
324 | .create = blkiocg_create, | ||
325 | .can_attach = blkiocg_can_attach, | ||
326 | .attach = blkiocg_attach, | ||
327 | .destroy = blkiocg_destroy, | ||
328 | .populate = blkiocg_populate, | ||
329 | .subsys_id = blkio_subsys_id, | ||
330 | .use_id = 1, | ||
331 | }; | ||
332 | |||
333 | void blkio_policy_register(struct blkio_policy_type *blkiop) | 348 | void blkio_policy_register(struct blkio_policy_type *blkiop) |
334 | { | 349 | { |
335 | spin_lock(&blkio_list_lock); | 350 | spin_lock(&blkio_list_lock); |
@@ -345,3 +360,17 @@ void blkio_policy_unregister(struct blkio_policy_type *blkiop) | |||
345 | spin_unlock(&blkio_list_lock); | 360 | spin_unlock(&blkio_list_lock); |
346 | } | 361 | } |
347 | EXPORT_SYMBOL_GPL(blkio_policy_unregister); | 362 | EXPORT_SYMBOL_GPL(blkio_policy_unregister); |
363 | |||
364 | static int __init init_cgroup_blkio(void) | ||
365 | { | ||
366 | return cgroup_load_subsys(&blkio_subsys); | ||
367 | } | ||
368 | |||
369 | static void __exit exit_cgroup_blkio(void) | ||
370 | { | ||
371 | cgroup_unload_subsys(&blkio_subsys); | ||
372 | } | ||
373 | |||
374 | module_init(init_cgroup_blkio); | ||
375 | module_exit(exit_cgroup_blkio); | ||
376 | MODULE_LICENSE("GPL"); | ||
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 84bf745fa775..8ccc20464dae 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h | |||
@@ -15,7 +15,13 @@ | |||
15 | 15 | ||
16 | #include <linux/cgroup.h> | 16 | #include <linux/cgroup.h> |
17 | 17 | ||
18 | #ifdef CONFIG_BLK_CGROUP | 18 | #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE) |
19 | |||
20 | #ifndef CONFIG_BLK_CGROUP | ||
21 | /* When blk-cgroup is a module, its subsys_id isn't a compile-time constant */ | ||
22 | extern struct cgroup_subsys blkio_subsys; | ||
23 | #define blkio_subsys_id blkio_subsys.subsys_id | ||
24 | #endif | ||
19 | 25 | ||
20 | struct blkio_cgroup { | 26 | struct blkio_cgroup { |
21 | struct cgroup_subsys_state css; | 27 | struct cgroup_subsys_state css; |
@@ -91,7 +97,7 @@ static inline void blkiocg_update_blkio_group_dequeue_stats( | |||
91 | struct blkio_group *blkg, unsigned long dequeue) {} | 97 | struct blkio_group *blkg, unsigned long dequeue) {} |
92 | #endif | 98 | #endif |
93 | 99 | ||
94 | #ifdef CONFIG_BLK_CGROUP | 100 | #if defined(CONFIG_BLK_CGROUP) || defined(CONFIG_BLK_CGROUP_MODULE) |
95 | extern struct blkio_cgroup blkio_root_cgroup; | 101 | extern struct blkio_cgroup blkio_root_cgroup; |
96 | extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup); | 102 | extern struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup); |
97 | extern void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg, | 103 | extern void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg, |