From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.3 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C71FCC433DF for ; Sun, 19 Jul 2020 14:11:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A270D22B4E for ; Sun, 19 Jul 2020 14:11:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HoQonhf1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726012AbgGSOLy (ORCPT ); Sun, 19 Jul 2020 10:11:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725988AbgGSOLy (ORCPT ); Sun, 19 Jul 2020 10:11:54 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 029E1C0619D2 for ; Sun, 19 Jul 2020 07:11:54 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id j19so9055303pgm.11 for ; Sun, 19 Jul 2020 07:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=5u/HW26w17MfG2IrobXMD3a0Tj7Cjkm8iFs2sLQMUqQ=; b=HoQonhf1NWa+myoLzD+iI+7StFSMHwjma914klOh6UIWkhw9+JK8p11bRDtj4iCwWi f7Pu2xa8w0+vSj38jeDcDJNSFUeyBWnNjZdHDIzdeQjKajrLNJ5zs2rdIbl9fweXLtx0 pbw+6dpJO02wN5cJ3AQblrDkCAAxHRpBc7urVTh7eR5qFoGlyXhV7zgdiF0pF4Z/GDaV LOXQ+0YvQZHev6T7048ec2AObMnHa9fnWuAhn9UTEfcirXuHEuJ8LEektk4/++jLsbNY P9zjL22Tc6/BY/SiVwrouRyvpiN/DsMuQe9NZP5anxvQ3gJhoY0PjlgTL4l+1HYPwLcl xmxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=5u/HW26w17MfG2IrobXMD3a0Tj7Cjkm8iFs2sLQMUqQ=; b=MnnoQ8meMWB5CYlxI8IT8+VsKZ0s4xbriglIhGSI1MpZdQmB30JHSmuSUoUAf96K7v PKb7UOK+9kT9KsZxcSuhjtM3ohXhhL+TIB3rUzYEOmnya7hGr+FOWnWXc7Bk0U07Ohw6 Le6Fn83Oiu5CWgSAP1lpuZ7SV177KCX3qvxjZGAprGefstDJakt/Z+xawu8TnhmJ3f9L UdmHiBG8egtGZCgJWUZD2y/hVziyyiu9HTEv2YNprnUV+l/7NJDS0risxSzbR4AfCrHo RQuRChdZlg92b3gLaUYTo3AO6Ws1ETkvyjqOa60jRMSnHxUnHnzEOFA4jY0EUQzkrihD MafQ== X-Gm-Message-State: AOAM533L5YzAGp/47ubFKQhnoqmHfoGIEROdCAhbWE9AQoqKYz2I62Ud u4XqMylxFwRKRVnVCm+5xKw= X-Google-Smtp-Source: ABdhPJznekm52KgeSsndWvIVqQGqNz3z2zIKMDvniRypOcoVB+7dmJwoftyZUeu5hxR8fgzJMnrpOA== X-Received: by 2002:a62:ab17:: with SMTP id p23mr16626824pff.177.1595167913534; Sun, 19 Jul 2020 07:11:53 -0700 (PDT) Received: from localhost ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id q5sm13755177pfc.130.2020.07.19.07.11.52 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 19 Jul 2020 07:11:53 -0700 (PDT) Date: Sun, 19 Jul 2020 07:11:52 -0700 From: Guenter Roeck To: minyard@acm.org Cc: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, Corey Minyard Subject: Re: [PATCH 01/10] watchdog: Ignore stop_on_reboot if no stop function Message-ID: <20200719141152.GA38930@roeck-us.net> References: <20200620174907.20229-1-minyard@acm.org> <20200620174907.20229-2-minyard@acm.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200620174907.20229-2-minyard@acm.org> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org On Sat, Jun 20, 2020 at 12:48:58PM -0500, minyard@acm.org wrote: > From: Corey Minyard > > 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 > --- > 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)) {