dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-06 08:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

watchdog: ensure configured timeout is used instead of USEC_INFINITY

Browse Source 
In some rare cases, a watchdog driver might neither be able to change
the watchdog timeout value, nor read it from the hardware at runtime.

With an otherwise functional watchdog setup, this constellation worked
until systemd v249. Since then, systemd ends up ignoring the timeout
defined by the system.conf and rather uses USEC_INFINITY. Consequently,
the watchdog is not pinged anymore and eventually resets the system.

We therefore want to ensure that the system keeps running with the
originally configured timeout.
This commit is contained in:
Holger Assmann
2024-01-09 15:05:19 +01:00
committed by Luca Boccassi
parent ecb4c5a63e
commit f681046ede
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/shared/watchdog.c
View File

@@ -261,12 +261,15 @@ static int update_pretimeout(void) {
static int update_timeout(void) {
int r;
usec_t previous_timeout;
assert(watchdog_timeout > 0);
if (watchdog_fd < 0)
return 0;
previous_timeout = watchdog_timeout;
if (watchdog_timeout != USEC_INFINITY) {
r = watchdog_set_timeout();
if (r < 0) {
@@ -281,8 +284,12 @@ static int update_timeout(void) {
if (watchdog_timeout == USEC_INFINITY) {
r = watchdog_read_timeout();
if (r < 0)
return log_error_errno(r, "Failed to query watchdog HW timeout: %m");
if (r < 0) {
if (!ERRNO_IS_NOT_SUPPORTED(r))
return log_error_errno(r, "Failed to query watchdog HW timeout: %m");
log_info("Reading watchdog timeout is not supported, reusing the configured timeout.");
watchdog_timeout = previous_timeout;
}
}
/* If the watchdog timeout was changed, the pretimeout could have been