X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fcgroup.c;h=db8b4d7705c053c66e73cffb078de29a6f84bbf1;hp=80a55755a579402604f568f1e0a8a9bafe66e8b4;hb=0d8c31ff7237149b505290652864b4e7e866b2a7;hpb=95ae05c0e79868c22b3e8e6fbc53432786876730 diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 80a55755a..db8b4d770 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -27,23 +27,21 @@ #include "cgroup-util.h" #include "cgroup.h" +#define CGROUP_CPU_QUOTA_PERIOD_USEC ((usec_t) 100 * USEC_PER_MSEC) + void cgroup_context_init(CGroupContext *c) { assert(c); /* Initialize everything to the kernel defaults, assuming the * structure is preinitialized to 0 */ - c->cpu_shares = 1024; - c->startup_cpu_shares = 1024; - c->startup_cpu_shares_set = false; + c->cpu_shares = (unsigned long) -1; + c->startup_cpu_shares = (unsigned long) -1; c->memory_limit = (uint64_t) -1; - c->blockio_weight = 1000; - c->startup_blockio_weight = 1000; - c->startup_blockio_weight_set = false; + c->blockio_weight = (unsigned long) -1; + c->startup_blockio_weight = (unsigned long) -1; c->cpu_quota_per_sec_usec = (usec_t) -1; - c->cpu_quota_usec = (usec_t) -1; - c->cpu_quota_period_usec = 100*USEC_PER_MSEC; } void cgroup_context_free_device_allow(CGroupContext *c, CGroupDeviceAllow *a) { @@ -86,37 +84,11 @@ void cgroup_context_done(CGroupContext *c) { cgroup_context_free_device_allow(c, c->device_allow); } -usec_t cgroup_context_get_cpu_quota_usec(CGroupContext *c) { - assert(c); - - /* Returns the absolute CPU quota */ - - if (c->cpu_quota_usec != (usec_t) -1) - return c->cpu_quota_usec; - else if (c->cpu_quota_per_sec_usec != (usec_t) -1) - return c->cpu_quota_per_sec_usec*c->cpu_quota_period_usec/USEC_PER_SEC; - else - return (usec_t) -1; -} - -usec_t cgroup_context_get_cpu_quota_per_sec_usec(CGroupContext *c) { - assert(c); - - /* Returns the CPU quota relative to 1s */ - - if (c->cpu_quota_usec != (usec_t) -1) - return c->cpu_quota_usec*USEC_PER_SEC/c->cpu_quota_period_usec; - else if (c->cpu_quota_per_sec_usec != (usec_t) -1) - return c->cpu_quota_per_sec_usec; - else - return (usec_t) -1; -} - void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix) { CGroupBlockIODeviceBandwidth *b; CGroupBlockIODeviceWeight *w; CGroupDeviceAllow *a; - char t[FORMAT_TIMESPAN_MAX], s[FORMAT_TIMESPAN_MAX], u[FORMAT_TIMESPAN_MAX]; + char u[FORMAT_TIMESPAN_MAX]; assert(c); assert(f); @@ -129,9 +101,7 @@ void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix) { "%sMemoryAccounting=%s\n" "%sCPUShares=%lu\n" "%sStartupCPUShares=%lu\n" - "%sCPUQuota=%s\n" "%sCPUQuotaPerSecSec=%s\n" - "%sCPUQuotaPeriodSec=%s\n" "%sBlockIOWeight=%lu\n" "%sStartupBlockIOWeight=%lu\n" "%sMemoryLimit=%" PRIu64 "\n" @@ -141,9 +111,7 @@ void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix) { prefix, yes_no(c->memory_accounting), prefix, c->cpu_shares, prefix, c->startup_cpu_shares, - prefix, strna(format_timespan(u, sizeof(u), cgroup_context_get_cpu_quota_usec(c), 1)), - prefix, strna(format_timespan(t, sizeof(t), cgroup_context_get_cpu_quota_per_sec_usec(c), 1)), - prefix, strna(format_timespan(s, sizeof(s), c->cpu_quota_period_usec, 1)), + prefix, strna(format_timespan(u, sizeof(u), c->cpu_quota_per_sec_usec, 1)), prefix, c->blockio_weight, prefix, c->startup_blockio_weight, prefix, c->memory_limit, @@ -314,7 +282,7 @@ fail: return -errno; } -void cgroup_context_apply(Manager *m, CGroupContext *c, CGroupControllerMask mask, const char *path) { +void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const char *path, ManagerState state) { bool is_root; int r; @@ -330,23 +298,21 @@ void cgroup_context_apply(Manager *m, CGroupContext *c, CGroupControllerMask mas if ((mask & CGROUP_CPU) && !is_root) { char buf[MAX(DECIMAL_STR_MAX(unsigned long), DECIMAL_STR_MAX(usec_t)) + 1]; - usec_t q; - sprintf(buf, "%lu\n", manager_state(m) == MANAGER_STARTING - ? c->startup_cpu_shares - : c->cpu_shares); + sprintf(buf, "%lu\n", + state == MANAGER_STARTING && c->startup_cpu_shares != (unsigned long) -1 ? c->startup_cpu_shares : + c->cpu_shares != (unsigned long) -1 ? c->cpu_shares : 1024); r = cg_set_attribute("cpu", path, "cpu.shares", buf); if (r < 0) log_warning("Failed to set cpu.shares on %s: %s", path, strerror(-r)); - sprintf(buf, USEC_FMT "\n", c->cpu_quota_period_usec); + sprintf(buf, USEC_FMT "\n", CGROUP_CPU_QUOTA_PERIOD_USEC); r = cg_set_attribute("cpu", path, "cpu.cfs_period_us", buf); if (r < 0) log_warning("Failed to set cpu.cfs_period_us on %s: %s", path, strerror(-r)); - q = cgroup_context_get_cpu_quota_usec(c); - if (q != (usec_t) -1) { - sprintf(buf, USEC_FMT "\n", q); + if (c->cpu_quota_per_sec_usec != (usec_t) -1) { + sprintf(buf, USEC_FMT "\n", c->cpu_quota_per_sec_usec * CGROUP_CPU_QUOTA_PERIOD_USEC / USEC_PER_SEC); r = cg_set_attribute("cpu", path, "cpu.cfs_quota_us", buf); } else r = cg_set_attribute("cpu", path, "cpu.cfs_quota_us", "-1"); @@ -362,9 +328,8 @@ void cgroup_context_apply(Manager *m, CGroupContext *c, CGroupControllerMask mas CGroupBlockIODeviceBandwidth *b; if (!is_root) { - sprintf(buf, "%lu\n", manager_state(m) == MANAGER_STARTING - ? c->startup_blockio_weight - : c->blockio_weight); + sprintf(buf, "%lu\n", state == MANAGER_STARTING && c->startup_blockio_weight != (unsigned long) -1 ? c->startup_blockio_weight : + c->blockio_weight != (unsigned long) -1 ? c->blockio_weight : 1000); 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)); @@ -474,30 +439,23 @@ void cgroup_context_apply(Manager *m, CGroupContext *c, CGroupControllerMask mas } } -CGroupControllerMask cgroup_context_get_mask(Manager *m, CGroupContext *c) { +CGroupControllerMask cgroup_context_get_mask(CGroupContext *c) { CGroupControllerMask mask = 0; /* Figure out which controllers we need */ if (c->cpu_accounting || - (manager_state(m) == MANAGER_STARTING ? c->startup_cpu_shares : c->cpu_shares) != 1024 || - (manager_state(m) != MANAGER_STARTING && c->startup_cpu_shares_set && c->startup_cpu_shares != c->cpu_shares) || - c->cpu_quota_usec != (usec_t) -1 || - c->cpu_quota_per_sec_usec != (usec_t) -1) { + c->cpu_shares != (unsigned long) -1 || + c->startup_cpu_shares != (unsigned long) -1 || + c->cpu_quota_per_sec_usec != (usec_t) -1) mask |= CGROUP_CPUACCT | CGROUP_CPU; - if (manager_state(m) != MANAGER_STARTING) - c->startup_cpu_shares_set = false; - } if (c->blockio_accounting || - (manager_state(m) == MANAGER_STARTING ? c->startup_blockio_weight : c->blockio_weight) != 1000 || - (manager_state(m) != MANAGER_STARTING && c->startup_blockio_weight_set && c->startup_blockio_weight != c->blockio_weight) || + c->blockio_weight != (unsigned long) -1 || + c->startup_blockio_weight != (unsigned long) -1 || c->blockio_device_weights || - c->blockio_device_bandwidths) { + c->blockio_device_bandwidths) mask |= CGROUP_BLKIO; - if (manager_state(m) != MANAGER_STARTING) - c->startup_blockio_weight_set = false; - } if (c->memory_accounting || c->memory_limit != (uint64_t) -1) @@ -516,7 +474,7 @@ CGroupControllerMask unit_get_cgroup_mask(Unit *u) { if (!c) return 0; - return cgroup_context_get_mask(u->manager, c); + return cgroup_context_get_mask(c); } CGroupControllerMask unit_get_members_mask(Unit *u) { @@ -550,18 +508,12 @@ CGroupControllerMask unit_get_members_mask(Unit *u) { } CGroupControllerMask unit_get_siblings_mask(Unit *u) { - CGroupControllerMask m; - assert(u); if (UNIT_ISSET(u->slice)) - m = unit_get_members_mask(UNIT_DEREF(u->slice)); - else - m = unit_get_cgroup_mask(u) | unit_get_members_mask(u); + return unit_get_members_mask(UNIT_DEREF(u->slice)); - /* Sibling propagation is only relevant for weight-based - * controllers, so let's mask out everything else */ - return m & (CGROUP_CPU|CGROUP_BLKIO|CGROUP_CPUACCT); + return unit_get_cgroup_mask(u) | unit_get_members_mask(u); } CGroupControllerMask unit_get_target_mask(Unit *u) { @@ -691,7 +643,7 @@ static bool unit_has_mask_realized(Unit *u, CGroupControllerMask mask) { * If not, create paths, move processes over, and set attributes. * * Returns 0 on success and < 0 on failure. */ -static int unit_realize_cgroup_now(Unit *u) { +static int unit_realize_cgroup_now(Unit *u, ManagerState state) { CGroupControllerMask mask; int r; @@ -709,7 +661,7 @@ static int unit_realize_cgroup_now(Unit *u) { /* First, realize parents */ if (UNIT_ISSET(u->slice)) { - r = unit_realize_cgroup_now(UNIT_DEREF(u->slice)); + r = unit_realize_cgroup_now(UNIT_DEREF(u->slice), state); if (r < 0) return r; } @@ -720,7 +672,7 @@ static int unit_realize_cgroup_now(Unit *u) { return r; /* Finally, apply the necessary attributes. */ - cgroup_context_apply(u->manager, unit_get_cgroup_context(u), mask, u->cgroup_path); + cgroup_context_apply(unit_get_cgroup_context(u), mask, u->cgroup_path, state); return 0; } @@ -735,14 +687,17 @@ static void unit_add_to_cgroup_queue(Unit *u) { } unsigned manager_dispatch_cgroup_queue(Manager *m) { - Unit *i; + ManagerState state; unsigned n = 0; + Unit *i; int r; + state = manager_state(m); + while ((i = m->cgroup_queue)) { assert(i->in_cgroup_queue); - r = unit_realize_cgroup_now(i); + r = unit_realize_cgroup_now(i, state); if (r < 0) log_warning("Failed to realize cgroups for queued unit %s: %s", i->id, strerror(-r)); @@ -814,7 +769,7 @@ int unit_realize_cgroup(Unit *u) { unit_queue_siblings(u); /* And realize this one now (and apply the values) */ - return unit_realize_cgroup_now(u); + return unit_realize_cgroup_now(u, manager_state(u->manager)); } void unit_destroy_cgroup(Unit *u) { @@ -877,7 +832,6 @@ pid_t unit_search_main_pid(Unit *u) { int manager_setup_cgroup(Manager *m) { _cleanup_free_ char *path = NULL; - char *e; int r; assert(m); @@ -896,6 +850,8 @@ int manager_setup_cgroup(Manager *m) { * off. This is to support live upgrades from older systemd * versions where PID 1 was moved there. */ if (m->running_as == SYSTEMD_SYSTEM) { + char *e; + e = endswith(m->cgroup_root, "/" SPECIAL_SYSTEM_SLICE); if (!e) e = endswith(m->cgroup_root, "/system"); @@ -917,40 +873,42 @@ int manager_setup_cgroup(Manager *m) { } log_debug("Using cgroup controller " SYSTEMD_CGROUP_CONTROLLER ". File system hierarchy is at %s.", path); + if (!m->test_run) { - /* 3. Install agent */ - if (m->running_as == SYSTEMD_SYSTEM) { - r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); - if (r < 0) - log_warning("Failed to install release agent, ignoring: %s", strerror(-r)); - else if (r > 0) - log_debug("Installed release agent."); - else - log_debug("Release agent already installed."); - } + /* 3. Install agent */ + if (m->running_as == SYSTEMD_SYSTEM) { + r = cg_install_release_agent(SYSTEMD_CGROUP_CONTROLLER, SYSTEMD_CGROUP_AGENT_PATH); + if (r < 0) + log_warning("Failed to install release agent, ignoring: %s", strerror(-r)); + else if (r > 0) + log_debug("Installed release agent."); + else + log_debug("Release agent already installed."); + } - /* 4. Make sure we are in the root cgroup */ - r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0); - if (r < 0) { - log_error("Failed to create root cgroup hierarchy: %s", strerror(-r)); - return r; - } + /* 4. Make sure we are in the root cgroup */ + r = cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, 0); + if (r < 0) { + log_error("Failed to create root cgroup hierarchy: %s", strerror(-r)); + return r; + } - /* 5. And pin it, so that it cannot be unmounted */ - safe_close(m->pin_cgroupfs_fd); + /* 5. And pin it, so that it cannot be unmounted */ + safe_close(m->pin_cgroupfs_fd); - m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); - if (m->pin_cgroupfs_fd < 0) { - log_error("Failed to open pin file: %m"); - return -errno; + m->pin_cgroupfs_fd = open(path, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); + if (m->pin_cgroupfs_fd < 0) { + log_error("Failed to open pin file: %m"); + return -errno; + } + + /* 6. Always enable hierarchial support if it exists... */ + cg_set_attribute("memory", "/", "memory.use_hierarchy", "1"); } - /* 6. Figure out which controllers are supported */ + /* 7. Figure out which controllers are supported */ m->cgroup_supported = cg_mask_supported(); - /* 7. Always enable hierarchial support if it exists... */ - cg_set_attribute("memory", "/", "memory.use_hierarchy", "1"); - return 0; }