From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Dec 2023 09:54:55 +0000 (+0100)
Subject: cgroup: bring list of delegated cgroup attributes up-to-date with current kernels
X-Git-Tag: v256-rc1~1499^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c70a81de6e9a3b4c13899dfd75d155ba6143f6e;p=thirdparty%2Fsystemd.git

cgroup: bring list of delegated cgroup attributes up-to-date with current kernels

THis brings the list of attributes to delegate to managers of subcgroups
to the state of kernel 6.6.

We probably should unify this list, and maybe generate it automatically
from /sys/kernel/cgroup/delegate, but let's do that another time.
---

diff --git a/src/nspawn/nspawn-cgroup.c b/src/nspawn/nspawn-cgroup.c
index a9d36627a86..a5002437c6f 100644
--- a/src/nspawn/nspawn-cgroup.c
+++ b/src/nspawn/nspawn-cgroup.c
@@ -35,6 +35,8 @@ static int chown_cgroup_path(const char *path, uid_t uid_shift) {
                        "cgroup.stat",
                        "cgroup.subtree_control",
                        "cgroup.threads",
+                       "memory.oom.group",
+                       "memory.reclaim",
                        "notify_on_release",
                        "tasks")
                 if (fchownat(fd, fn, uid_shift, uid_shift, 0) < 0)
diff --git a/src/shared/cgroup-setup.c b/src/shared/cgroup-setup.c
index 811f129f6cd..934a16eaf38 100644
--- a/src/shared/cgroup-setup.c
+++ b/src/shared/cgroup-setup.c
@@ -421,6 +421,8 @@ int cg_set_access(
                 { "cgroup.procs",           true  },
                 { "cgroup.subtree_control", true  },
                 { "cgroup.threads",         false },
+                { "memory.oom.group",       false },
+                { "memory.reclaim",         false },
                 {},
         };