linux-kernel - [PATCH] softdog: make pretimeout available when SOFT_WATCHDOG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1617702277-17647-1-git-send-email-wangqing@vivo.com>
Date:   Tue,  6 Apr 2021 17:44:37 +0800
From:   Wang Qing <wangqing@...o.com>
To:     Wim Van Sebroeck <wim@...ux-watchdog.org>,
        Guenter Roeck <linux@...ck-us.net>,
        linux-watchdog@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Wang Qing <wangqing@...o.com>
Subject: [PATCH] softdog: make pretimeout available when SOFT_WATCHDOG_PRETIMEOUT enabled

Although softdog supports pretimeout, there is no way to set pretimeout, 
so pretimeout will never be processed in softdog_ping(). 

Here add the configuration mechanism for pretimeout and the default value
is 1 second, so when CONFIG_SOFT_WATCHDOG_PRETIMEOUT is enabled, the 
pretimeout function defaults available.

Signed-off-by: Wang Qing <wangqing@...o.com>
---
 drivers/watchdog/softdog.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 7a10962..79e52791
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -35,6 +35,14 @@ MODULE_PARM_DESC(soft_margin,
 	"Watchdog soft_margin in seconds. (0 < soft_margin < 65536, default="
 					__MODULE_STRING(TIMER_MARGIN) ")");
 
+#ifdef CONFIG_SOFT_WATCHDOG_PRETIMEOUT
+#define PRE_TIMER_MARGIN	1		/* Default is 1 seconds */
+static unsigned int soft_pretimeout = PRE_TIMER_MARGIN;	/* in seconds */
+module_param(soft_pretimeout, uint, 0);
+MODULE_PARM_DESC(soft_pretimeout,
+	"Watchdog soft_pretimeout in seconds. (0 < soft_pretimeout < soft_margin, default=1)");
+#endif
+
 static bool nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, bool, 0);
 MODULE_PARM_DESC(nowayout,
@@ -177,6 +185,9 @@ static struct watchdog_device softdog_dev = {
 	.min_timeout = 1,
 	.max_timeout = 65535,
 	.timeout = TIMER_MARGIN,
+#ifdef CONFIG_SOFT_WATCHDOG_PRETIMEOUT
+	.pretimeout = PRE_TIMER_MARGIN,
+#endif
 };
 
 static int __init softdog_init(void)
-- 
2.7.4