From: Guenter Roeck <linux@roeck-us.net>
To: minyard@acm.org
Cc: Wim Van Sebroeck <wim@linux-watchdog.org>,
linux-watchdog@vger.kernel.org,
Corey Minyard <cminyard@mvista.com>
Subject: Re: [PATCH 01/10] watchdog: Ignore stop_on_reboot if no stop function
Date: Sun, 19 Jul 2020 07:11:52 -0700 [thread overview]
Message-ID: <20200719141152.GA38930@roeck-us.net> (raw)
In-Reply-To: <20200620174907.20229-2-minyard@acm.org>
On Sat, Jun 20, 2020 at 12:48:58PM -0500, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
>
> The reboot notifier unconditionally calls the stop function on the
> watchdog, which would result in a crash if the watchdog didn't have a
> stop function. So check at register time to see if there is a stop
> function, and don't do stop_on_reboot if it is NULL.
>
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> ---
> drivers/watchdog/watchdog_core.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
> index 423844757812..03943a34e9fb 100644
> --- a/drivers/watchdog/watchdog_core.c
> +++ b/drivers/watchdog/watchdog_core.c
> @@ -260,10 +260,16 @@ static int __watchdog_register_device(struct watchdog_device *wdd)
>
> /* Module parameter to force watchdog policy on reboot. */
> if (stop_on_reboot != -1) {
> - if (stop_on_reboot)
> - set_bit(WDOG_STOP_ON_REBOOT, &wdd->status);
> - else
> + if (stop_on_reboot) {
> + if (!wdd->ops->stop) {
> + pr_err("watchdog%d: stop_on_reboot set, but no stop function. Ignoring stop_on_reboot.\n", wdd->id);
This should be pr_notice(). It is not an error (otherwise I would expect
registration to abort). Also:
WARNING: line length of 133 exceeds 100 columns
#108: FILE: drivers/watchdog/watchdog_core.c:265:
+ pr_err("watchdog%d: stop_on_reboot set, but no stop function. Ignoring stop_on_reboot.\n", wdd->id);
This patch that is independent from the rest of the series and should be
applied/handled independently.
Thanks,
Guenter
> + clear_bit(WDOG_STOP_ON_REBOOT, &wdd->status);
> + } else {
> + set_bit(WDOG_STOP_ON_REBOOT, &wdd->status);
> + }
> + } else {
> clear_bit(WDOG_STOP_ON_REBOOT, &wdd->status);
> + }
> }
>
> if (test_bit(WDOG_STOP_ON_REBOOT, &wdd->status)) {
next prev parent reply other threads:[~2020-07-19 14:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-20 17:48 [PATCH 00/10] Convert the IPMI watchdog to use the watchdog minyard
2020-06-20 17:48 ` [PATCH 01/10] watchdog: Ignore stop_on_reboot if no stop function minyard
2020-07-19 14:11 ` Guenter Roeck [this message]
2020-06-20 17:48 ` [PATCH 02/10] watchdog: Add read capability minyard
2020-06-20 17:49 ` [PATCH 03/10] watchdog: Add documentation for " minyard
2020-07-01 2:49 ` Guenter Roeck
2020-06-20 17:49 ` [PATCH 04/10] watchdog: Add functions to set the timeout and pretimeout minyard
2020-07-01 2:45 ` Guenter Roeck
2020-06-20 17:49 ` [PATCH 05/10] watchdog: Export an interface to start the watchdog minyard
2020-07-01 2:46 ` Guenter Roeck
2020-06-20 17:49 ` [PATCH 06/10] ipmi:watchdog: Convert over to the watchdog framework minyard
2020-06-20 17:49 ` [PATCH 07/10] ipmi:watchdog: Allow the reboot timeout to be specified minyard
2020-06-20 17:49 ` [PATCH 08/10] watchdog: Add a way to extend the timeout on a reboot minyard
2020-07-19 14:25 ` Guenter Roeck
2020-06-20 17:49 ` [PATCH 09/10] ipmi:watchdog: Convert over to watchdog framework reboot handling minyard
2020-06-20 17:49 ` [PATCH 10/10] ipmi:watchdog: Add the op to get the current timeout minyard
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=20200719141152.GA38930@roeck-us.net \
--to=linux@roeck-us.net \
--cc=cminyard@mvista.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=minyard@acm.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).