From c4161fbb2c3d356bf16f72e26d3f8e48e53eef9d Mon Sep 17 00:00:00 2001 From: Paolo Valente Date: Fri, 26 Feb 2010 22:19:41 +0100 Subject: [PATCH 2/3] block: add cgroups, kconfig and build bits for BFQ Add a Kconfig option and do the related Makefile changes to compile the BFQ I/O scheduler. Also let the cgroups subsystem know about the BFQ I/O controller. Signed-off-by: Fabio Checconi Signed-off-by: Paolo Valente --- block/Kconfig.iosched | 25 +++++++++++++++++++++++++ block/Makefile | 1 + include/linux/cgroup_subsys.h | 6 ++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched index c2c164c..4f79235 100644 --- a/block/Kconfig.iosched +++ b/block/Kconfig.iosched @@ -33,6 +33,28 @@ config IOSCHED_CFQ This is the default I/O scheduler. +config IOSCHED_BFQ + tristate "BFQ I/O scheduler" + depends on EXPERIMENTAL + default n + ---help--- + The BFQ I/O scheduler tries to distribute bandwidth among + all processes according to their weights. + It aims at distributing the bandwidth as desired, independently of + the disk parameters and with any workload. It also tries to + guarantee low latency to interactive and soft real-time + applications. If compiled built-in (saying Y here), BFQ can + be configured to support hierarchical scheduling. + +config CGROUP_BFQIO + bool "BFQ hierarchical scheduling support" + depends on CGROUPS && IOSCHED_BFQ=y + default n + ---help--- + Enable hierarchical scheduling in BFQ, using the cgroups + filesystem interface. The name of the subsystem will be + bfqio. + config CFQ_GROUP_IOSCHED bool "CFQ Group Scheduling support" depends on IOSCHED_CFQ && CGROUPS @@ -74,6 +96,8 @@ choice config DEFAULT_SIO bool "SIO" if IOSCHED_SIO=y + config DEFAULT_BFQ + bool "BFQ" if IOSCHED_BFQ=y config DEFAULT_NOOP bool "No-op" @@ -85,6 +109,7 @@ config DEFAULT_IOSCHED default "deadline" if DEFAULT_DEADLINE default "cfq" if DEFAULT_CFQ default "sio" if DEFAULT_SIO + default "bfq" if DEFAULT_BFQ default "noop" if DEFAULT_NOOP endmenu diff --git a/block/Makefile b/block/Makefile index 08a3925..1f8647d 100644 --- a/block/Makefile +++ b/block/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o obj-$(CONFIG_IOSCHED_SIO) += sio-iosched.o +obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h index ccefff0..37f523b 100644 --- a/include/linux/cgroup_subsys.h +++ b/include/linux/cgroup_subsys.h @@ -66,3 +66,9 @@ SUBSYS(blkio) #endif /* */ + +#ifdef CONFIG_CGROUP_BFQIO +SUBSYS(bfqio) +#endif + +/* */ -- 1.7.0.4