mirror of
https://abf.rosa.ru/djam/kernel.git
synced 2025-02-24 00:32:51 +00:00
b6b23129ad
See the commits 05a8c4904699..16da528365de in https://abf.io/kernels_stable/kernel-4.6. Hightlights: * New build model: everything in a single project. * PAE by default on i586. No non-PAE flavours remain. * SELinux is now built in (disabled by default). * Dropped ndiswrapper (can be built separately if it is really needed).
104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
From ba1f3efda7e8670fc74715ba9eed93bc1172672d Mon Sep 17 00:00:00 2001
|
|
From: Paolo Valente <paolo.valente@unimore.it>
|
|
Date: Tue, 7 Apr 2015 13:39:12 +0200
|
|
Subject: [PATCH 1/3] block: cgroups, kconfig, build bits for BFQ-v7r8-4.1
|
|
|
|
Update Kconfig.iosched and do the related Makefile changes to include
|
|
kernel configuration options for BFQ. Also add the bfqio controller
|
|
to the cgroups subsystem.
|
|
|
|
Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
|
|
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
|
|
---
|
|
block/Kconfig.iosched | 32 ++++++++++++++++++++++++++++++++
|
|
block/Makefile | 1 +
|
|
include/linux/cgroup_subsys.h | 4 ++++
|
|
3 files changed, 37 insertions(+)
|
|
|
|
diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
|
|
index 421bef9..0ee5f0f 100644
|
|
--- a/block/Kconfig.iosched
|
|
+++ b/block/Kconfig.iosched
|
|
@@ -39,6 +39,27 @@ config CFQ_GROUP_IOSCHED
|
|
---help---
|
|
Enable group IO scheduling in CFQ.
|
|
|
|
+config IOSCHED_BFQ
|
|
+ tristate "BFQ I/O scheduler"
|
|
+ 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.
|
|
+
|
|
choice
|
|
prompt "Default I/O scheduler"
|
|
default DEFAULT_CFQ
|
|
@@ -52,6 +73,16 @@ choice
|
|
config DEFAULT_CFQ
|
|
bool "CFQ" if IOSCHED_CFQ=y
|
|
|
|
+ config DEFAULT_BFQ
|
|
+ bool "BFQ" if IOSCHED_BFQ=y
|
|
+ help
|
|
+ Selects BFQ as the default I/O scheduler which will be
|
|
+ used by default for all block devices.
|
|
+ The BFQ I/O scheduler 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.
|
|
+
|
|
config DEFAULT_NOOP
|
|
bool "No-op"
|
|
|
|
@@ -61,6 +92,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
|
|
diff --git a/block/Makefile b/block/Makefile
|
|
index 00ecc97..1ed86d5 100644
|
|
--- a/block/Makefile
|
|
+++ b/block/Makefile
|
|
@@ -18,6 +18,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_CMDLINE_PARSER) += cmdline-parser.o
|
|
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
|
|
index e4a96fb..267d681 100644
|
|
--- a/include/linux/cgroup_subsys.h
|
|
+++ b/include/linux/cgroup_subsys.h
|
|
@@ -35,6 +35,10 @@ SUBSYS(freezer)
|
|
SUBSYS(net_cls)
|
|
#endif
|
|
|
|
+#if IS_ENABLED(CONFIG_CGROUP_BFQIO)
|
|
+SUBSYS(bfqio)
|
|
+#endif
|
|
+
|
|
#if IS_ENABLED(CONFIG_CGROUP_PERF)
|
|
SUBSYS(perf_event)
|
|
#endif
|
|
--
|
|
2.1.4
|
|
|