X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fcgroup-util.c;h=502fe460903ca5098daa744e2308fc45f32ef41d;hb=27edf6f36e27bff66b04908b4dcebd359ae08116;hp=cd5db6f69c1ab46ed94efdb01bc43a12217a6766;hpb=9eb822a5a6b67eb82909f0d68213afbfcee6e93e;p=elogind.git diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index cd5db6f69..502fe4609 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -297,6 +297,10 @@ int cg_migrate(const char *cfrom, const char *pfrom, const char *cto, const char my_pid = getpid(); + log_debug_elogind("Migrating \"%s\"/\"%s\" to \"%s\"/\"%s\" (%s)", + cfrom, pfrom, cto, pto, + ignore_self ? "ignoring self" : "watching self"); + do { _cleanup_fclose_ FILE *f = NULL; pid_t pid = 0; @@ -457,7 +461,7 @@ static const char *controller_to_dirname(const char *controller) { if (e) return e; - return controller; + return controller; } static int join_path_legacy(const char *controller, const char *path, const char *suffix, char **fs) { @@ -516,7 +520,7 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch * *below* the controllers, without any prefix. */ if (!path && !suffix) - return -EINVAL; + return -EINVAL; if (!suffix) t = strdup(path); @@ -542,12 +546,13 @@ int cg_get_path(const char *controller, const char *path, const char *suffix, ch r = join_path_unified(path, suffix, fs); else r = join_path_legacy(controller, path, suffix, fs); - if (r < 0) - return r; + + if (r < 0) + return r; path_kill_slashes(*fs); return 0; - } +} static int controller_is_accessible(const char *controller) { int unified; @@ -569,8 +574,8 @@ static int controller_is_accessible(const char *controller) { /* We don't support named hierarchies if we are using * the unified hierarchy. */ - if (streq(controller, ELOGIND_CGROUP_CONTROLLER)) - return 0; + if (streq(controller, SYSTEMD_CGROUP_CONTROLLER)) + return 0; if (startswith(controller, "name=")) return -EOPNOTSUPP; @@ -581,8 +586,8 @@ static int controller_is_accessible(const char *controller) { dn = controller_to_dirname(controller); cc = strjoina("/sys/fs/cgroup/", dn); - if (laccess(cc, F_OK) < 0) - return -errno; + if (laccess(cc, F_OK) < 0) + return -errno; } return 0; @@ -702,7 +707,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) { snprintf(c, sizeof(c), PID_FMT"\n", pid); - return write_string_file_no_create(fs, c); + return write_string_file(fs, c, 0); } int cg_attach_fallback(const char *controller, const char *path, pid_t pid) { @@ -811,16 +816,18 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) { if (unified < 0) return unified; if (unified == 0) { - if (controller) { - if (!cg_controller_is_valid(controller)) - return -EINVAL; - } else - controller = ELOGIND_CGROUP_CONTROLLER; + if (controller) { + if (!cg_controller_is_valid(controller)) + return -EINVAL; + } else + controller = SYSTEMD_CGROUP_CONTROLLER; cs = strlen(controller); } fs = procfs_file_alloca(pid, "cgroup"); + log_debug_elogind("Searching for PID %u in \"%s\" (controller \"%s\")", + pid, fs, controller); f = fopen(fs, "re"); if (!f) return errno == ENOENT ? -ESRCH : -errno; @@ -840,31 +847,32 @@ int cg_pid_get_path(const char *controller, pid_t pid, char **path) { continue; } else { char *l; - size_t k; - const char *word, *state; - bool found = false; + size_t k; + const char *word, *state; + bool found = false; - l = strchr(line, ':'); - if (!l) - continue; + l = strchr(line, ':'); + if (!l) + continue; - l++; - e = strchr(l, ':'); - if (!e) - continue; + l++; + e = strchr(l, ':'); + if (!e) + continue; - *e = 0; - FOREACH_WORD_SEPARATOR(word, k, l, ",", state) { - if (k == cs && memcmp(word, controller, cs) == 0) { - found = true; - break; + *e = 0; + FOREACH_WORD_SEPARATOR(word, k, l, ",", state) { + if (k == cs && memcmp(word, controller, cs) == 0) { + found = true; + break; + } } - } - if (!found) - continue; + if (!found) + continue; } + log_debug_elogind("Found %s:%s", line, e+1); p = strdup(e + 1); if (!p) return -ENOMEM; @@ -899,7 +907,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (isempty(sc)) { - r = write_string_file_no_create(fs, agent); + r = write_string_file(fs, agent, 0); if (r < 0) return r; } else if (!path_equal(sc, agent)) @@ -917,7 +925,7 @@ int cg_install_release_agent(const char *controller, const char *agent) { sc = strstrip(contents); if (streq(sc, "0")) { - r = write_string_file_no_create(fs, "1"); + r = write_string_file(fs, "1", 0); if (r < 0) return r; @@ -944,7 +952,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; - r = write_string_file_no_create(fs, "0"); + r = write_string_file(fs, "0", 0); if (r < 0) return r; @@ -954,7 +962,7 @@ int cg_uninstall_release_agent(const char *controller) { if (r < 0) return r; - r = write_string_file_no_create(fs, ""); + r = write_string_file(fs, "", 0); if (r < 0) return r; @@ -1001,8 +1009,8 @@ int cg_is_empty_recursive(const char *controller, const char *path) { * via the "cgroup.populated" attribute. */ r = cg_get_path(controller, path, "cgroup.populated", &populated); - if (r < 0) - return r; + if (r < 0) + return r; r = read_one_line_file(populated, &t); if (r == -ENOENT) @@ -1012,33 +1020,33 @@ int cg_is_empty_recursive(const char *controller, const char *path) { return streq(t, "0"); } else { - _cleanup_closedir_ DIR *d = NULL; - char *fn; + _cleanup_closedir_ DIR *d = NULL; + char *fn; r = cg_is_empty(controller, path); - if (r <= 0) - return r; + if (r <= 0) + return r; - r = cg_enumerate_subgroups(controller, path, &d); - if (r == -ENOENT) - return 1; - if (r < 0) + r = cg_enumerate_subgroups(controller, path, &d); + if (r == -ENOENT) + return 1; + if (r < 0) return r; - while ((r = cg_read_subgroup(d, &fn)) > 0) { - _cleanup_free_ char *p = NULL; + while ((r = cg_read_subgroup(d, &fn)) > 0) { + _cleanup_free_ char *p = NULL; - p = strjoin(path, "/", fn, NULL); - free(fn); - if (!p) - return -ENOMEM; + p = strjoin(path, "/", fn, NULL); + free(fn); + if (!p) + return -ENOMEM; r = cg_is_empty_recursive(controller, p); - if (r <= 0) + if (r <= 0) + return r; + } + if (r < 0) return r; - } - if (r < 0) - return r; return true; } @@ -1151,7 +1159,7 @@ int cg_mangle_path(const char *path, char **result) { if (r < 0) return r; - return cg_get_path(c ? c : ELOGIND_CGROUP_CONTROLLER, p ? p : "/", NULL, result); + return cg_get_path(c ? c : SYSTEMD_CGROUP_CONTROLLER, p ? p : "/", NULL, result); } int cg_get_root_path(char **path) { @@ -1162,7 +1170,7 @@ int cg_get_root_path(char **path) { assert(path); - r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, &p); + r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, &p); if (r < 0) return r; @@ -1178,7 +1186,7 @@ int cg_get_root_path(char **path) { return 0; #else assert(path); - return cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, 1, path); + return cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 1, path); #endif // 0 } @@ -1199,10 +1207,11 @@ int cg_shift_path(const char *cgroup, const char *root, const char **shifted) { return r; root = rt; + log_debug_elogind("Determined root path: \"%s\"", root); } p = path_startswith(cgroup, root); - if (p && p > cgroup) + if (p && p[0] && (p > cgroup)) *shifted = p - 1; else *shifted = cgroup; @@ -1218,10 +1227,12 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) { assert(pid >= 0); assert(cgroup); - r = cg_pid_get_path(ELOGIND_CGROUP_CONTROLLER, pid, &raw); + r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, pid, &raw); if (r < 0) return r; + log_debug_elogind("Shifting path: \"%s\" (PID %u, root: \"%s\")", + raw, pid, root ? root : "NULL"); r = cg_shift_path(raw, root, &c); if (r < 0) return r; @@ -1238,6 +1249,7 @@ int cg_pid_get_path_shifted(pid_t pid, const char *root, char **cgroup) { *cgroup = n; } + log_debug_elogind("Resulting cgroup:\"%s\"", *cgroup); return 0; } @@ -1522,6 +1534,7 @@ int cg_path_get_session(const char *path, char **session) { const char *e, *n, *start; assert(path); + log_debug_elogind("path is \"%s\"", path); assert(path[0] == '/'); e = path + 1; @@ -1539,6 +1552,7 @@ int cg_path_get_session(const char *path, char **session) { if (session) { char *rr; + log_debug_elogind("found session: \"%s\"", start); rr = strdup(start); if (!rr) return -ENOMEM; @@ -1715,7 +1729,7 @@ char *cg_escape(const char *p) { if (memcmp(p, n, l) != 0) continue; - need_prefix = true; + need_prefix = true; break; } } @@ -1724,7 +1738,7 @@ char *cg_escape(const char *p) { if (need_prefix) return strappend("_", p); - return strdup(p); + return strdup(p); } char *cg_unescape(const char *p) { @@ -1846,7 +1860,7 @@ int cg_set_attribute(const char *controller, const char *path, const char *attri if (r < 0) return r; - return write_string_file_no_create(p, value); + return write_string_file(p, value, 0); } /// UNNEEDED by elogind @@ -1871,7 +1885,7 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path * in all others */ /* First create the cgroup in our own hierarchy. */ - r = cg_create(ELOGIND_CGROUP_CONTROLLER, path); + r = cg_create(SYSTEMD_CGROUP_CONTROLLER, path); if (r < 0) return r; @@ -1897,13 +1911,12 @@ int cg_create_everywhere(CGroupMask supported, CGroupMask mask, const char *path return 0; } -#endif // 0 int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_migrate_callback_t path_callback, void *userdata) { CGroupController c; int r, unified; - r = cg_attach(ELOGIND_CGROUP_CONTROLLER, path, pid); + r = cg_attach(SYSTEMD_CGROUP_CONTROLLER, path, pid); if (r < 0) return r; @@ -1932,8 +1945,6 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m return 0; } -/// UNNEEDED by elogind -#if 0 int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t path_callback, void *userdata) { Iterator i; void *pidp; @@ -1956,7 +1967,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to int r = 0, unified; if (!path_equal(from, to)) { - r = cg_migrate_recursive(ELOGIND_CGROUP_CONTROLLER, from, ELOGIND_CGROUP_CONTROLLER, to, false, true); + r = cg_migrate_recursive(SYSTEMD_CGROUP_CONTROLLER, from, SYSTEMD_CGROUP_CONTROLLER, to, false, true); if (r < 0) return r; } @@ -1980,7 +1991,7 @@ int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to if (!p) p = to; - (void) cg_migrate_recursive_fallback(ELOGIND_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false); + (void) cg_migrate_recursive_fallback(SYSTEMD_CGROUP_CONTROLLER, to, cgroup_controller_to_string(c), p, false, false); } return 0; @@ -1990,7 +2001,7 @@ int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root) CGroupController c; int r, unified; - r = cg_trim(ELOGIND_CGROUP_CONTROLLER, path, delete_root); + r = cg_trim(SYSTEMD_CGROUP_CONTROLLER, path, delete_root); if (r < 0) return r; @@ -2036,7 +2047,7 @@ int cg_mask_supported(CGroupMask *ret) { if (r < 0) return r; - r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, root, "cgroup.controllers", &path); + r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, root, "cgroup.controllers", &path); if (r < 0) return r; @@ -2062,9 +2073,10 @@ int cg_mask_supported(CGroupMask *ret) { mask |= CGROUP_CONTROLLER_TO_MASK(v); } - /* Currently, we only support the memory controller in - * the unified hierarchy, mask everything else off. */ - mask &= CGROUP_MASK_MEMORY; + /* Currently, we only support the memory and pids + * controller in the unified hierarchy, mask + * everything else off. */ + mask &= CGROUP_MASK_MEMORY | CGROUP_MASK_PIDS; } else { CGroupController c; @@ -2171,7 +2183,7 @@ int cg_unified(void) { else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) #else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) -#endif // elogind +#endif // 0 unified_cache = false; else return -ENOEXEC; @@ -2201,7 +2213,7 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) { if (!unified) /* on the legacy hiearchy there's no joining of controllers defined */ return 0; - r = cg_get_path(ELOGIND_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs); + r = cg_get_path(SYSTEMD_CGROUP_CONTROLLER, p, "cgroup.subtree_control", &fs); if (r < 0) return r; @@ -2227,7 +2239,6 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) { return 0; } -#endif // 0 bool cg_is_unified_wanted(void) { static thread_local int wanted = -1; @@ -2261,11 +2272,56 @@ bool cg_is_unified_wanted(void) { } } -/// UNNEEDED by elogind -#if 0 bool cg_is_legacy_wanted(void) { return !cg_is_unified_wanted(); } +#else +bool cg_is_legacy_wanted(void) { + return true; +} +#endif // 0 + +/// UNNEEDED by elogind +#if 0 +int cg_cpu_shares_parse(const char *s, uint64_t *ret) { + uint64_t u; + int r; + + if (isempty(s)) { + *ret = CGROUP_CPU_SHARES_INVALID; + return 0; + } + + r = safe_atou64(s, &u); + if (r < 0) + return r; + + if (u < CGROUP_CPU_SHARES_MIN || u > CGROUP_CPU_SHARES_MAX) + return -ERANGE; + + *ret = u; + return 0; +} + +int cg_blkio_weight_parse(const char *s, uint64_t *ret) { + uint64_t u; + int r; + + if (isempty(s)) { + *ret = CGROUP_BLKIO_WEIGHT_INVALID; + return 0; + } + + r = safe_atou64(s, &u); + if (r < 0) + return r; + + if (u < CGROUP_BLKIO_WEIGHT_MIN || u > CGROUP_BLKIO_WEIGHT_MAX) + return -ERANGE; + + *ret = u; + return 0; +} #endif // 0 static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = { @@ -2273,7 +2329,9 @@ static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = { [CGROUP_CONTROLLER_CPUACCT] = "cpuacct", [CGROUP_CONTROLLER_BLKIO] = "blkio", [CGROUP_CONTROLLER_MEMORY] = "memory", - [CGROUP_CONTROLLER_DEVICE] = "devices", + [CGROUP_CONTROLLER_DEVICES] = "devices", + [CGROUP_CONTROLLER_PIDS] = "pids", + [CGROUP_CONTROLLER_NET_CLS] = "net_cls", }; DEFINE_STRING_TABLE_LOOKUP(cgroup_controller, CGroupController);