X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fswap.c;h=1add722bf13db58cf4869f63380cebd90c493bf8;hb=45071fcaa03eafc27352987fa2277b2792725036;hp=b88a914f72b9138b499cba2d374a502d9cdce858;hpb=d5099efc47d4e6ac60816b5381a5f607ab03f06e;p=elogind.git diff --git a/src/core/swap.c b/src/core/swap.c index b88a914f7..1add722bf 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -152,6 +152,9 @@ static void swap_done(Unit *u) { free(s->parameters_fragment.what); s->parameters_fragment.what = NULL; + free(s->parameters_fragment.options); + s->parameters_fragment.options = NULL; + s->exec_runtime = exec_runtime_unref(s->exec_runtime); exec_command_done_array(s->exec_command, _SWAP_EXEC_COMMAND_MAX); s->control_command = NULL; @@ -188,20 +191,16 @@ static int swap_arm_timer(Swap *s) { } static int swap_add_device_links(Swap *s) { - SwapParameters *p; - assert(s); if (!s->what) return 0; - if (s->from_fragment) - p = &s->parameters_fragment; - else + if (!s->from_fragment) return 0; if (is_device_path(s->what)) - return unit_add_node_link(UNIT(s), s->what, !p->noauto && UNIT(s)->manager->running_as == SYSTEMD_SYSTEM); + return unit_add_node_link(UNIT(s), s->what, UNIT(s)->manager->running_as == SYSTEMD_SYSTEM); else /* File based swap devices need to be ordered after * systemd-remount-fs.service, since they might need a @@ -210,7 +209,6 @@ static int swap_add_device_links(Swap *s) { } static int swap_add_default_dependencies(Swap *s) { - bool nofail = false, noauto = false; int r; assert(s); @@ -225,23 +223,15 @@ static int swap_add_default_dependencies(Swap *s) { if (r < 0) return r; - if (s->from_fragment) { - SwapParameters *p = &s->parameters_fragment; - - nofail = p->nofail; - noauto = p->noauto; - } - - if (!noauto) { - if (nofail) - r = unit_add_dependency_by_name_inverse(UNIT(s), UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true); - else - r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true); - if (r < 0) - return r; - } + if (!s->from_fragment) + /* The swap unit can either be for an alternative device name, in which + * case we don't need to add the dependency on swap.target because this unit + * is following a different unit which will have this dependency added, + * or it can be derived from /proc/swaps, in which case it was started + * manually, and should not become a dependency of swap.target. */ + return 0; - return 0; + return unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true); } static int swap_verify(Swap *s) { @@ -366,8 +356,6 @@ static int swap_add_one( const char *what, const char *what_proc_swaps, int priority, - bool noauto, - bool nofail, bool set_flags) { _cleanup_free_ char *e = NULL; @@ -430,8 +418,6 @@ static int swap_add_one( SWAP(u)->from_proc_swaps = true; p->priority = priority; - p->noauto = noauto; - p->nofail = nofail; unit_add_to_dbus_queue(u); @@ -455,7 +441,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool assert(m); - r = swap_add_one(m, device, device, prio, false, false, set_flags); + r = swap_add_one(m, device, device, prio, set_flags); if (r < 0) return r; @@ -471,7 +457,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool /* Add the main device node */ dn = udev_device_get_devnode(d); if (dn && !streq(dn, device)) - swap_add_one(m, dn, device, prio, false, false, set_flags); + swap_add_one(m, dn, device, prio, set_flags); /* Add additional units for all symlinks */ first = udev_device_get_devlinks_list_entry(d); @@ -492,7 +478,7 @@ static int swap_process_new_swap(Manager *m, const char *device, int prio, bool st.st_rdev != udev_device_get_devnum(d)) continue; - swap_add_one(m, p, device, prio, false, false, set_flags); + swap_add_one(m, p, device, prio, set_flags); } return r; @@ -601,11 +587,9 @@ static void swap_dump(Unit *u, FILE *f, const char *prefix) { if (p) fprintf(f, "%sPriority: %i\n" - "%sNoAuto: %s\n" - "%sNoFail: %s\n", + "%sOptions: %s\n", prefix, p->priority, - prefix, yes_no(p->noauto), - prefix, yes_no(p->nofail)); + prefix, strempty(p->options)); if (s->control_pid > 0) fprintf(f, @@ -703,7 +687,8 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) { r = unit_kill_context( UNIT(s), &s->kill_context, - state != SWAP_ACTIVATING_SIGTERM && state != SWAP_DEACTIVATING_SIGTERM, + (state != SWAP_ACTIVATING_SIGTERM && state != SWAP_DEACTIVATING_SIGTERM) ? + KILL_KILL : KILL_TERMINATE, -1, s->control_pid, false); @@ -732,38 +717,115 @@ fail: swap_enter_dead(s, SWAP_FAILURE_RESOURCES); } +static int mount_find_pri(const char *options, int *ret) { + const char *opt; + char *end; + unsigned long r; + + assert(ret); + + if (!options) + return 0; + + opt = mount_test_option(options, "pri"); + if (!opt) + return 0; + + opt += strlen("pri"); + if (*opt != '=') + return -EINVAL; + + errno = 0; + r = strtoul(opt + 1, &end, 10); + if (errno > 0) + return -errno; + + if (end == opt + 1 || (*end != ',' && *end != 0)) + return -EINVAL; + + *ret = (int) r; + return 1; +} + +static int mount_find_discard(const char *options, char **ret) { + const char *opt; + char *ans; + size_t len; + + assert(ret); + + if (!options) + return 0; + + opt = mount_test_option(options, "discard"); + if (!opt) + return 0; + + opt += strlen("discard"); + if (*opt == ',' || *opt == '\0') + ans = strdup("all"); + else { + if (*opt != '=') + return -EINVAL; + + len = strcspn(opt + 1, ","); + if (len == 0) + return -EINVAL; + + ans = strndup(opt + 1, len); + } + + if (!ans) + return -ENOMEM; + + *ret = ans; + return 1; +} + static void swap_enter_activating(Swap *s) { - int r, priority; + _cleanup_free_ char *discard = NULL; + int r, priority = -1; assert(s); s->control_command_id = SWAP_EXEC_ACTIVATE; s->control_command = s->exec_command + SWAP_EXEC_ACTIVATE; - if (s->from_fragment) + if (s->from_fragment) { + mount_find_discard(s->parameters_fragment.options, &discard); + priority = s->parameters_fragment.priority; - else - priority = -1; + if (priority < 0) + mount_find_pri(s->parameters_fragment.options, &priority); + } + + r = exec_command_set(s->control_command, "/sbin/swapon", NULL); + if (r < 0) + goto fail; if (priority >= 0) { char p[DECIMAL_STR_MAX(int)]; sprintf(p, "%i", priority); + r = exec_command_append(s->control_command, "-p", p, NULL); + if (r < 0) + goto fail; + } - r = exec_command_set( - s->control_command, - "/sbin/swapon", - "-p", - p, - s->what, - NULL); - } else - r = exec_command_set( - s->control_command, - "/sbin/swapon", - s->what, - NULL); + if (discard && !streq(discard, "none")) { + const char *discard_arg; + + if (streq(discard, "all")) + discard_arg = "--discard"; + else + discard_arg = strappenda("--discard=", discard); + r = exec_command_append(s->control_command, discard_arg, NULL); + if (r < 0) + goto fail; + } + + r = exec_command_append(s->control_command, s->what, NULL); if (r < 0) goto fail; @@ -1193,11 +1255,25 @@ static Unit *swap_following(Unit *u) { assert(s); - if (streq_ptr(s->what, s->devnode)) + /* If the user configured the swap through /etc/fstab or + * a device unit, follow that. */ + + if (s->from_fragment) return NULL; - /* Make everybody follow the unit that's named after the swap - * device in the kernel */ + LIST_FOREACH_AFTER(same_devnode, other, s) + if (other->from_fragment) + return UNIT(other); + + LIST_FOREACH_BEFORE(same_devnode, other, s) + if (other->from_fragment) + return UNIT(other); + + /* Otherwise make everybody follow the unit that's named after + * the swap device in the kernel */ + + if (streq_ptr(s->what, s->devnode)) + return NULL; LIST_FOREACH_AFTER(same_devnode, other, s) if (streq_ptr(other->what, other->devnode)) @@ -1210,6 +1286,7 @@ static Unit *swap_following(Unit *u) { first = other; } + /* Fall back to the first on the list */ return UNIT(first); }