SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10262 from keszybz/hibres-disable

Browse Source 
Switches to disable hibernation and/or resuming
This commit is contained in:
Lennart Poettering
2018-10-08 21:39:54 +02:00
committed by GitHub
parent 3ccf61268f 9259d0e23e
commit 1634ebb54a
18 changed files with 406 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/bootspec.c
+54 -15
View File
@@ -23,7 +23,8 @@
void boot_entry_free(BootEntry *entry) {
assert(entry);
free(entry->filename);
free(entry->id);
free(entry->path);
free(entry->title);
free(entry->show_title);
free(entry->version);
@@ -53,8 +54,12 @@ int boot_entry_load(const char *path, BootEntry *entry) {
}
b = basename(path);
tmp.filename = strndup(b, c - b);
if (!tmp.filename)
tmp.id = strndup(b, c - b);
if (!tmp.id)
return log_oom();
tmp.path = strdup(path);
if (!tmp.path)
return log_oom();
f = fopen(path, "re");
@@ -203,7 +208,7 @@ int boot_loader_read_conf(const char *path, BootConfig *config) {
}
static int boot_entry_compare(const BootEntry *a, const BootEntry *b) {
return str_verscmp(a->filename, b->filename);
return str_verscmp(a->id, b->id);
}
int boot_entries_find(const char *dir, BootEntry **ret_entries, size_t *ret_n_entries) {
@@ -300,7 +305,7 @@ static int boot_entries_uniquify(BootEntry *entries, size_t n_entries) {
/* Add file name to non-unique titles */
for (i = 0; i < n_entries; i++)
if (arr[i]) {
r = asprintf(&s, "%s (%s)", boot_entry_title(entries + i), entries[i].filename);
r = asprintf(&s, "%s (%s)", boot_entry_title(entries + i), entries[i].id);
if (r < 0)
return -ENOMEM;
@@ -317,30 +322,30 @@ static int boot_entries_select_default(const BootConfig *config) {
if (config->entry_oneshot)
for (i = config->n_entries - 1; i >= 0; i--)
if (streq(config->entry_oneshot, config->entries[i].filename)) {
log_debug("Found default: filename \"%s\" is matched by LoaderEntryOneShot",
config->entries[i].filename);
if (streq(config->entry_oneshot, config->entries[i].id)) {
log_debug("Found default: id \"%s\" is matched by LoaderEntryOneShot",
config->entries[i].id);
return i;
}
if (config->entry_default)
for (i = config->n_entries - 1; i >= 0; i--)
if (streq(config->entry_default, config->entries[i].filename)) {
log_debug("Found default: filename \"%s\" is matched by LoaderEntryDefault",
config->entries[i].filename);
if (streq(config->entry_default, config->entries[i].id)) {
log_debug("Found default: id \"%s\" is matched by LoaderEntryDefault",
config->entries[i].id);
return i;
}
if (config->default_pattern)
for (i = config->n_entries - 1; i >= 0; i--)
if (fnmatch(config->default_pattern, config->entries[i].filename, FNM_CASEFOLD) == 0) {
log_debug("Found default: filename \"%s\" is matched by pattern \"%s\"",
config->entries[i].filename, config->default_pattern);
if (fnmatch(config->default_pattern, config->entries[i].id, FNM_CASEFOLD) == 0) {
log_debug("Found default: id \"%s\" is matched by pattern \"%s\"",
config->entries[i].id, config->default_pattern);
return i;
}
if (config->n_entries > 0)
log_debug("Found default: last entry \"%s\"", config->entries[config->n_entries - 1].filename);
log_debug("Found default: last entry \"%s\"", config->entries[config->n_entries - 1].id);
else
log_debug("Found no default boot entry :(");
@@ -598,3 +603,37 @@ found:
return 0;
}
int find_default_boot_entry(
const char *esp_path,
char **esp_where,
BootConfig *config,
const BootEntry **e) {
_cleanup_free_ char *where = NULL;
int r;
assert(config);
assert(e);
r = find_esp_and_warn(esp_path, false, &where, NULL, NULL, NULL, NULL);
if (r < 0)
return r;
r = boot_entries_load_config(where, config);
if (r < 0)
return log_error_errno(r, "Failed to load bootspec config from \"%s/loader\": %m", where);
if (config->default_entry < 0) {
log_error("No entry suitable as default, refusing to guess.");
return -ENOENT;
}
*e = &config->entries[config->default_entry];
log_debug("Found default boot entry in file \"%s\"", (*e)->path);
if (esp_where)
*esp_where = TAKE_PTR(where);
return 0;
}
src/shared/bootspec.h
+10 -4
View File
@@ -2,11 +2,15 @@
#pragma once
#include <stdlib.h>
#include <inttypes.h>
#include <stdbool.h>
#include <sys/types.h>
#include "sd-id128.h"
typedef struct BootEntry {
char *filename;
char *id; /* This is the file basename without extension */
char *path; /* This is the full path to the file */
char *title;
char *show_title;
char *version;
@@ -44,7 +48,9 @@ void boot_config_free(BootConfig *config);
int boot_entries_load_config(const char *esp_path, BootConfig *config);
static inline const char* boot_entry_title(const BootEntry *entry) {
return entry->show_title ?: entry->title ?: entry->filename;
return entry->show_title ?: entry->title ?: entry->id;
}
int find_esp_and_warn(const char *path, bool unprivileged_mode, char **ret_path, uint32_t *ret_part, uint64_t *ret_pstart, uint64_t *ret_psize, sd_id128_t *ret_uuid);
int find_default_boot_entry(const char *esp_path, char **esp_where, BootConfig *config, const BootEntry **e);
src/shared/sleep-config.c
+147 -26
View File
@@ -16,6 +16,7 @@
#include "sd-id128.h"
#include "alloc-util.h"
#include "bootspec.h"
#include "conf-parser.h"
#include "def.h"
#include "env-util.h"
@@ -25,12 +26,15 @@
#include "macro.h"
#include "parse-util.h"
#include "path-util.h"
#include "proc-cmdline.h"
#include "sleep-config.h"
#include "string-util.h"
#include "strv.h"
int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t *_delay) {
int parse_sleep_config(const char *verb, bool *ret_allow, char ***ret_modes, char ***ret_states, usec_t *ret_delay) {
int allow_suspend = -1, allow_hibernate = -1,
allow_s2h = -1, allow_hybrid_sleep = -1;
bool allow;
_cleanup_strv_free_ char
**suspend_mode = NULL, **suspend_state = NULL,
**hibernate_mode = NULL, **hibernate_state = NULL,
@@ -39,13 +43,19 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
usec_t delay = 180 * USEC_PER_MINUTE;
const ConfigTableItem items[] = {
{ "Sleep", "SuspendMode", config_parse_strv, 0, &suspend_mode },
{ "Sleep", "SuspendState", config_parse_strv, 0, &suspend_state },
{ "Sleep", "HibernateMode", config_parse_strv, 0, &hibernate_mode },
{ "Sleep", "HibernateState", config_parse_strv, 0, &hibernate_state },
{ "Sleep", "HybridSleepMode", config_parse_strv, 0, &hybrid_mode },
{ "Sleep", "HybridSleepState", config_parse_strv, 0, &hybrid_state },
{ "Sleep", "HibernateDelaySec", config_parse_sec, 0, &delay},
{ "Sleep", "AllowSuspend", config_parse_tristate, 0, &allow_suspend },
{ "Sleep", "AllowHibernation", config_parse_tristate, 0, &allow_hibernate },
{ "Sleep", "AllowSuspendThenHibernate", config_parse_tristate, 0, &allow_s2h },
{ "Sleep", "AllowHybridSleep", config_parse_tristate, 0, &allow_hybrid_sleep },
{ "Sleep", "SuspendMode", config_parse_strv, 0, &suspend_mode },
{ "Sleep", "SuspendState", config_parse_strv, 0, &suspend_state },
{ "Sleep", "HibernateMode", config_parse_strv, 0, &hibernate_mode },
{ "Sleep", "HibernateState", config_parse_strv, 0, &hibernate_state },
{ "Sleep", "HybridSleepMode", config_parse_strv, 0, &hybrid_mode },
{ "Sleep", "HybridSleepState", config_parse_strv, 0, &hybrid_state },
{ "Sleep", "HibernateDelaySec", config_parse_sec, 0, &delay},
{}
};
@@ -55,6 +65,8 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
CONFIG_PARSE_WARN, NULL);
if (streq(verb, "suspend")) {
allow = allow_suspend != 0;
/* empty by default */
modes = TAKE_PTR(suspend_mode);
@@ -64,6 +76,8 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
states = strv_new("mem", "standby", "freeze", NULL);
} else if (streq(verb, "hibernate")) {
allow = allow_hibernate != 0;
if (hibernate_mode)
modes = TAKE_PTR(hibernate_mode);
else
@@ -75,6 +89,9 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
states = strv_new("disk", NULL);
} else if (streq(verb, "hybrid-sleep")) {
allow = allow_hybrid_sleep > 0 ||
(allow_suspend != 0 && allow_hibernate != 0);
if (hybrid_mode)
modes = TAKE_PTR(hybrid_mode);
else
@@ -85,21 +102,26 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
else
states = strv_new("disk", NULL);
} else if (streq(verb, "suspend-then-hibernate"))
} else if (streq(verb, "suspend-then-hibernate")) {
allow = allow_s2h > 0 ||
(allow_suspend != 0 && allow_hibernate != 0);
modes = states = NULL;
else
} else
assert_not_reached("what verb");
if ((!modes && STR_IN_SET(verb, "hibernate", "hybrid-sleep")) ||
(!states && !streq(verb, "suspend-then-hibernate")))
return log_oom();
if (_modes)
*_modes = TAKE_PTR(modes);
if (_states)
*_states = TAKE_PTR(states);
if (_delay)
*_delay = delay;
if (ret_allow)
*ret_allow = allow;
if (ret_modes)
*ret_modes = TAKE_PTR(modes);
if (ret_states)
*ret_states = TAKE_PTR(states);
if (ret_delay)
*ret_delay = delay;
return 0;
}
@@ -266,12 +288,94 @@ static bool enough_swap_for_hibernation(void) {
}
r = act <= (size - used) * HIBERNATION_SWAP_THRESHOLD;
log_debug("Hibernation is %spossible, Active(anon)=%llu kB, size=%zu kB, used=%zu kB, threshold=%.2g%%",
r ? "" : "im", act, size, used, 100*HIBERNATION_SWAP_THRESHOLD);
log_debug("%s swap for hibernation, Active(anon)=%llu kB, size=%zu kB, used=%zu kB, threshold=%.2g%%",
r ? "Enough" : "Not enough", act, size, used, 100*HIBERNATION_SWAP_THRESHOLD);
return r;
}
static int check_resume_keys(const char *key, const char *value, void *data) {
assert_se(key);
assert_se(data);
int *resume = data;
if (*resume == 0)
/* Exit if we already know we can't resume. */
return 0;
if (streq(key, "noresume")) {
log_debug("Found \"noresume\" on the kernel command line, hibernation is disabled.");
*resume = 0;
} else if (streq(key, "resume")) {
log_debug("Found resume= option on the kernel command line, hibernation is possible.");
*resume = 1;
}
return 0;
}
static int resume_configured_in_options(const char *options) {
int resume = -1, r;
/* We don't use PROC_CMDLINE_STRIP_RD_PREFIX here, so rd.resume is *not* supported. */
r = proc_cmdline_parse_given(options, check_resume_keys, &resume, 0);
if (r < 0)
return r;
if (resume < 0)
log_debug("Couldn't find resume= option, hibernation is disabled.");
return resume > 0;
}
static int resume_configured(void) {
_cleanup_(boot_config_free) BootConfig config = {};
const BootEntry *e;
int r;
/* Check whether a valid resume= option is present. If possible, we query the boot options
* for the default kernel. If the system is not using sd-boot, fall back to checking the
* current kernel command line. This is not perfect, but should suffice for most cases. */
r = find_default_boot_entry(NULL, NULL, &config, &e);
if (r == -ENOKEY)
log_debug_errno(r, "Cannot find the ESP partition mount point, falling back to other checks.");
else if (r < 0)
return log_debug_errno(r, "Cannot read boot configuration from ESP, assuming hibernation is not possible.");
else {
_cleanup_free_ char *options = NULL;
options = strv_join(e->options, " ");
if (!options)
return log_oom();
r = resume_configured_in_options(options);
if (r < 0)
return log_error_errno(r, "Failed to parse kernel options in \"%s\": %m",
strnull(e->path));
return r;
}
/* If we can't figure out the default boot entry, let's fall back to current kernel cmdline */
_cleanup_free_ char *line = NULL;
r = proc_cmdline(&line);
if (IN_SET(r, -EPERM, -EACCES, -ENOENT))
log_debug_errno(r, "Cannot access /proc/cmdline: %m");
else if (r < 0)
return log_error_errno(r, "Failed to query /proc/cmdline: %m");
else {
r = resume_configured_in_options(line);
if (r < 0)
return log_error_errno(r, "Failed to parse kernel proc cmdline: %m");
return r;
}
log_debug("Couldn't detect any resume mechanism, hibernation is disabled.");
return false;
}
static int kernel_exists(void) {
struct utsname u;
sd_id128_t m;
@@ -422,6 +526,8 @@ int read_fiemap(int fd, struct fiemap **ret) {
return 0;
}
static int can_sleep_internal(const char *verb, bool check_allowed);
static bool can_s2h(void) {
const char *p;
int r;
@@ -434,8 +540,8 @@ static bool can_s2h(void) {
}
FOREACH_STRING(p, "suspend", "hibernate") {
r = can_sleep(p);
if (IN_SET(r, 0, -ENOSPC, -ENOMEDIUM)) {
r = can_sleep_internal(p, false);
if (IN_SET(r, 0, -ENOSPC, -ENOMEDIUM, -EADV)) {
log_debug("Unable to %s system.", p);
return false;
}
@@ -446,19 +552,25 @@ static bool can_s2h(void) {
return true;
}
int can_sleep(const char *verb) {
static int can_sleep_internal(const char *verb, bool check_allowed) {
bool allow;
_cleanup_strv_free_ char **modes = NULL, **states = NULL;
int r;
assert(STR_IN_SET(verb, "suspend", "hibernate", "hybrid-sleep", "suspend-then-hibernate"));
if (streq(verb, "suspend-then-hibernate"))
return can_s2h();
r = parse_sleep_config(verb, &modes, &states, NULL);
r = parse_sleep_config(verb, &allow, &modes, &states, NULL);
if (r < 0)
return false;
if (check_allowed && !allow) {
log_debug("Sleep mode \"%s\" is disabled by configuration.", verb);
return false;
}
if (streq(verb, "suspend-then-hibernate"))
return can_s2h();
if (!can_sleep_state(states) || !can_sleep_disk(modes))
return false;
@@ -473,5 +585,14 @@ int can_sleep(const char *verb) {
if (!enough_swap_for_hibernation())
return -ENOSPC;
r = resume_configured();
if (r <= 0)
/* We squash all errors (e.g. EPERM) into a single value for reporting. */
return -EADV;
return true;
}
int can_sleep(const char *verb) {
return can_sleep_internal(verb, true);
}
src/shared/sleep-config.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "time-util.h"
int read_fiemap(int fd, struct fiemap **ret);
int parse_sleep_config(const char *verb, char ***modes, char ***states, usec_t *delay);
int parse_sleep_config(const char *verb, bool *ret_allow, char ***ret_modes, char ***ret_states, usec_t *ret_delay);
int find_hibernate_location(char **device, char **type, size_t *size, size_t *used);
int can_sleep(const char *verb);