File _service:tar_scm:support-disable-cgroup-control... of Package systemd

File _service:tar_scm:support-disable-cgroup-controllers-we-don-t-want.patch of Package systemd (Revision dfd73f202dfff38068a511b4572c8e3c)

Currently displaying revision dfd73f202dfff38068a511b4572c8e3c , Show latest

From ef31366523d784d92f25abd99b3782acda29a01c Mon Sep 17 00:00:00 2001
From: xujing <xujing125@huawei.com>
Date: Fri, 8 Jul 2022 19:47:45 +0800
Subject: [PATCH] support disable cgroup controllers we don't want

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ac25693..a7c839c 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2052,6 +2052,20 @@ int cg_mask_supported(CGroupMask *ret) {
         return cg_mask_supported_subtree(root, ret);
 }
 
+int cg_mask_disable_cgroup(CGroupMask disabled, CGroupMask *ret) {
+        int r;
+
+        r = cg_all_unified();
+        if (r < 0)
+                return r;
+
+        /* We only care CGROUP_V1 */
+        if (r == 0)
+                *ret &= ~disabled;
+
+        return 0;
+}
+
 int cg_kernel_controllers(Set **ret) {
         _cleanup_set_free_ Set *controllers = NULL;
         _cleanup_fclose_ FILE *f = NULL;
diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 147c956..a539327 100644
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -295,6 +295,7 @@ typedef const char* (*cg_migrate_callback_t)(CGroupMask mask, void *userdata);
 
 int cg_mask_supported(CGroupMask *ret);
 int cg_mask_supported_subtree(const char *root, CGroupMask *ret);
+int cg_mask_disable_cgroup(CGroupMask disabled, CGroupMask *ret);
 int cg_mask_from_string(const char *s, CGroupMask *ret);
 int cg_mask_to_string(CGroupMask mask, char **ret);
 
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 9987dac..af58b9b 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -3646,6 +3646,7 @@ int manager_setup_cgroup(Manager *m) {
         if (r < 0)
                 return log_error_errno(r, "Failed to determine supported bpf-based pseudo-controllers: %m");
         m->cgroup_supported |= mask;
+        m->system_cgroup_supported = m->cgroup_supported;
 
         /* 10. Log which controllers are supported */
         for (CGroupController c = 0; c < _CGROUP_CONTROLLER_MAX; c++)
diff --git a/src/core/main.c b/src/core/main.c
index 990e4d2..5404e24 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -157,6 +157,7 @@ static nsec_t arg_timer_slack_nsec;
 static usec_t arg_default_timer_accuracy_usec;
 static Set* arg_syscall_archs;
 static FILE* arg_serialization;
+static CGroupMask arg_disable_cgroup_controllers;
 static int arg_default_cpu_accounting;
 static bool arg_default_io_accounting;
 static bool arg_default_ip_accounting;
@@ -684,6 +685,7 @@ static int parse_config_file(void) {
                 { "Manager", "DefaultLimitNICE",             config_parse_rlimit,                RLIMIT_NICE,              arg_default_rlimit                },
                 { "Manager", "DefaultLimitRTPRIO",           config_parse_rlimit,                RLIMIT_RTPRIO,            arg_default_rlimit                },
                 { "Manager", "DefaultLimitRTTIME",           config_parse_rlimit,                RLIMIT_RTTIME,            arg_default_rlimit                },
+                { "Manager", "DisableCGroupControllers",     config_parse_cgroup,                0,                        &arg_disable_cgroup_controllers   },
                 { "Manager", "DefaultCPUAccounting",         config_parse_tristate,              0,                        &arg_default_cpu_accounting       },
                 { "Manager", "DefaultIOAccounting",          config_parse_bool,                  0,                        &arg_default_io_accounting        },
                 { "Manager", "DefaultIPAccounting",          config_parse_bool,                  0,                        &arg_default_ip_accounting        },
@@ -765,6 +767,10 @@ static void set_manager_defaults(Manager *m) {
         m->default_start_limit_burst = arg_default_start_limit_burst;
         m->default_dfx_reboot = arg_default_dfx_reboot;
 
+        m->cgroup_disabled = arg_disable_cgroup_controllers;
+        m->cgroup_supported = m->system_cgroup_supported;
+        (void) cg_mask_disable_cgroup(m->cgroup_disabled, &m->cgroup_supported);
+
         /* On 4.15+ with unified hierarchy, CPU accounting is essentially free as it doesn't require the CPU
          * controller to be enabled, so the default is to enable it unless we got told otherwise. */
         if (arg_default_cpu_accounting >= 0)
@@ -2494,6 +2500,7 @@ static void reset_arguments(void) {
 
         /* arg_serialization — ignore */
 
+        arg_disable_cgroup_controllers = 0;
         arg_default_cpu_accounting = -1;
         arg_default_io_accounting = false;
         arg_default_ip_accounting = false;
diff --git a/src/core/manager.h b/src/core/manager.h
index ea95efe..9bf5454 100644
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -296,6 +296,8 @@ struct Manager {
         /* Data specific to the cgroup subsystem */
         Hashmap *cgroup_unit;
         CGroupMask cgroup_supported;
+        CGroupMask system_cgroup_supported;
+        CGroupMask cgroup_disabled;
         char *cgroup_root;
 
         /* Notifications from cgroups, when the unified hierarchy is used is done via inotify. */
diff --git a/src/core/system.conf.in b/src/core/system.conf.in
index 11936cd..e7aecfd 100644
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@@ -52,6 +52,7 @@
 #DefaultStartLimitIntervalSec=10s
 #DefaultStartLimitBurst=5
 #DefaultEnvironment=
+#DisableCGroupControllers=no
 #DefaultCPUAccounting=no
 #DefaultIOAccounting=no
 #DefaultIPAccounting=no
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 29051ca..2527d31 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
+#include "cgroup-util.h"
 #include "constants.h"
 #include "dns-domain.h"
 #include "escape.h"
@@ -1557,6 +1558,59 @@ int config_parse_rlimit(
         return 0;
 }
 
+int config_parse_cgroup(
+                const char *unit,
+                const char *filename,
+                unsigned line,
+                const char *section,
+                unsigned section_line,
+                const char *lvalue,
+                int ltype,
+                const char *rvalue,
+                void *data,
+                void *userdata) {
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        CGroupMask *disabled_mask = data;
+        int r;
+
+        for (;;) {
+                _cleanup_free_ char *word = NULL;
+                CGroupController cc;
+                int yes_or_no = 0;
+
+                r = extract_first_word(&rvalue, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RETAIN_ESCAPE);
+                if (r == 0)
+                        break;
+                if (r == -ENOMEM)
+                        return log_oom();
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
+                        break;
+                }
+
+                yes_or_no = parse_boolean(word);
+                if (yes_or_no == 0) {
+                        *disabled_mask = 0;
+                        break;
+                } else if (yes_or_no == 1) {
+                        *disabled_mask = CGROUP_MASK_V1;
+                        break;
+                }
+
+                cc = cgroup_controller_from_string(word);
+                if (cc < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse DisableCGroupControllers, ignoring: %s", word);
+                        break;
+                }
+                *disabled_mask |= CGROUP_CONTROLLER_TO_MASK(cc);
+        }
+        return 0;
+}
+
 int config_parse_permille(
                 const char* unit,
                 const char *filename,
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index e1765f5..2d8f21e 100644
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -200,6 +200,7 @@ CONFIG_PARSER_PROTOTYPE(config_parse_ifnames);
 CONFIG_PARSER_PROTOTYPE(config_parse_ip_port);
 CONFIG_PARSER_PROTOTYPE(config_parse_mtu);
 CONFIG_PARSER_PROTOTYPE(config_parse_rlimit);
+CONFIG_PARSER_PROTOTYPE(config_parse_cgroup);
 CONFIG_PARSER_PROTOTYPE(config_parse_vlanprotocol);
 CONFIG_PARSER_PROTOTYPE(config_parse_hw_addr);
 CONFIG_PARSER_PROTOTYPE(config_parse_hw_addrs);
-- 
2.33.0