Merge tag 'nfs-for-5.14-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index a2297ed..fd732ae 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -133,6 +133,13 @@ config BLK_WBT
        dynamically on an algorithm loosely based on CoDel, factoring in
        the realtime performance of the disk.
 
+config BLK_WBT_MQ
+       bool "Enable writeback throttling by default"
+       default y
+       depends on BLK_WBT
+       help
+       Enable writeback throttling by default for request-based block devices.
+
 config BLK_CGROUP_IOLATENCY
        bool "Enable support for latency based cgroup IO protection"
        depends on BLK_CGROUP=y
@@ -144,6 +151,15 @@ config BLK_CGROUP_IOLATENCY
 
        Note, this is an experimental interface and could be changed someday.
 
+config BLK_CGROUP_FC_APPID
+       bool "Enable support to track FC I/O Traffic across cgroup applications"
+       depends on BLK_CGROUP && NVME_FC
+       help
+         Enabling this option enables the support to track FC I/O traffic across
+         cgroup applications. It enables the Fabric and the storage targets to
+         identify, monitor, and handle FC traffic based on VM tags by inserting
+         application specific identification into the FC frame.
+
 config BLK_CGROUP_IOCOST
        bool "Enable support for cost model based cgroup IO controller"
        depends on BLK_CGROUP=y
@@ -155,12 +171,14 @@ config BLK_CGROUP_IOCOST
        distributes IO capacity between different groups based on
        their share of the overall weight distribution.
 
-config BLK_WBT_MQ
-       bool "Multiqueue writeback throttling"
-       default y
-       depends on BLK_WBT
+config BLK_CGROUP_IOPRIO
+       bool "Cgroup I/O controller for assigning an I/O priority class"
+       depends on BLK_CGROUP
        help
-       Enable writeback throttling by default on multiqueue devices.
+       Enable the .prio interface for assigning an I/O priority class to
+       requests. The I/O priority class affects the order in which an I/O
+       scheduler and block devices process requests. Only some I/O schedulers
+       and some block devices support I/O priorities.
 
 config BLK_DEBUG_FS
        bool "Block layer debugging information in debugfs"