From nobody Mon Jul 17 16:49:36 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 4R4SjX6XGbz4n4FK; Mon, 17 Jul 2023 16:49:36 +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 4R4SjX642bz4J2l; Mon, 17 Jul 2023 16:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689612576; 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=Z1RCJHjNdk3kEAvA0GjCNJmQxJAtjqFacN5b7tixxks=; b=Hf/L0Es5CHIiWQAp2m38iPcwk/aRKJP9PH876l7FI7xNvRZNJD22zp3ehtkzP4P+mrzlt7 DQvQZGU31cM67RNTTeuOVRumbrB+KmDXD5aRGEpVBXXq2hYONGdvtE9vtTK0pkCRHtHAxB HFtWsrbnUM78DIaKXmunN6b3ij6B2ebN3H+ug3mA1NbGAWnX91vtAhn3kxIoY3zsNlGiKH MXlsejs7jmJr8XDQdnOoaH9Fo9wAEIEyew3rc9j8KyGxcySMR/kKNsJ5sfHV22ov9jCEM0 89sjcBeGf/HzVx98zVBYRnsK3tor1ILSL4ZsS5URZ9RjjfYjFN59K36KRM5kzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689612576; 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=Z1RCJHjNdk3kEAvA0GjCNJmQxJAtjqFacN5b7tixxks=; b=IlymLSc4XI5lpXcMSUQw++go0KTqVtJRUk5FcJ91vfIkMnqAZhDad5s9XfpA9lQR90OYiQ FJuspOEm34mBO8uVYOqQ+E5XWGt4OeOlv1OgoTCxIAt+vyi/CLUgS5ZdHtmwoYMa8kI0YT L+yiEiKlny5IkJJTOh3BtQPh0UTT1ospAynJkUBb7TM7dFxZbCx77Mwf5QAnSfbvL7o3R0 HBUhqh6+IbUyTSycrmJsNWhXOQxLQq7Uvn2KeNjXuaPL47GMOKz9jh/rwTHfyxlGePaqDQ Ao2GXuappm3Eq9x+EwPmy2SiWuYj+GkaQe26w2uJ7gdabTOW+bhBAEI2u6L8+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689612576; a=rsa-sha256; cv=none; b=Orii2X0nrrcnvtWKVDO9b4cVgMObsLdrT7M7ye4ps78j4SLKPqEqN/y2iOdIuCdCQDA0Az nIMwO7u5/XbS3W12i3sjKvV3v3l71JykFm9ehi4aEqIynwQBak7MyiI7OMEPT2qHU+lrAt cYGBCyfpdM8fANAjasScdoz9+Mbm75m4pgFqI0WF4mhkfx2vo48/4bFr+rQrG4p0L0bXUL hZxmq8qbmEIuY8a6uFjR533muxn0iszj3hf020A5FfuozzMYfMbXVIpsjFLUcsztNqamoF Oy3cJyJ8+atI0xJYzVRhUXe8+ixWHG8Hun+afRBwUyTZrfbgpD0A8AxvXsa1Ag== 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 4R4SjX57fszWww; Mon, 17 Jul 2023 16:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HGnaJW081314; Mon, 17 Jul 2023 16:49:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HGna6W081313; Mon, 17 Jul 2023 16:49:36 GMT (envelope-from git) Date: Mon, 17 Jul 2023 16:49:36 GMT Message-Id: <202307171649.36HGna6W081313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 3c4860d3eeed - stable/13 - hwpmc: add error for HWPMC_DEBUG without KTR 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0 commit 3c4860d3eeed3ef56be988ec1afdcfb2fba9f3e0 Author: Mitchell Horne AuthorDate: 2023-06-16 16:38:26 +0000 Commit: Mitchell Horne CommitDate: 2023-07-17 16:45:38 +0000 hwpmc: add error for HWPMC_DEBUG without KTR The option is a no-op otherwise, but this is not necessarily obvious. Failing the compile gives the user a hint. Reviewed by: jkoshy, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40544 (cherry picked from commit 569f89b2f442e2187f750a5892a1662390364cc6) --- sys/sys/pmc.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index 1983dbb91578..2384a3a13919 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -1070,6 +1070,12 @@ extern struct pmc_cpu **pmc_pcpu; extern struct pmc_driverstats pmc_stats; #if defined(HWPMC_DEBUG) + +/* HWPMC_DEBUG without KTR will compile but is a no-op. */ +#if !defined(KTR) || !defined(KTR_COMPILE) || ((KTR_COMPILE & KTR_SUBSYS) == 0) +#error "HWPMC_DEBUG requires KTR and KTR_COMPILE=KTR_SUBSYS -- see ktr(4)" +#endif + #include /* debug flags, major flag groups */