From nobody Thu Feb 16 21:28:30 2023 X-Original-To: dev-commits-src-all@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 4PHp326L5mz3rZJc; Thu, 16 Feb 2023 21:28:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PHp325jjhz43FT; Thu, 16 Feb 2023 21:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676582910; 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=qdV1UJDJuHC1USclDSwmwvz7kY6i2sNZiW7Wni4OVgU=; b=m/LFmkoys2Zp06t4rDoECvaWNo3xeqj6im8kO2qceTnD5sVHvnSPUkov8GuSgOIiuV4k/W 0LTV/qeXiMV7P2F+3dTcSeEZZapSM8VW/cZikBrtc2R2PlNmeh7Zbdl5F75gFY321Zmm/F X3ZalbC1YDUIUv+CqDtck7jYnq+hRzqDmFZnCRPbtM71pICLrDC2kIDxl41QGaN5LnLIbV or6zbp3SJ9xHOrx4EXObwJfJ8Pw71dPmFA8c6OxvvMI9lpuJLsP3Y4aH6ClrTM6cfMre7K +/fIgHfBgZppdFCj4OJSKtrl3jZ/Trbq1nA/TG6LAgY3rZxQH7pJzen2yfl9Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676582910; 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=qdV1UJDJuHC1USclDSwmwvz7kY6i2sNZiW7Wni4OVgU=; b=YLfuywzDflExhQiHwofDoOwHL0LxUzvrq5WjT5vjgswQTtl5Dl7I8WDpFMHvciEPMD3siL XgZwcvLGqUA1hCThpvcXKBrA2YS/tOJrR+w85nY+EcPbdcW2ARLyCALiu+Tuzi2IplTXgq sorD071vPM0KTmROm6yFDRNVIizRxeUsTMNv/TUSSyYBXBjIKwv+JBy37uUobq55z9zbF6 saoMxki0M6dE6MY3O2mKyVFZAQx0jA5qdR8KZfonZOYBz5UPfvi3+WDqaOhW3asyGiYKE+ DomK/cwJqOh4KMvZDimhoBOazfk4mfG0AB/5APvuOlue9MB9HfFWMtvmHzsR9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676582910; a=rsa-sha256; cv=none; b=U0yGgWUO31h87/c9MOlwb2J8ET6FyyhfZFfxZJUAOuaULMyU4FGQ+/D2Vge1PPa9js2BTC /Fscse8Gnv5bmOYGKtdWWdlCvnUsjkC297O467Ujl8CSm0u/EtqcUFU2gFoY+pxvAHlMKc rHcQ3Pb+pTo19uMGdmiV5kCtc+IqCyvKTFcLdsOX9ZcdEvZeHbqc6D38Ll74AskPUm4VM8 EfFEdgxnwQ/XpKA0NjPps3qhCJcXqixRfAN2yw4ZLuGZ4SrbvXaKWTQHzqrbTS2kTNPwqf +DybzRCBnc/mfz7lB2j3J+xSKH7RT1yckQGD0GSqV12qsJB563DAq1ozcQBkOA== 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 4PHp324q2RzJXh; Thu, 16 Feb 2023 21:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31GLSU6k074480; Thu, 16 Feb 2023 21:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GLSUOD074479; Thu, 16 Feb 2023 21:28:30 GMT (envelope-from git) Date: Thu, 16 Feb 2023 21:28:30 GMT Message-Id: <202302162128.31GLSUOD074479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3aed0ffc1588 - main - kern/clock: remove interrupt reporting from watchdog_fire() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aed0ffc15881c5cf3fc0824dad037accc960dcb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3aed0ffc15881c5cf3fc0824dad037accc960dcb commit 3aed0ffc15881c5cf3fc0824dad037accc960dcb Author: Elliott Mitchell AuthorDate: 2023-02-16 21:18:54 +0000 Commit: Mitchell Horne CommitDate: 2023-02-16 21:24:29 +0000 kern/clock: remove interrupt reporting from watchdog_fire() The interrupt counts may have been valuable in the past, but now DDB can readily provide them via 'show intrcnt'. This is one of the only consumers of these counter arrays outside of the interrupt code itself, and this should be avoided. Reviewed by: mhorne, fuz Differential Revision: https://reviews.freebsd.org/D37870 --- sys/kern/kern_clock.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index b8122b7d6468..1670b6fde0c4 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -828,30 +828,11 @@ watchdog_config(void *unused __unused, u_int cmd, int *error) } /* - * Handle a watchdog timeout by dumping interrupt information and - * then either dropping to DDB or panicking. + * Handle a watchdog timeout by dropping to DDB or panicking. */ static void watchdog_fire(void) { - int nintr; - uint64_t inttotal; - u_long *curintr; - char *curname; - - curintr = intrcnt; - curname = intrnames; - inttotal = 0; - nintr = sintrcnt / sizeof(u_long); - - printf("interrupt total\n"); - while (--nintr >= 0) { - if (*curintr) - printf("%-12s %20lu\n", curname, *curintr); - curname += strlen(curname) + 1; - inttotal += *curintr++; - } - printf("Total %20ju\n", (uintmax_t)inttotal); #if defined(KDB) && !defined(KDB_UNATTENDED) kdb_backtrace();