From 4551f704f56b289735ed17f3b9ee0f9663183d09 Mon Sep 17 00:00:00 2001

Message-Id: <4551f704f56b289735ed17f3b9ee0f9663183d09@dist-git>

From: Pavel Hrdina <phrdina@redhat.com>

Date: Mon, 1 Jul 2019 17:07:13 +0200

Subject: [PATCH] vircgroup: introduce virCgroupV2Available

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

We cannot detect only mount points to figure out whether cgroup v2

is available because systemd uses cgroup v2 for process tracking and

all controllers are mounted as cgroup v1 controllers.

To make sure that this is no the situation we need to check

'cgroup.controllers' file if it's not empty to make sure that cgroup

v2 is not mounted only for process tracking.

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

(cherry picked from commit 034ef217d73aa240340dd22590402bb9636648b5)

Conflicts:

    src/util/vircgroupv2.c: missing commit c0abcca417

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1689297

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

Message-Id: <46bcb2f86e4ca5f029f67be5385770d725ef5c42.1561993100.git.phrdina@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/util/vircgroupv2.c | 51 ++++++++++++++++++++++++++++++++++++++++++

 1 file changed, 51 insertions(+)

diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c

index 23bf81dae2..4ab9f2b792 100644

--- a/src/util/vircgroupv2.c

+++ b/src/util/vircgroupv2.c

@@ -19,16 +19,23 @@

  */

 #include <config.h>

+#ifdef __linux__

+# include <mntent.h>

+#endif /* __linux__ */

+

 #include "internal.h"

 #define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__

 #include "vircgrouppriv.h"

 #undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__

+#include "viralloc.h"

 #include "vircgroup.h"

 #include "vircgroupbackend.h"

 #include "vircgroupv2.h"

+#include "virfile.h"

 #include "virlog.h"

+#include "virstring.h"

 VIR_LOG_INIT("util.cgroup");

@@ -41,8 +48,52 @@ VIR_ENUM_IMPL(virCgroupV2Controller, VIR_CGROUP_CONTROLLER_LAST,

 #ifdef __linux__

+/* We're looking for one 'cgroup2' fs mount which has some

+ * controllers enabled. */

+static bool

+virCgroupV2Available(void)

+{

+    bool ret = false;

+    FILE *mounts = NULL;

+    struct mntent entry;

+    char buf[CGROUP_MAX_VAL];

+

+    if (!(mounts = fopen("/proc/mounts", "r")))

+        return false;

+

+    while (getmntent_r(mounts, &entry, buf, sizeof(buf)) != NULL) {

+        VIR_AUTOFREE(char *) contFile = NULL;

+        VIR_AUTOFREE(char *) contStr = NULL;

+

+        if (STRNEQ(entry.mnt_type, "cgroup2"))

+            continue;

+

+        /* Systemd uses cgroup v2 for process tracking but no controller is

+         * available. We should consider this configuration as cgroup v2 is

+         * not available. */

+        if (virAsprintf(&contFile, "%s/cgroup.controllers", entry.mnt_dir) < 0)

+            goto cleanup;

+

+        if (virFileReadAll(contFile, 1024 * 1024, &contStr) < 0)

+            goto cleanup;

+

+        if (STREQ(contStr, ""))

+            continue;

+

+        ret = true;

+        break;

+    }

+

+ cleanup:

+    VIR_FORCE_FCLOSE(mounts);

+    return ret;

+}

+

+

 virCgroupBackend virCgroupV2Backend = {

     .type = VIR_CGROUP_BACKEND_TYPE_V2,

+

+    .available = virCgroupV2Available,

 };

-- 

2.22.0