From: Mathieu Othacehe <othacehe@gnu.org>
To: Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>
Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Mathieu Othacehe <othacehe@gnu.org>
Subject: [PATCH] watchdog: Inform about watchdog timeout.
Date: Sun, 14 Jul 2024 17:46:23 +0200 [thread overview]
Message-ID: <20240714154623.32676-1-othacehe@gnu.org> (raw)
When the kernel stops feeding the watchdog, inform the user that it is
about to timeout in X seconds.
The message looks like: watchdog: watchdog0: timeout in 15 seconds
This is helpful to warn the user that, most likely,
CONFIG_WATCHDOG_OPEN_TIMEOUT seconds have elapsed and the userspace hasn't
start feeding the watchdog.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
drivers/watchdog/watchdog_dev.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index e2bd266b1b5b3..0d95c91365993 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -104,6 +104,7 @@ static ktime_t watchdog_next_keepalive(struct watchdog_device *wdd)
ktime_t last_heartbeat, latest_heartbeat;
ktime_t virt_timeout;
unsigned int hw_heartbeat_ms;
+ int delta_to_timeout;
if (watchdog_active(wdd))
virt_timeout = ktime_add(wd_data->last_keepalive,
@@ -121,6 +122,17 @@ static ktime_t watchdog_next_keepalive(struct watchdog_device *wdd)
*/
last_heartbeat = ktime_sub(virt_timeout, ms_to_ktime(hw_heartbeat_ms));
latest_heartbeat = ktime_sub(last_heartbeat, ktime_get());
+
+ /*
+ * If we are past the last heartbeat, inform the user that we are
+ * about to timeout.
+ */
+ delta_to_timeout =
+ (int)ktime_ms_delta(virt_timeout, ktime_get()) / MSEC_PER_SEC;
+ if (latest_heartbeat <= 0 && delta_to_timeout > 0)
+ pr_info("watchdog%d: timeout in %d seconds\n", wdd->id,
+ delta_to_timeout);
+
if (ktime_before(latest_heartbeat, keepalive_interval))
return latest_heartbeat;
return keepalive_interval;
--
2.45.2
next reply other threads:[~2024-07-14 15:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-14 15:46 Mathieu Othacehe [this message]
2024-07-14 18:45 ` [PATCH] watchdog: Inform about watchdog timeout Guenter Roeck
2024-07-18 18:22 ` Wim Van Sebroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240714154623.32676-1-othacehe@gnu.org \
--to=othacehe@gnu.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.