Merge tag 'arc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

[mirror_ubuntu-artful-kernel.git] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index 0715ce93daef42001407f690912a1b2a437e5a6e..fd2cefa47d354fae842f1596176b52f261dc00a4 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -40,6 +40,7 @@ config CFQ_GROUP_IOSCHED
          Enable group IO scheduling in CFQ.
 
 choice
+
        prompt "Default I/O scheduler"
        default DEFAULT_CFQ
        help
@@ -69,49 +70,34 @@ config MQ_IOSCHED_DEADLINE
        ---help---
          MQ version of the deadline IO scheduler.
 
-config MQ_IOSCHED_NONE
-       bool
+config MQ_IOSCHED_KYBER
+       tristate "Kyber I/O scheduler"
        default y
+       ---help---
+         The Kyber I/O scheduler is a low-overhead scheduler suitable for
+         multiqueue and other fast devices. Given target latencies for reads and
+         synchronous writes, it will self-tune queue depths to achieve that
+         goal.
 
-choice
-       prompt "Default single-queue blk-mq I/O scheduler"
-       default DEFAULT_SQ_NONE
-       help
-         Select the I/O scheduler which will be used by default for blk-mq
-         managed block devices with a single queue.
-
-       config DEFAULT_SQ_DEADLINE
-               bool "MQ Deadline" if MQ_IOSCHED_DEADLINE=y
-
-       config DEFAULT_SQ_NONE
-               bool "None"
-
-endchoice
-
-config DEFAULT_SQ_IOSCHED
-       string
-       default "mq-deadline" if DEFAULT_SQ_DEADLINE
-       default "none" if DEFAULT_SQ_NONE
-
-choice
-       prompt "Default multi-queue blk-mq I/O scheduler"
-       default DEFAULT_MQ_NONE
-       help
-         Select the I/O scheduler which will be used by default for blk-mq
-         managed block devices with multiple queues.
-
-       config DEFAULT_MQ_DEADLINE
-               bool "MQ Deadline" if MQ_IOSCHED_DEADLINE=y
-
-       config DEFAULT_MQ_NONE
-               bool "None"
-
-endchoice
-
-config DEFAULT_MQ_IOSCHED
-       string
-       default "mq-deadline" if DEFAULT_MQ_DEADLINE
-       default "none" if DEFAULT_MQ_NONE
+config IOSCHED_BFQ
+       tristate "BFQ I/O scheduler"
+       default n
+       ---help---
+       BFQ I/O scheduler for BLK-MQ. BFQ distributes the bandwidth of
+       of the device among all processes according to their weights,
+       regardless of the device parameters and with any workload. It
+       also guarantees a low latency to interactive and soft
+       real-time applications.  Details in
+       Documentation/block/bfq-iosched.txt
+
+config BFQ_GROUP_IOSCHED
+       bool "BFQ hierarchical scheduling support"
+       depends on IOSCHED_BFQ && BLK_CGROUP
+       default n
+       ---help---
+
+       Enable hierarchical scheduling in BFQ, using the blkio
+       (cgroups-v1) or io (cgroups-v2) controller.
 
 endmenu