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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 CF0DDC433F5 for ; Sat, 11 Sep 2021 13:18:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AF66B61152 for ; Sat, 11 Sep 2021 13:18:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237168AbhIKNTP (ORCPT ); Sat, 11 Sep 2021 09:19:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:41214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236207AbhIKNRE (ORCPT ); Sat, 11 Sep 2021 09:17:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 39BF861263; Sat, 11 Sep 2021 13:13:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631366014; bh=8YZEMHsLG3BuOCuXFZG8Zydc7f/xFEd6Ys2Rg4ECE7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FAYLXiu/mI/z5PZnm1C2OkzLz/YARGFppELWcyGwUEVHvhLcKML4PCgMwiDGfo7i0 xQa1QE8dJVNOAugalhD68ZbKm3RoZSW6ZtCrW0BLxYxJIRYLspPzIulnzWaQWo6kTx khYcwQcJzeNXG4sLTqkldGekILslu8nKAcihUUQeVpjviO1drPk32+47WG5+0iFlFB 5VetVwQvMzCUB/uvxBsmSnxZNuhm5NWC3eJEuEhbh2HtvmWe4MvMa3DQyOWjp3rMAK YVwCOVenmaGAJXllDOSDjxxXpe+bEjB1BmMvr+SnyNSExQemLvN61d1XzeaUDaxp17 tvYnD6OC8hbeg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jan Kiszka , Guenter Roeck , Wim Van Sebroeck , Sasha Levin , linux-watchdog@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 16/25] watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate Date: Sat, 11 Sep 2021 09:13:03 -0400 Message-Id: <20210911131312.285225-16-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210911131312.285225-1-sashal@kernel.org> References: <20210911131312.285225-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jan Kiszka [ Upstream commit dbe80cf471f940db3063197b7adb1169f89be9ed ] We must not pet a running watchdog when handle_boot_enabled is off because this will kick off automatic triggering before userland is running, defeating the purpose of the handle_boot_enabled control. Furthermore, don't ping in case watchdog_set_last_hw_keepalive was called incorrectly when the hardware watchdog is actually not running. Fixed: cef9572e9af3 ("watchdog: add support for adjusting last known HW keepalive time") Signed-off-by: Jan Kiszka Reviewed-by: Guenter Roeck Link: https://lore.kernel.org/r/93d56386-6e37-060b-55ce-84de8cde535f@web.de Signed-off-by: Guenter Roeck Signed-off-by: Wim Van Sebroeck Signed-off-by: Sasha Levin --- 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 2946f3a63110..2ee017442dfc 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -1164,7 +1164,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 (watchdog_hw_running(wdd) && handle_boot_enabled) + return __watchdog_ping(wdd); + + return 0; } EXPORT_SYMBOL_GPL(watchdog_set_last_hw_keepalive); -- 2.30.2