Permalink
Browse files

Merge remote-tracking branch 'github/3.7/bfq' into 3.7/master

  • Loading branch information...
2 parents 0ce1afa + feae1d1 commit 12834fb3deff6a50fa858ff2798d37f39a7ddb3d @heftig heftig committed Dec 22, 2012
Showing with 5,589 additions and 1 deletion.
  1. +27 −1 block/Kconfig.iosched
  2. +1 −0 block/Makefile
  3. +838 −0 block/bfq-cgroup.c
  4. +36 −0 block/bfq-ioc.c
  5. +3,008 −0 block/bfq-iosched.c
  6. +1,072 −0 block/bfq-sched.c
  7. +601 −0 block/bfq.h
  8. +6 −0 include/linux/cgroup_subsys.h
View
@@ -39,9 +39,31 @@ config CFQ_GROUP_IOSCHED
---help---
Enable group IO scheduling in CFQ.
+config IOSCHED_BFQ
+ tristate "BFQ I/O scheduler"
+ depends on EXPERIMENTAL
+ default y
+ ---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.
+
choice
prompt "Default I/O scheduler"
- default DEFAULT_CFQ
+ default DEFAULT_BFQ
help
Select the I/O scheduler which will be used by default for all
block devices.
@@ -52,6 +74,9 @@ choice
config DEFAULT_CFQ
bool "CFQ" if IOSCHED_CFQ=y
+ config DEFAULT_BFQ
+ bool "BFQ" if IOSCHED_BFQ=y
+
config DEFAULT_NOOP
bool "No-op"
@@ -61,6 +86,7 @@ config DEFAULT_IOSCHED
string
default "deadline" if DEFAULT_DEADLINE
default "cfq" if DEFAULT_CFQ
+ default "bfq" if DEFAULT_BFQ
default "noop" if DEFAULT_NOOP
endmenu
View
@@ -15,6 +15,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
Oops, something went wrong.

0 comments on commit 12834fb

Please sign in to comment.