From nobody Thu Apr 24 13:21:15 2025 X-Original-To: dev-commits-src-branches@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 4ZjxSW42XWz5tHKj; Thu, 24 Apr 2025 13:21:15 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjxSW34r5z44pt; Thu, 24 Apr 2025 13:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745500875; 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=SJBfkDOLdD49KLciwBUr9ejTnNVOpE4ITJGQSe6Cz+Q=; b=vq1Op8tI1abw2JAhuJf3fLJuaagaOoycHo1wa2rkWAtMr2zoqEnD9Bg/1uAcYmKYM1JOhs M7VwdpHJCwcpRWhv4OPBLehb7OD8UMv8mCIeDrjNt+E6vYSiZrULnI0U7aQG1LEj+fE4IC cX9IxOTh6yPeEcBdzl6821l/3hGO22fqo5QxSQUbY0e12ByEsjoVt4k7vna4gg16E3Fvmq x6tadIyNwjKuAYdqH1B2VZ3pksKsTGCBx6GKfXDtDz0gDRvg96uZvbuP+sAqgHJT3gIW46 j9X+uW1+wugF8TTN2GsUZ/znvLQgo/v/En+hl0Kci5Uz2KelXddj21n5TPgFlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745500875; a=rsa-sha256; cv=none; b=iZiZ1isfmon+2sNKvfDIxUuYk+a2odzxriIHOKpNnZVtWy/O5u+rsrUlRNkFLaJdDfm3x9 5BuxdnVcVGhp8lhNKpOq513vLbYsobFxlZDsD0ypfVVzWgSXs/IgSKAbIBgIYVnuY3Iypo 3rHnq8NsO0J+AOEqRCfhowgOLqNWzL6Crt7mfdMe5Uc7R7kmpBDA1oQ+trANPZLOwZlcz5 LzR8+UrkIIHvLGbJ81lMJkvvzyvzcW0gEepXDKS25MXU0zzWYM4twfxXdULfO1onTgInRZ JGNDy2xNz5PzVUKGIQFHj7w5yqIfIVw111PuOEEy9agY4X7t+V7K6kZrCnfwbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745500875; 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=SJBfkDOLdD49KLciwBUr9ejTnNVOpE4ITJGQSe6Cz+Q=; b=yLWfHO63c+E60J0mGa+JVttE8CQVMHQcjokW4q3QZVJvqTLQqKrO61mvAwp6LNSVM5NX9k 9gwDDEHI9s7uIZOzgK5EVxflbE8gNVcjZL8ZB3RMD3yKOjtTfquTWTraM6xI5L5mrfFt7S oLUqkXup70OEayopwxbWRbr9Nm8xwNqiPPstiHA4Xji1heK7PmgundTmicP/ZpMLdHUyTG 78H1B4HGJjWmvokzjU0Imax+6QVNW78wSDjtDbteMJ5eZtSN3zqwRJubOp2zp8si5kfctO CBh/7EM0DgOKvuxSwYM2a6PrkyE/5DE/5qrkcNSA0NZJUBq4OTyFXdNLKNAP3A== 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 4ZjxSW2cXRzrgY; Thu, 24 Apr 2025 13:21:15 +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 53ODLFBD038126; Thu, 24 Apr 2025 13:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53ODLFHn038123; Thu, 24 Apr 2025 13:21:15 GMT (envelope-from git) Date: Thu, 24 Apr 2025 13:21:15 GMT Message-Id: <202504241321.53ODLFHn038123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 1b7e2cc10854 - stable/14 - ktr: Make debug.ktr.verbose available whenever KTR is configured List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1b7e2cc108549a72ca37334500e987b7271d3138 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1b7e2cc108549a72ca37334500e987b7271d3138 commit 1b7e2cc108549a72ca37334500e987b7271d3138 Author: Mark Johnston AuthorDate: 2025-04-05 16:23:51 +0000 Commit: Mark Johnston CommitDate: 2025-04-24 13:20:52 +0000 ktr: Make debug.ktr.verbose available whenever KTR is configured This is more useful and matches the documentation. While here, make it settable as a tunable and add a sysctl description. PR: 139425 MFC after: 2 weeks (cherry picked from commit c5773d366ecc5271b9bd6e5506c00fb3520f19ae) --- sys/kern/kern_ktr.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index e862816c4613..cbd32d13248a 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -251,9 +251,12 @@ SYSCTL_PROC(_debug_ktr, OID_AUTO, entries, #ifdef KTR_VERBOSE int ktr_verbose = KTR_VERBOSE; -TUNABLE_INT("debug.ktr.verbose", &ktr_verbose); -SYSCTL_INT(_debug_ktr, OID_AUTO, verbose, CTLFLAG_RW, &ktr_verbose, 0, ""); +#else +int ktr_verbose = 0; #endif +TUNABLE_INT("debug.ktr.verbose", &ktr_verbose); +SYSCTL_INT(_debug_ktr, OID_AUTO, verbose, CTLFLAG_RWTUN, &ktr_verbose, 0, + "Print extra info when logging to the console"); #ifdef KTR_ALQ struct alq *ktr_alq; @@ -375,7 +378,6 @@ ktr_tracepoint(uint64_t mask, const char *file, int line, const char *format, file += 3; entry->ktr_file = file; entry->ktr_line = line; -#ifdef KTR_VERBOSE if (ktr_verbose) { #ifdef SMP printf("cpu%d ", cpu); @@ -387,7 +389,6 @@ ktr_tracepoint(uint64_t mask, const char *file, int line, const char *format, printf(format, arg1, arg2, arg3, arg4, arg5, arg6); printf("\n"); } -#endif entry->ktr_desc = format; entry->ktr_parms[0] = arg1; entry->ktr_parms[1] = arg2;