system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 18:24:38 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

hibernate-util,logind: emit a clear error if the specified resume dev is missing

Browse source 
Currently, SLEEP_NOT_ENOUGH_SWAP_SPACE (ENOSPC) is returned
on all sorts of error conditions. But one important case
that's worth differentiating from that is when the resume device
is manually specified yet missing.

Closes #32644
This commit is contained in:
Mike Yuan 2024-05-08 12:42:40 +08:00
parent 3473c842fa
commit 40eb83a8fe
No known key found for this signature in database
GPG key ID: 417471C0A40F58B3
4 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/login/logind-dbus.c
View file

@ -2156,6 +2156,10 @@ static int method_do_shutdown_or_sleep(
return sd_bus_error_set(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED,
"Not running on EFI and resume= is not set, or noresume is set. No available method to resume from hibernation");
case SLEEP_RESUME_DEVICE_MISSING:
return sd_bus_error_set(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED,
"Specified resume device is missing or is not an active swap device");
case SLEEP_NOT_ENOUGH_SWAP_SPACE:
return sd_bus_error_set(error, BUS_ERROR_SLEEP_VERB_NOT_SUPPORTED,
"Not enough suitable swap space for hibernation available on compatible block devices and file systems");

12
src/shared/hibernate-util.c
View file

@ -394,7 +394,7 @@ int find_suitable_hibernation_device_full(HibernationDevice *ret_device, uint64_
if (!entry) {
/* No need to check n_swaps == 0, since it's rejected early */
assert(resume_config_devno > 0);
return log_debug_errno(SYNTHETIC_ERRNO(ENOSPC), "Cannot find swap entry corresponding to /sys/power/resume.");
return log_debug_errno(SYNTHETIC_ERRNO(ESTALE), "Cannot find swap entry corresponding to /sys/power/resume.");
}
if (ret_device) {
@ -452,11 +452,11 @@ int hibernation_is_safe(void) {
bypass_space_check = getenv_bool("SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK") > 0;
r = find_suitable_hibernation_device_full(NULL, &size, &used);
if (r == -ENOSPC && bypass_space_check)
/* If we don't have any available swap space at all, and SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK
* is set, skip all remaining checks since we can't do that properly anyway. It is quite
* possible that the user is using a setup similar to #30083. When we actually perform
* hibernation in sleep.c we'll check everything again. */
if (IN_SET(r, -ENOSPC, -ESTALE) && bypass_space_check)
/* If we don't have any available swap space at all, or the specified resume device is missing,
* and $SYSTEMD_BYPASS_HIBERNATION_MEMORY_CHECK is set, skip all remaining checks since
* we can't do that properly anyway. It is quite possible that the user is using a setup
* similar to #30083. When we actually perform hibernation in sleep.c we'll check everything again. */
return 0;
if (r < 0)
return r;

18
src/shared/sleep-config.c
View file

@ -368,16 +368,24 @@ static int sleep_supported_internal(
}
r = hibernation_is_safe();
if (r == -ENOTRECOVERABLE) {
switch (r) {
case -ENOTRECOVERABLE:
*ret_support = SLEEP_RESUME_NOT_SUPPORTED;
return false;
}
if (r == -ENOSPC) {
case -ESTALE:
*ret_support = SLEEP_RESUME_DEVICE_MISSING;
return false;
case -ENOSPC:
*ret_support = SLEEP_NOT_ENOUGH_SWAP_SPACE;
return false;
default:
if (r < 0)
return r;
}
if (r < 0)
return r;
} else
assert(!sleep_config->modes[operation]);

1
src/shared/sleep-config.h
View file

@ -59,6 +59,7 @@ typedef enum SleepSupport {
SLEEP_NOT_CONFIGURED, /* SleepConfig.states is not configured */
SLEEP_STATE_OR_MODE_NOT_SUPPORTED, /* SleepConfig.states/modes are not supported by kernel */
SLEEP_RESUME_NOT_SUPPORTED,
SLEEP_RESUME_DEVICE_MISSING, /* resume= is specified, but the device cannot be found in /proc/swaps */
SLEEP_NOT_ENOUGH_SWAP_SPACE,
SLEEP_ALARM_NOT_SUPPORTED, /* CLOCK_BOOTTIME_ALARM is unsupported by kernel (only used by s2h) */
} SleepSupport;