From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 22 Feb 2017 17:57:43 +0000 (-0500)
Subject: cgroup-util: cache all cg_is_*_wanted answers, disable /sys/fs/cgroups/unified on... 
X-Git-Tag: v233~41^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=239a3d09547a32c21e9b9b22499991781c15438e;p=thirdparty%2Fsystemd.git

cgroup-util: cache all cg_is_*_wanted answers, disable /sys/fs/cgroups/unified on unified

If we encounter an error in proc cmdline parsing, just treat that as permanent,
i.e. the same as if the option was not specified. Realistically, it is better
to use the same condition for all related mounts, then to have e.g.
/sys/fs/cgroup mounted and /sys/fs/cgroup/unified not. If we find something is
mounted and base our answer on that, cache that result too.

Fix the conditions so that if "unified" is used, make sure any "hybrid" mounts
are not mounted.
---

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 8d60ded5fe2..32224286494 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2410,33 +2410,37 @@ bool cg_is_unified_wanted(void) {
         bool b;
         const bool is_default = DEFAULT_HIERARCHY == CGROUP_UNIFIED_ALL;
 
-        /* If the hierarchy is already mounted, then follow whatever
-         * was chosen for it. */
-        if (cg_unified_flush() >= 0)
-                return cg_all_unified();
-
         /* If we have a cached value, return that. */
         if (wanted >= 0)
                 return wanted;
 
+        /* If the hierarchy is already mounted, then follow whatever
+         * was chosen for it. */
+        if (cg_unified_flush() >= 0)
+                return (wanted = cg_all_unified());
+
         /* Otherwise, let's see what the kernel command line has to say.
          * Since checking is expensive, cache a non-error result. */
         r = proc_cmdline_get_bool("systemd.unified_cgroup_hierarchy", &b);
-        if (r < 0)
-                return is_default;
 
         return (wanted = r > 0 ? b : is_default);
 }
 
 bool cg_is_legacy_wanted(void) {
+        static thread_local int wanted = -1;
+
+        /* If we have a cached value, return that. */
+        if (wanted >= 0)
+                return wanted;
+
         /* Check if we have cgroups2 already mounted. */
         if (cg_unified_flush() >= 0 &&
             unified_cache == CGROUP_UNIFIED_ALL)
-                return false;
+                return (wanted = false);
 
         /* Otherwise, assume that at least partial legacy is wanted,
          * since cgroups2 should already be mounted at this point. */
-        return true;
+        return (wanted = true);
 }
 
 bool cg_is_hybrid_wanted(void) {
@@ -2445,20 +2449,19 @@ bool cg_is_hybrid_wanted(void) {
         bool b;
         const bool is_default = DEFAULT_HIERARCHY == CGROUP_UNIFIED_SYSTEMD;
 
-        /* If the hierarchy is already mounted, then follow whatever
-         * was chosen for it. */
-        if (cg_unified_flush() >= 0)
-                return cg_unified(SYSTEMD_CGROUP_CONTROLLER);
-
         /* If we have a cached value, return that. */
         if (wanted >= 0)
                 return wanted;
 
+        /* If the hierarchy is already mounted, then follow whatever
+         * was chosen for it. */
+        if (cg_unified_flush() >= 0 &&
+            unified_cache == CGROUP_UNIFIED_ALL)
+                return (wanted = false);
+
         /* Otherwise, let's see what the kernel command line has to say.
          * Since checking is expensive, cache a non-error result. */
         r = proc_cmdline_get_bool("systemd.legacy_systemd_cgroup_controller", &b);
-        if (r < 0)
-                return is_default;
 
         /* The meaning of the kernel option is reversed wrt. to the return value
          * of this function, hence the negation. */