From efae52ab32f0021d3cc808c0b659a6808f598014 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 17 Oct 2024 09:28:59 +0200 Subject: [PATCH] cgroup: add support for the misc controller Signed-off-by: Giuseppe Scrivano --- src/libcrun/cgroup-internal.h | 1 + src/libcrun/cgroup-utils.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libcrun/cgroup-internal.h b/src/libcrun/cgroup-internal.h index 176e25e951..732e35dde3 100644 --- a/src/libcrun/cgroup-internal.h +++ b/src/libcrun/cgroup-internal.h @@ -29,6 +29,7 @@ enum CGROUP_CPUSET = 1 << 3, CGROUP_PIDS = 1 << 4, CGROUP_IO = 1 << 5, + CGROUP_MISC = 1 << 6, }; struct libcrun_cgroup_status diff --git a/src/libcrun/cgroup-utils.c b/src/libcrun/cgroup-utils.c index 347d9ad214..f56ad3c8d3 100644 --- a/src/libcrun/cgroup-utils.c +++ b/src/libcrun/cgroup-utils.c @@ -748,6 +748,8 @@ read_available_controllers (const char *path, libcrun_error_t *err) available |= CGROUP_PIDS; else if (strcmp (token, "io") == 0) available |= CGROUP_IO; + else if (strcmp (token, "misc") == 0) + available |= CGROUP_MISC; } return available; } @@ -761,10 +763,11 @@ write_controller_file (const char *path, int controllers_to_enable, libcrun_erro int ret; controllers_len = xasprintf ( - &controllers, "%s %s %s %s %s %s", (controllers_to_enable & CGROUP_CPU) ? "+cpu" : "", + &controllers, "%s %s %s %s %s %s %s", (controllers_to_enable & CGROUP_CPU) ? "+cpu" : "", (controllers_to_enable & CGROUP_IO) ? "+io" : "", (controllers_to_enable & CGROUP_MEMORY) ? "+memory" : "", (controllers_to_enable & CGROUP_PIDS) ? "+pids" : "", (controllers_to_enable & CGROUP_CPUSET) ? "+cpuset" : "", - (controllers_to_enable & CGROUP_HUGETLB) ? "+hugetlb" : ""); + (controllers_to_enable & CGROUP_HUGETLB) ? "+hugetlb" : "", + (controllers_to_enable & CGROUP_MISC) ? "+misc" : ""); ret = append_paths (&subtree_control, err, CGROUP_ROOT, path, "cgroup.subtree_control", NULL); if (UNLIKELY (ret < 0))