From nobody Thu Aug 14 19:03:08 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c2vlJ5hWyz64sgD; Thu, 14 Aug 2025 19:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2vlJ535Gz3m5L; Thu, 14 Aug 2025 19:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755198188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtb+EVfDgAokjZFpoLavMNWlbDr8XYN2eDl6vtgmsfY=; b=JBtSZRSxPHTRP0LYaE2EyRh1gjosgSxDkpf4FqWYTABSMt4JXoiCb/xDNX0DUMMDrULI4w FyZZKneMyXXXkDBO9l7Ny3rjVIcrtcJawS/jqLXxJx+uJMU/Dl1wmhslg/WNgJXaqKSdeJ 9Vgy3wXixWRkZ3YBnoroXx1YquJTl5MPp5+RC7eROkYO15zwAZ7D8CHLMk4uYU4bWMvWtE HhFB98CFvFCC0Jood66X29tBxypgBEjXmOeCEcfY2EGjE7a0twdSaSoOf3FBx2ZbZR04Ea +y/ZoIVdWu0dH7o865zWQ7BzPlRBxoWDHiQBHC4t/zbAPcKesXvSCSBjTXVBog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755198188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtb+EVfDgAokjZFpoLavMNWlbDr8XYN2eDl6vtgmsfY=; b=yDI6TEgUJnxN0lpZXRV5t1RJn9iPpoPXHSsRMNJUij75UUWZafUfErfRN3T0L8tjMX/MbW 9lNtbcutbNqsOWvK3fjZgQ5zeVEweKjOFHLZ1qvyl8ChaxRP4lCH9pBUVx7Ai9HxQlA4SV m8eVqeQHUP8rdf25hYM7Xbwcpi22tHWGg3IDq7S58qA5Clb+vNjklS63qT0p6JYZzm5wVo pJrQUEcq3NT9GpE1HeHuTcizQreeUkTalXVCJi6N4B1R1OBsSreFK5d2MxP3bRPkAoJgkX zBghzaplhnsgFCtSE2eV1E6lY6xMmVMq0by99NXeA1m8ZZ+aFWGEpiCR4WkWQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755198188; a=rsa-sha256; cv=none; b=SVzdjuez0RBt8nGF0an4N7peZjn+q0yTYmozyl7b6v9WHJCeJwb8hWGiRpLweIlIq4o2Cm gBdGXo91VT6MF9FptTth82AbrTvVcB7TvCMQV82uNgZArNBe95QDFDFUyeUfwFsdixlekj y0wZ/95LyrA8MlbT07GUic46dDQB1kSpnxhUxHX0Ouc9jrjX0eZBBtzQp7aV3duAG7lrVw SuTsBQ7iCYMVypbM5StmXO7FRsaRelkKYaK8P73EIoAOqNUYFj2qv7vBK77OmlbWZCpAgl 8H56cAzoP2q4C+tprenVEPL1SxEvHNOqqgqSjbA4yNf8b7Djsqz5m7qvYWPoCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c2vlJ4fGJz14jb; Thu, 14 Aug 2025 19:03:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57EJ38dm018243; Thu, 14 Aug 2025 19:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57EJ38mH018240; Thu, 14 Aug 2025 19:03:08 GMT (envelope-from git) Date: Thu, 14 Aug 2025 19:03:08 GMT Message-Id: <202508141903.57EJ38mH018240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 69f7d6912a24 - main - watchdog: Add a new "Control" ioctl List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f7d6912a24d3caab4957a33e07529275cf4d09 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=69f7d6912a24d3caab4957a33e07529275cf4d09 commit 69f7d6912a24d3caab4957a33e07529275cf4d09 Author: Justin Hibbits AuthorDate: 2025-02-26 20:17:24 +0000 Commit: Justin Hibbits CommitDate: 2025-08-14 19:02:46 +0000 watchdog: Add a new "Control" ioctl Summary: In preparation for a new watchdog timeout interface using sbintime_t, add a new control ioctl to arm, pat, and disarm the watchdog. Reviewed by: jhb, phk Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D49182 --- sys/dev/watchdog/watchdog.c | 20 ++++++++++++++++++++ sys/sys/watchdog.h | 8 ++++++++ usr.sbin/watchdogd/watchdogd.c | 13 +++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/sys/dev/watchdog/watchdog.c b/sys/dev/watchdog/watchdog.c index e6b6dc1eac70..c0babef1b29b 100644 --- a/sys/dev/watchdog/watchdog.c +++ b/sys/dev/watchdog/watchdog.c @@ -117,6 +117,23 @@ seconds_to_pow2ns(int seconds) return (power); } +int +wdog_control(int ctrl) +{ + /* Disable takes precedence */ + if (ctrl == WD_CTRL_DISABLE) { + wdog_kern_pat(0); + } + + if ((ctrl & WD_CTRL_RESET) != 0) { + wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); + } else if ((ctrl & WD_CTRL_ENABLE) != 0) { + wdog_kern_pat(WD_ACTIVE | WD_LASTVAL); + } + + return (0); +} + int wdog_kern_pat(u_int utim) { @@ -374,6 +391,9 @@ wd_ioctl(struct cdev *dev __unused, u_long cmd, caddr_t data, case WDIOCPATPAT: error = wd_ioctl_patpat(data); break; + case WDIOC_CONTROL: + wdog_control(*(int *)data); + break; default: error = ENOIOCTL; break; diff --git a/sys/sys/watchdog.h b/sys/sys/watchdog.h index 4a16b18509f5..3c9d31eb577b 100644 --- a/sys/sys/watchdog.h +++ b/sys/sys/watchdog.h @@ -48,6 +48,8 @@ #define WDIOC_SETSOFT _IOW('W', 49, int) #define WDIOC_SETSOFTTIMEOUTACT _IOW('W', 50, int) +#define WDIOC_CONTROL _IOW('W', 51, int) /* configure watchdog */ + #define WD_ACTIVE 0x8000000 /* * Watchdog reset, timeout set to value in WD_INTERVAL field. @@ -93,6 +95,11 @@ #define WD_TO_64SEC 36 #define WD_TO_128SEC 37 +/* Control options for WDIOC_CONTROL */ +#define WD_CTRL_DISABLE 0x00000000 +#define WD_CTRL_ENABLE 0x00000001 +#define WD_CTRL_RESET 0x00000002 + /* action on pre-timeout trigger */ #define WD_SOFT_PANIC 0x01 /* panic */ #define WD_SOFT_DDB 0x02 /* enter debugger */ @@ -110,6 +117,7 @@ EVENTHANDLER_DECLARE(watchdog_list, watchdog_fn); u_int wdog_kern_last_timeout(void); int wdog_kern_pat(u_int utim); +int wdog_control(int ctrl); /* * The following function pointer is used to attach a software watchdog diff --git a/usr.sbin/watchdogd/watchdogd.c b/usr.sbin/watchdogd/watchdogd.c index 88b467486da1..228438955006 100644 --- a/usr.sbin/watchdogd/watchdogd.c +++ b/usr.sbin/watchdogd/watchdogd.c @@ -396,6 +396,15 @@ watchdog_patpat(u_int t) return ioctl(fd, WDIOCPATPAT, &t); } +static int +watchdog_control(u_int control) +{ + if (is_dry_run) + return (0); + + return ioctl(fd, WDIOC_CONTROL, &control); +} + /* * Toggle the kernel's watchdog. This routine is used to enable and * disable the watchdog. @@ -454,10 +463,10 @@ watchdog_onoff(int onoff) /* pat one more time for good measure */ return watchdog_patpat((timeout|WD_ACTIVE)); } else { - return watchdog_patpat(exit_timeout); + return watchdog_control(WD_CTRL_DISABLE); } failsafe: - watchdog_patpat(exit_timeout); + watchdog_control(WD_CTRL_DISABLE); return (error); }