diff options
author | Tejun Heo <tj@kernel.org> | 2013-05-14 16:52:38 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-05-14 16:52:38 -0400 |
commit | 9138125beabbb76b4a373d4a619870f6f5d86fc5 (patch) | |
tree | 61ccabf042ff21b81c6dcd074ea8edeb77fedfa8 /block/blk-cgroup.c | |
parent | 693e751e70843c29884cde326016e746fa16073a (diff) |
blk-throttle: implement proper hierarchy support
With the recent updates, blk-throttle is finally ready for proper
hierarchy support. Dispatching now honors service_queue->parent_sq
and propagates correctly. The only thing missing is setting
->parent_sq correctly so that throtl_grp hierarchy matches the cgroup
hierarchy.
This patch updates throtl_pd_init() such that service_queues form the
same hierarchy as the cgroup hierarchy if sane_behavior is enabled.
As this concludes proper hierarchy support for blkcg, the shameful
.broken_hierarchy tag is removed from blkio_subsys.
v2: Updated blkio-controller.txt as suggested by Vivek.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'block/blk-cgroup.c')
-rw-r--r-- | block/blk-cgroup.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index d0747605f56c..290792a13e3c 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c | |||
@@ -911,14 +911,6 @@ struct cgroup_subsys blkio_subsys = { | |||
911 | .subsys_id = blkio_subsys_id, | 911 | .subsys_id = blkio_subsys_id, |
912 | .base_cftypes = blkcg_files, | 912 | .base_cftypes = blkcg_files, |
913 | .module = THIS_MODULE, | 913 | .module = THIS_MODULE, |
914 | |||
915 | /* | ||
916 | * blkio subsystem is utterly broken in terms of hierarchy support. | ||
917 | * It treats all cgroups equally regardless of where they're | ||
918 | * located in the hierarchy - all cgroups are treated as if they're | ||
919 | * right below the root. Fix it and remove the following. | ||
920 | */ | ||
921 | .broken_hierarchy = true, | ||
922 | }; | 914 | }; |
923 | EXPORT_SYMBOL_GPL(blkio_subsys); | 915 | EXPORT_SYMBOL_GPL(blkio_subsys); |
924 | 916 | ||