From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 25 Nov 2020 08:05:36 +0000 (+0100)
Subject: cgroup: Also set blkio.bfq.weight
X-Git-Tag: v248-rc1~557
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35e7a62ca32a30169a94693b831e53c832251984;p=thirdparty%2Fsystemd.git

cgroup: Also set blkio.bfq.weight

Commit [1] added a workaround when unified cgroups are used but missed
legacy cgroups where there is the same issue.

[1] <https://github.com/systemd/systemd/commit/2dbc45aea747f25cc1c3848fded2ec0062f96bcf>

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index b9d84dcca93..fe7c80fdbc4 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -1244,6 +1244,11 @@ static void cgroup_context_apply(
                         xsprintf(buf, "%" PRIu64 "\n", weight);
                         (void) set_attribute_and_warn(u, "blkio", "blkio.weight", buf);
 
+                        /* FIXME: drop this when distro kernels properly support BFQ through "blkio.weight"
+                         * See also: https://github.com/systemd/systemd/pull/13335 */
+                        xsprintf(buf, "%" PRIu64 "\n", weight);
+                        (void) set_attribute_and_warn(u, "blkio", "blkio.bfq.weight", buf);
+
                         if (has_io) {
                                 CGroupIODeviceWeight *w;