summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--src/core/cgroup.c5
2 files changed, 8 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index df303d329e..f6cf064281 100644
--- a/NEWS
+++ b/NEWS
@@ -429,6 +429,9 @@ CHANGES WITH 243 in spe:
option that permits selecting the timout how long to wait for a
device with an encryption key before asking for the password.
+ * IOWeight= has learnt to properly set the IO weight when using the
+ BFQ scheduler officially found in kernels 5.0+.
+
Contributions from: Aaron Barany, Adrian Bunk, Alan Jenkins, Andrej
Valek, Anita Zhang, Arian van Putten, Balint Reczey, Bastien Nocera,
Ben Boeckel, Benjamin Robin, camoz, Chen Qi, Chris Chiu, Chris Down,
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 6e0afa4bca..60a7799361 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1063,6 +1063,11 @@ static void cgroup_context_apply(
xsprintf(buf, "default %" PRIu64 "\n", weight);
(void) set_attribute_and_warn(u, "io", "io.weight", buf);
+ /* FIXME: drop this when distro kernels properly support BFQ through "io.weight"
+ * See also: https://github.com/systemd/systemd/pull/13335 */
+ xsprintf(buf, "%" PRIu64 "\n", weight);
+ (void) set_attribute_and_warn(u, "io", "io.bfq.weight", buf);
+
if (has_io) {
CGroupIODeviceLatency *latency;
CGroupIODeviceLimit *limit;