Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Guenter Roeck <groeck7@gmail.com>
To:     Jan Kiszka <jan.kiszka@siemens.com>,
        Wim Van Sebroeck <wim@linux-watchdog.org>,
        linux-watchdog@vger.kernel.org
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Tero Kristo <t-kristo@ti.com>
References: <fe8cf65f-f949-9326-8f32-fda7134c8da6@siemens.com>
From:   Guenter Roeck <linux@roeck-us.net>
Subject: Re: [PATCH] watchdog: Respect handle_boot_enabled when setting last
 last_hw_keepalive
Message-ID: <211cd54b-29b4-e58a-341b-beffc05cfe85@roeck-us.net>
Date:   Fri, 30 Jul 2021 13:49:52 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.11.0
MIME-Version: 1.0
In-Reply-To: <fe8cf65f-f949-9326-8f32-fda7134c8da6@siemens.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Precedence: bulk

On 7/30/21 12:39 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> We must not pet a running watchdog when handle_boot_enabled is off
> because this requests to only start doing that via userspace, not during
> probing.
> 

The scope of the changed function is quite limited. See the
definition of watchdog_set_last_hw_keepalive(). On top of that,
__watchdog_ping() does a bit more than just ping the watchdog,
and it only pings the watchdog in limited circumstances. On top of that,
the scope of handle_boot_enabled is different: If enabled, it tells
the watchdog core to keep pinging a watchdog until userspace opens
the device. This is about continuous pings, not about an initial one.
Given that, I'd rather have the watchdog subsystem issue an additional
ping than risking a regression.

The only driver calling watchdog_set_last_hw_keepalive() is rti_wdt.c.
Does this patch solve a specific problem observed with that watchdog ?

Guenter

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   drivers/watchdog/watchdog_dev.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
> index 3bab32485273..3c93d00bb284 100644
> --- a/drivers/watchdog/watchdog_dev.c
> +++ b/drivers/watchdog/watchdog_dev.c
> @@ -1172,7 +1172,10 @@ int watchdog_set_last_hw_keepalive(struct watchdog_device *wdd,
>   
>   	wd_data->last_hw_keepalive = ktime_sub(now, ms_to_ktime(last_ping_ms));
>   
> -	return __watchdog_ping(wdd);
> +	if (handle_boot_enabled)
> +		return __watchdog_ping(wdd);
> +
> +	return 0;
>   }
>   EXPORT_SYMBOL_GPL(watchdog_set_last_hw_keepalive);
>   
>