From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44ECA306B08 for ; Mon, 24 Aug 2026 20:55:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787604944; cv=none; b=d8g+YDFQ7/zqO21V0jX3gFm3kYAbJ9WWIF7LNuuWbCbsVsZlkpgC1AaQsmKzL3E4v6Iv80KtZ6FfLoGGVvAstWe6OiIBUY8kXtBg6YfhaA6TZvFcgUVksGVy9xhl3sktuoRHHU98yXlesvRDwoaoJFqgexUivvZLkcdb+z40HW8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787604944; c=relaxed/simple; bh=EtnSZDpzebFks+Xv5PhTHAHe1xB7IB/xJ4tYVK/jqP8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=M5blCbyF0GcpaxCL+9TX6//2SJzxCX9/hxrmDP5FwVnfWN98dX2Osj+13hjZWSlwiPv6NcyaRMFJFz4O9Oz3hChDSsUFSRutnj7Ivl5OmLoHw5oQoU+WVKfRpN6MdzMxyaVYnYslZGG9BukRlDp5h3FV16ZxpD6uW25AMwkVGGw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=eFuXa2Tc; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=hV66yVdA; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="eFuXa2Tc"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="hV66yVdA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787604942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=YZA7rXybjQ/9nL0WGdpemcuGoEnQB/ztBkm8ZTqMROI=; b=eFuXa2TcrqRfNxHphoH/1mfnyqW6PrE7DYKiKkCoPFavQkau1Ka3uaQWSFckRvGtIqTXGx iqtPzkTfDvJusYjGO2eN7cX8DOywkVxbpx94U10Am8FA3rqYjpDO/ftnlj51eqXZCL7FrQ zOg1m9HNym+/AYX0skRT1UAAt18ZUqk= Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-626-RiY9BL_LPhSHEf__5P0VNQ-1; Mon, 24 Aug 2026 16:55:41 -0400 X-MC-Unique: RiY9BL_LPhSHEf__5P0VNQ-1 X-Mimecast-MFC-AGG-ID: RiY9BL_LPhSHEf__5P0VNQ_1787604940 Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-52d33c89a29so54083021cf.1 for ; Mon, 24 Aug 2026 13:55:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787604940; x=1788209740; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=YZA7rXybjQ/9nL0WGdpemcuGoEnQB/ztBkm8ZTqMROI=; b=hV66yVdAxFWIWeFNWCxbjQUcVF+5pgVaxwHNp3Da4iWg/6dM2nm9z76EI1y53xchFV 9RvwdJAOgeMZE7F8TYHDtcdW2HA53nW4yuOgG0PVGytFsPYKYFNwLD/dTbFPFdWekFxJ hhIKgEcdLMt51GAcEUGE4P7F3tK7M6/DkVmNmZuB/Css+9SAQhK2QA3Oh+3Xcq+yJKiu DoqgMns7O87gaw3V/B9qAqH68tGM+UUUOgLZPZMUTIPHtXYaJsAIeyRf3/BZzg2DlcsS x8O44O3f9SuBrr/hl+k/5Reh4n8giUitM8kwlX6Ier1RsipGjgNwkigXfmbUjzh8DKmh /uIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787604940; x=1788209740; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=YZA7rXybjQ/9nL0WGdpemcuGoEnQB/ztBkm8ZTqMROI=; b=KcnyOinUmx6/k/Y2l8DbgYrhZ+zfImulgeaEMdHLnM3TKOV+AFQ7ypg0c1HQV8+Wut 2r6QOXXQeSpmkAF5oPykCrR0u4Zj/SEFOQuJctRxkEBhpwqO5DJ2fvBfvqGEr2SK15wB LWTXExPBmlnra9nIQvKjP7guCWpWf0B+cSp8xL9p8lrs4Wgdtlrut/ZY/OOAz1SLh7uA 2ZAovKBqYViSwGhAjERZE72mdg/QIjvUYG/wML0EfVYFsKewbqol1uNQxz5IuaiDTXoc oaHCvFGdXlZAjBgQAmX28eJuasKarRJMw9nEvIRq3So2dfrfwXAovbcwkEZDJ7sQGe7S R/vQ== X-Forwarded-Encrypted: i=1; AHgh+RqqPIHgSuqT65OwCw8ZHqjRiA4/nsxyaGmj0TByZxftppfgQXZLcIs+TTvCSf2AX76XSApq8RF2pVd4kQU=@vger.kernel.org X-Gm-Message-State: AFuF++kaDYa5thG62EsRHfMF3ILyU6p+qMHEyZr/Nbyz9doF3rs1P8tQ C8563xs/2LceUVNL4lajIB4H8aj6i1afq4w9Y2ATvVECVS2r3dvJyezbc55sFhJbrEQp7xuslMM JYccHlni8laJBkAGeRQafFv7GGc50xv+1qab/VAPKaw+pBlf3wvHVCVPuWlSHAjhYpA== X-Gm-Gg: AR+sD12U6tW/kgYNXn1Prg2CvwvgxjV4/tNZv9wj+Ac4UfUWvu7e9HWwB4FRkZQF2r8 kn2HYmYjPwI1QC2CggV2VFmqHgsa4VTUn0aOV/HGdnSb01c2eT0h0lW5jRG9BTu8mkjc6pgFwQz eUI9Dv9DbpEEiWRR1ND542+AyBH65VElFR0u3O3xf+dLBOPehYt+ogUXQ6+5p2LvsqpPKoI4e+c wXxqPZmS6I2S8EC8wf/FhPGdw7hItDYAvaDDBRz108l0y5QOeJvRiyroauTYMPB5BZwkc4FrF/U kOKgQr/rKn1rC+0JzsEkFPXHBMxCukd3jtyitHoYtKKsMBooU5fhsZq3hdSErqkWeGnXe+zvqZU xObt9o42RpJaZCbI3ggNbM9LcZlvOMVR60elS6NwVdZFlZl7/LQEb8GvYa+lmnGp/zc957Q== X-Received: by 2002:a05:622a:cc:b0:517:87bc:9b47 with SMTP id d75a77b69052e-52df5a9bf53mr285970471cf.39.1787604940265; Mon, 24 Aug 2026 13:55:40 -0700 (PDT) X-Received: by 2002:a05:622a:cc:b0:517:87bc:9b47 with SMTP id d75a77b69052e-52df5a9bf53mr285970121cf.39.1787604939825; Mon, 24 Aug 2026 13:55:39 -0700 (PDT) Received: from chaithco-thinkpadp16vgen1.redhat.corp ([2607:fb91:7c7:872a:57eb:e0b5:a75e:bae8]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-52e0996b4a2sm56239751cf.3.2026.08.24.13.55.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Aug 2026 13:55:39 -0700 (PDT) From: Charles Haithcock To: wim@linux-watchdog.org, linux@roeck-us.net, linux-watchdog@vger.kernel.org Cc: Charles Haithcock , linux-kernel@vger.kernel.org Subject: [PATCH] Differentiate scenarios when watchdog is closed Date: Mon, 24 Aug 2026 14:50:47 -0600 Message-ID: <20260824205051.4117285-2-chaithco@redhat.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Presenty, when a watchdog device is closed, we print "watchdog did not stop" in a few different scenarios; 1. When nowayout is set 2. When the watchdog is able to close, has received the magic character to stop, but fails to close in device-specific code paths 3. When userspace delierately closes it without stopping it For 1, we explicitly print we can not close because of nowayout. Nothing differentiates the other two however. This change adds a print to indicate the watchdog was closed while still running. Signed-off-by: Charles Haithcock --- drivers/watchdog/watchdog_dev.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index d7895009a2..a571dea353 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -955,14 +955,17 @@ static int watchdog_release(struct inode *inode, struct file *file) if (!watchdog_active(wdd)) err = 0; else if (test_and_clear_bit(_WDOG_ALLOW_RELEASE, &wd_data->status) || - !(wdd->info->options & WDIOF_MAGICCLOSE)) + !(wdd->info->options & WDIOF_MAGICCLOSE)) { err = watchdog_stop(wdd); - /* If the watchdog was not stopped, send a keepalive ping */ - if (err < 0) { - pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id); - watchdog_ping(wdd); + /* If the watchdog was not stopped, send a keepalive ping */ + if (err < 0) { + pr_crit("watchdog%d: watchdog did not stop!\n", wdd->id); + watchdog_ping(wdd); + } } + else + pr_info("watchdog%d: closing while running!\n", wdd->id); watchdog_update_worker(wdd); -- 2.55.0