Skip to content

Commit 83137ed

Browse files
poetteringbluca
authored andcommitted
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. (cherry picked from commit 2c70a81) (cherry picked from commit 9b298cb) (cherry picked from commit da222a2)
1 parent 002adef commit 83137ed

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/nspawn/nspawn-cgroup.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ static int chown_cgroup_path(const char *path, uid_t uid_shift) {
3535
"cgroup.stat",
3636
"cgroup.subtree_control",
3737
"cgroup.threads",
38+
"memory.oom.group",
39+
"memory.reclaim",
3840
"notify_on_release",
3941
"tasks")
4042
if (fchownat(fd, fn, uid_shift, uid_shift, 0) < 0)

src/shared/cgroup-setup.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ int cg_set_access(
421421
{ "cgroup.procs", true },
422422
{ "cgroup.subtree_control", true },
423423
{ "cgroup.threads", false },
424+
{ "memory.oom.group", false },
425+
{ "memory.reclaim", false },
424426
{},
425427
};
426428

0 commit comments

Comments
 (0)