diff options
author | Mario Limonciello <mario.limonciello@dell.com> | 2018-03-08 02:41:50 -0600 |
---|---|---|
committer | Mario Limonciello <mario.limonciello@dell.com> | 2018-04-09 13:17:56 -0500 |
commit | 17c40b3a8fbfb797110c88d749bd5d37e6ee6e3c (patch) | |
tree | 70376ccc4a6c11a49c52fb0944001434f05f9a9f /src/sleep | |
parent | c75436067f4b392ecf161e123279720dc5c3b33a (diff) | |
download | systemd-17c40b3a8fbfb797110c88d749bd5d37e6ee6e3c.tar.gz |
sleep: Add support for setting a disk offset when hibernating
The Linux kernel is adding support for configuring the offset
into a disk. This allows swapfiles to be more usable as users
will no longer need to set the offset on their kernel command
line.
Use this API in systemd when hibernating as well.
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Diffstat (limited to 'src/sleep')
-rw-r--r-- | src/sleep/sleep.c | 74 |
1 files changed, 71 insertions, 3 deletions
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 2830b23553..1163a0f56a 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c @@ -4,6 +4,7 @@ Copyright 2012 Lennart Poettering Copyright 2013 Zbigniew Jędrzejewski-Szmek + Copyright 2010-2017 Canonical Copyright 2018 Dell Inc. systemd is free software; you can redistribute it and/or modify it @@ -22,6 +23,7 @@ #include <errno.h> #include <getopt.h> +#include <linux/fiemap.h> #include <stdio.h> #include "sd-messages.h" @@ -40,6 +42,67 @@ static char* arg_verb = NULL; +static int write_hibernate_location_info(void) { + _cleanup_free_ char *device = NULL, *type = NULL; + _cleanup_free_ struct fiemap *fiemap = NULL; + char offset_str[DECIMAL_STR_MAX(uint64_t)]; + char device_str[DECIMAL_STR_MAX(uint64_t)]; + _cleanup_close_ int fd = -1; + struct stat stb; + uint64_t offset; + int r; + + r = find_hibernate_location(&device, &type, NULL, NULL); + if (r < 0) + return log_debug_errno(r, "Unable to find hibernation location: %m"); + + /* if it's a swap partition, we just write the disk to /sys/power/resume */ + if (streq(type, "partition")) + return write_string_file("/sys/power/resume", device, 0); + else if (!streq(type, "file")) + return log_debug_errno(EINVAL, "Invalid hibernate type %s: %m", + type); + + /* Only available in 4.17+ */ + if (access("/sys/power/resume_offset", F_OK) < 0) { + if (errno == ENOENT) + return 0; + return log_debug_errno(errno, "/sys/power/resume_offset unavailable: %m"); + } + + r = access("/sys/power/resume_offset", W_OK); + if (r < 0) + return log_debug_errno(errno, "/sys/power/resume_offset not writeable: %m"); + + fd = open(device, O_RDONLY | O_CLOEXEC | O_NONBLOCK); + if (fd < 0) + return log_debug_errno(errno, "Unable to open '%s': %m", device); + r = fstat(fd, &stb); + if (r < 0) + return log_debug_errno(errno, "Unable to stat %s: %m", device); + r = read_fiemap(fd, &fiemap); + if (r < 0) + return log_debug_errno(r, "Unable to read extent map for '%s': %m", + device); + if (fiemap->fm_mapped_extents == 0) { + log_debug("No extents found in '%s'", device); + return -EINVAL; + } + offset = fiemap->fm_extents[0].fe_physical / page_size(); + xsprintf(offset_str, "%" PRIu64, offset); + r = write_string_file("/sys/power/resume_offset", offset_str, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write offset '%s': %m", + offset_str); + + xsprintf(device_str, "%lx", (unsigned long)stb.st_dev); + r = write_string_file("/sys/power/resume", device_str, 0); + if (r < 0) + return log_debug_errno(r, "Failed to write device '%s': %m", + device_str); + return 0; +} + static int write_mode(char **modes) { int r = 0; char **mode; @@ -110,9 +173,14 @@ static int execute(char **modes, char **states) { return log_error_errno(errno, "Failed to open /sys/power/state: %m"); /* Configure the hibernation mode */ - r = write_mode(modes); - if (r < 0) - return r; + if (!strv_isempty(modes)) { + r = write_hibernate_location_info(); + if (r < 0) + return log_error_errno(r, "Failed to write hibernation disk offset: %m"); + r = write_mode(modes); + if (r < 0) + return r; + } execute_directories(dirs, DEFAULT_TIMEOUT_USEC, NULL, NULL, arguments); |