X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbasic%2Fcgroup-util.c;h=bcb022896816450bfe101370a6d735e62c235433;hp=323720caef49797a6cd33c5f103f4f8a488846c5;hb=0f58036abf34e92313105839658420e95acfdd7e;hpb=f000ad56fe2346cc8391eeb684681e707711b3ce diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 323720cae..bcb022896 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -210,12 +210,6 @@ int cg_rmdir(const char *controller, const char *path) { if (r < 0 && errno != ENOENT) return -errno; - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - r = cg_rmdir(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path); - if (r < 0) - log_warning_errno(r, "Failed to remove compat systemd cgroup %s: %m", path); - } - return 0; } @@ -554,13 +548,6 @@ static const char *controller_to_dirname(const char *controller) { * just cuts off the name= prefixed used for named * hierarchies, if it is specified. */ - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER)) { - if (cg_hybrid_unified()) - controller = SYSTEMD_CGROUP_CONTROLLER_HYBRID; - else - controller = SYSTEMD_CGROUP_CONTROLLER_LEGACY; - } - e = startswith(controller, "name="); if (e) return e; @@ -719,7 +706,7 @@ static int trim_cb(const char *path, const struct stat *sb, int typeflag, struct int cg_trim(const char *controller, const char *path, bool delete_root) { _cleanup_free_ char *fs = NULL; - int r = 0, q; + int r = 0; assert(path); @@ -742,12 +729,6 @@ int cg_trim(const char *controller, const char *path, bool delete_root) { return -errno; } - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - q = cg_trim(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, delete_root); - if (q < 0) - log_warning_errno(q, "Failed to trim compat systemd cgroup %s: %m", path); - } - return r; } @@ -771,12 +752,6 @@ int cg_create(const char *controller, const char *path) { return -errno; } - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - r = cg_create(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path); - if (r < 0) - log_warning_errno(r, "Failed to create compat systemd cgroup %s: %m", path); - } - return 1; } @@ -814,17 +789,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { xsprintf(c, PID_FMT "\n", pid); - r = write_string_file(fs, c, 0); - if (r < 0) - return r; - - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - r = cg_attach(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, pid); - if (r < 0) - log_warning_errno(r, "Failed to attach %d to compat systemd cgroup %s: %m", pid, path); - } - - return 0; + return write_string_file(fs, c, 0); } int cg_attach_fallback(const char *controller, const char *path, pid_t pid) { @@ -874,17 +839,7 @@ int cg_set_group_access( if (r < 0) return r; - r = chmod_and_chown(fs, mode, uid, gid); - if (r < 0) - return r; - - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - r = cg_set_group_access(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, mode, uid, gid); - if (r < 0) - log_warning_errno(r, "Failed to set group access on compat systemd cgroup %s: %m", path); - } - - return 0; + return chmod_and_chown(fs, mode, uid, gid); } int cg_set_task_access( @@ -913,18 +868,13 @@ int cg_set_task_access( if (r < 0) return r; - if (!cg_unified(controller)) { - /* Compatibility, Always keep values for "tasks" in sync with - * "cgroup.procs" */ - if (cg_get_path(controller, path, "tasks", &procs) >= 0) - (void) chmod_and_chown(procs, mode, uid, gid); - } + if (cg_unified(controller)) + return 0; - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER) && cg_hybrid_unified()) { - r = cg_set_task_access(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, mode, uid, gid); - if (r < 0) - log_warning_errno(r, "Failed to set task access on compat systemd cgroup %s: %m", path); - } + /* Compatibility, Always keep values for "tasks" in sync with + * "cgroup.procs" */ + if (cg_get_path(controller, path, "tasks", &procs) >= 0) + (void) chmod_and_chown(procs, mode, uid, gid); return 0; } @@ -970,7 +920,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi int cg_pid_get_path(const char *controller, pid_t pid, char **path) { _cleanup_fclose_ FILE *f = NULL; char line[LINE_MAX]; - const char *fs, *controller_str; + const char *fs; size_t cs = 0; bool unified; @@ -984,14 +934,8 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) { controller = SYSTEMD_CGROUP_CONTROLLER; unified = cg_unified(controller); - if (!unified) { - if (streq(controller, SYSTEMD_CGROUP_CONTROLLER)) - controller_str = SYSTEMD_CGROUP_CONTROLLER_LEGACY; - else - controller_str = controller; - - cs = strlen(controller_str); - } + if (!unified) + cs = strlen(controller); fs = procfs_file_alloca(pid, "cgroup"); log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")", @@ -1030,7 +974,7 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) { *e = 0; FOREACH_WORD_SEPARATOR(word, k, l, ",", state) { - if (k == cs && memcmp(word, controller_str, cs) == 0) { + if (k == cs && memcmp(word, controller, cs) == 0) { found = true; break; } @@ -1916,9 +1860,6 @@ bool cg_controller_is_valid(const char *p) { if (!p) return false; - if (streq(p, SYSTEMD_CGROUP_CONTROLLER)) - return true; - s = startswith(p, "name="); if (s) p = s; @@ -2358,16 +2299,11 @@ static int cg_update_unified(void) { if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) unified_cache = CGROUP_UNIFIED_ALL; else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) { - if (statfs("/sys/fs/cgroup/unified/", &fs) == 0 && - F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) - unified_cache = CGROUP_UNIFIED_SYSTEMD; - else { - if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) - return -errno; - if (!F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC)) - return -ENOMEDIUM; - unified_cache = CGROUP_UNIFIED_NONE; - } + if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) + return -errno; + + unified_cache = F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC) ? + CGROUP_UNIFIED_SYSTEMD : CGROUP_UNIFIED_NONE; } else return -ENOMEDIUM; #else @@ -2398,13 +2334,6 @@ bool cg_all_unified(void) { } #if 0 /// UNNEEDED by elogind -bool cg_hybrid_unified(void) { - - assert(cg_update_unified() >= 0); - - return unified_cache == CGROUP_UNIFIED_SYSTEMD; -} - int cg_unified_flush(void) { unified_cache = CGROUP_UNIFIED_UNKNOWN; @@ -2509,6 +2438,11 @@ bool cg_is_legacy_wanted(void) { /* The meaning of the kernel option is reversed wrt. to the return value * of this function, hence the negation. */ return (wanted = r > 0 ? !b : false); + return (wanted = r > 0 ? b : false); +} + +bool cg_is_legacy_systemd_controller_wanted(void) { + return cg_is_legacy_wanted() && !cg_is_unified_systemd_controller_wanted(); } #endif // 0