X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;h=3dd4c9129c052d0b271eee6a2183e7656ff4ded7;hb=ecb08ec6a5c52f2d940f3b8147e2a480affd46e1;hp=f0420ebc0944a5f60b64f9e851b142dfcaf82d3c;hpb=bc432dc7eb62c5671f2b741a86a66393adb350dc;p=elogind.git diff --git a/src/core/cgroup.c b/src/core/cgroup.c index f0420ebc0..3dd4c9129 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -20,6 +20,7 @@ ***/ #include +#include #include "path-util.h" #include "special.h" @@ -191,7 +192,85 @@ static int whitelist_device(const char *path, const char *node, const char *acc) return r; } +static int whitelist_major(const char *path, const char *name, char type, const char *acc) { + _cleanup_fclose_ FILE *f = NULL; + char line[LINE_MAX]; + bool good = false; + int r; + + assert(path); + assert(acc); + assert(type == 'b' || type == 'c'); + + f = fopen("/proc/devices", "re"); + if (!f) { + log_warning("Cannot open /proc/devices to resolve %s (%c): %m", name, type); + return -errno; + } + + FOREACH_LINE(line, f, goto fail) { + char buf[2+DECIMAL_STR_MAX(unsigned)+3+4], *p, *w; + unsigned maj; + + truncate_nl(line); + + if (type == 'c' && streq(line, "Character devices:")) { + good = true; + continue; + } + + if (type == 'b' && streq(line, "Block devices:")) { + good = true; + continue; + } + + if (isempty(line)) { + good = false; + continue; + } + + if (!good) + continue; + + p = strstrip(line); + + w = strpbrk(p, WHITESPACE); + if (!w) + continue; + *w = 0; + + r = safe_atou(p, &maj); + if (r < 0) + continue; + if (maj <= 0) + continue; + + w++; + w += strspn(w, WHITESPACE); + + if (fnmatch(name, w, 0) != 0) + continue; + + sprintf(buf, + "%c %u:* %s", + type, + maj, + acc); + + r = cg_set_attribute("devices", path, "devices.allow", buf); + if (r < 0) + log_warning("Failed to set devices.allow on %s: %s", path, strerror(-r)); + } + + return 0; + +fail: + log_warning("Failed to read /proc/devices: %m"); + return -errno; +} + void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const char *path) { + bool is_root; int r; assert(c); @@ -200,7 +279,11 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha if (mask == 0) return; - if (mask & CGROUP_CPU) { + /* Some cgroup attributes are not support on the root cgroup, + * hence silently ignore */ + is_root = isempty(path) || path_equal(path, "/"); + + if ((mask & CGROUP_CPU) && !is_root) { char buf[DECIMAL_STR_MAX(unsigned long) + 1]; sprintf(buf, "%lu\n", c->cpu_shares); @@ -216,23 +299,25 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha CGroupBlockIODeviceWeight *w; CGroupBlockIODeviceBandwidth *b; - sprintf(buf, "%lu\n", c->blockio_weight); - r = cg_set_attribute("blkio", path, "blkio.weight", buf); - if (r < 0) - log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r)); + if (!is_root) { + sprintf(buf, "%lu\n", c->blockio_weight); + r = cg_set_attribute("blkio", path, "blkio.weight", buf); + if (r < 0) + log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r)); - /* FIXME: no way to reset this list */ - LIST_FOREACH(device_weights, w, c->blockio_device_weights) { - dev_t dev; + /* FIXME: no way to reset this list */ + LIST_FOREACH(device_weights, w, c->blockio_device_weights) { + dev_t dev; - r = lookup_blkio_device(w->path, &dev); - if (r < 0) - continue; + r = lookup_blkio_device(w->path, &dev); + if (r < 0) + continue; - sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight); - r = cg_set_attribute("blkio", path, "blkio.weight_device", buf); - if (r < 0) - log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r)); + sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight); + r = cg_set_attribute("blkio", path, "blkio.weight_device", buf); + if (r < 0) + log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r)); + } } /* FIXME: no way to reset this list */ @@ -266,7 +351,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha log_error("Failed to set memory.limit_in_bytes on %s: %s", path, strerror(-r)); } - if (mask & CGROUP_DEVICE) { + if ((mask & CGROUP_DEVICE) && !is_root) { CGroupDeviceAllow *a; if (c->device_allow || c->device_policy != CGROUP_AUTO) @@ -274,21 +359,27 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha else r = cg_set_attribute("devices", path, "devices.allow", "a"); if (r < 0) - log_error("Failed to reset devices.list on %s: %s", path, strerror(-r)); + log_warning("Failed to reset devices.list on %s: %s", path, strerror(-r)); if (c->device_policy == CGROUP_CLOSED || (c->device_policy == CGROUP_AUTO && c->device_allow)) { static const char auto_devices[] = - "/dev/null\0" "rw\0" - "/dev/zero\0" "rw\0" - "/dev/full\0" "rw\0" - "/dev/random\0" "rw\0" - "/dev/urandom\0" "rw\0"; + "/dev/null\0" "rwm\0" + "/dev/zero\0" "rwm\0" + "/dev/full\0" "rwm\0" + "/dev/random\0" "rwm\0" + "/dev/urandom\0" "rwm\0" + "/dev/tty\0" "rwm\0" + "/dev/pts/ptmx\0" "rw\0"; /* /dev/pts/ptmx may not be duplicated, but accessed */ const char *x, *y; NULSTR_FOREACH_PAIR(x, y, auto_devices) whitelist_device(path, x, y); + + whitelist_major(path, "pts", 'c', "rw"); + whitelist_major(path, "kdbus", 'c', "rw"); + whitelist_major(path, "kdbus/*", 'c', "rw"); } LIST_FOREACH(device_allow, a, c->device_allow) { @@ -306,7 +397,15 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha continue; acc[k++] = 0; - whitelist_device(path, a->path, acc); + + if (startswith(a->path, "/dev/")) + whitelist_device(path, a->path, acc); + else if (startswith(a->path, "block-")) + whitelist_major(path, a->path + 6, 'b', acc); + else if (startswith(a->path, "char-")) + whitelist_major(path, a->path + 5, 'c', acc); + else + log_debug("Ignoring device %s while writing cgroup attribute.", a->path); } } } @@ -362,7 +461,7 @@ CGroupControllerMask unit_get_members_mask(Unit *u) { if (member == u) continue; - if (UNIT_DEREF(member->slice) != u) + if (UNIT_DEREF(member->slice) != u) continue; u->cgroup_members_mask |= @@ -448,9 +547,26 @@ void unit_update_cgroup_members_masks(Unit *u) { } } +static const char *migrate_callback(CGroupControllerMask mask, void *userdata) { + Unit *u = userdata; + + assert(mask != 0); + assert(u); + + while (u) { + if (u->cgroup_path && + u->cgroup_realized && + (u->cgroup_realized_mask & mask) == mask) + return u->cgroup_path; + + u = UNIT_DEREF(u->slice); + } + + return NULL; +} + static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) { - _cleanup_free_ char *path; - bool was_in_hash = false; + _cleanup_free_ char *path = NULL; int r; assert(u); @@ -460,38 +576,31 @@ static int unit_create_cgroups(Unit *u, CGroupControllerMask mask) { return log_oom(); r = hashmap_put(u->manager->cgroup_unit, path, u); - if (r == 0) - was_in_hash = true; - else if (r < 0) { - log_error(r == -EEXIST ? - "cgroup %s exists already: %s" : "hashmap_put failed for %s: %s", - path, strerror(-r)); + if (r < 0) { + log_error(r == -EEXIST ? "cgroup %s exists already: %s" : "hashmap_put failed for %s: %s", path, strerror(-r)); return r; } - - /* First, create our own group */ - r = cg_create_everywhere(u->manager->cgroup_supported, mask, path); - if (r < 0) - log_error("Failed to create cgroup %s: %s", path, strerror(-r)); - - /* Then, possibly move things over */ - if (u->cgroup_path) { - r = cg_migrate_everywhere(u->manager->cgroup_supported, u->cgroup_path, path); - if (r < 0) - log_error("Failed to migrate cgroup from %s to %s: %s", - u->cgroup_path, path, strerror(-r)); - } - - if (!was_in_hash) { - /* Remember the new data */ - free(u->cgroup_path); + if (r > 0) { u->cgroup_path = path; path = NULL; } + /* First, create our own group */ + r = cg_create_everywhere(u->manager->cgroup_supported, mask, u->cgroup_path); + if (r < 0) { + log_error("Failed to create cgroup %s: %s", u->cgroup_path, strerror(-r)); + return r; + } + + /* Keep track that this is now realized */ u->cgroup_realized = true; u->cgroup_realized_mask = mask; + /* Then, possibly move things over */ + r = cg_migrate_everywhere(u->manager->cgroup_supported, u->cgroup_path, u->cgroup_path, migrate_callback, u); + if (r < 0) + log_warning("Failed to migrate cgroup from to %s: %s", u->cgroup_path, strerror(-r)); + return 0; } @@ -619,7 +728,7 @@ int unit_realize_cgroup(Unit *u) { * unit, we need to first create all parents, but there's more * actually: for the weight-based controllers we also need to * make sure that all our siblings (i.e. units that are in the - * same slice as we are) have cgroups, too. Otherwise things + * same slice as we are) have cgroups, too. Otherwise, things * would become very uneven as each of their processes would * get as much resources as all our group together. This call * will synchronously create the parent cgroups, but will @@ -759,8 +868,7 @@ int manager_setup_cgroup(Manager *m) { } /* 5. And pin it, so that it cannot be unmounted */ - if (m->pin_cgroupfs_fd >= 0) - close_nointr_nofail(m->pin_cgroupfs_fd); + safe_close(m->pin_cgroupfs_fd); m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); if (r < 0) { @@ -785,10 +893,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) { if (delete && m->cgroup_root) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false); - if (m->pin_cgroupfs_fd >= 0) { - close_nointr_nofail(m->pin_cgroupfs_fd); - m->pin_cgroupfs_fd = -1; - } + m->pin_cgroupfs_fd = safe_close(m->pin_cgroupfs_fd); free(m->cgroup_root); m->cgroup_root = NULL;