From nobody Sun Aug 23 08:11:35 2026 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 4hSRZv4TPQz6pys8 for ; Sun, 23 Aug 2026 08:11:35 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSRZv34Wcz4Lb9 for ; Sun, 23 Aug 2026 08:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787472695; 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=N3MdwO3ATQ3qd3KAwbbP1XImoZso25KINmv4pRVQwRE=; b=Gc0DUA4iXDXxzYScI0+X4YA+lGVy81Jhd3M4lh8/XBKQbyT74nb9x0nJ+ZZHovhbibYIsR IqJtGnoJOLRAYkFK7L3nzlHkKu+g5CBEXaCBgZHWA7M0BIvd+FWzJXyGkxpumtGRO+Ob6S EQw+CbsLjLmo6DWEfXAcCySGJYPuhT1ATxex2iPww24BbuvsOpyffYRCqqRWkBqP9R6z5p nl+7+6EaEUw5gMZqU1OTUw/2iMgyPZRctlpxRmhiBzZgoilUI4xDI7goEJtGiyia6OYxYz r8LcYHp6uJK9nDnn2tOfa2E6eHxbtJQnAjML6axy9S+zuZL8bbT/+LlDrFqhrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787472695; a=rsa-sha256; cv=none; b=AIuh8iXzkb7efJWNE+OJZfkbmtpd/3PrKGT4ST2JBB8ZoT3x2WMjRu1U0BIw4sO2h2p2bY OChO5iWxarYW9FnULnYE5HHEhumcckqOGZm897Bzb+FmmpH1wAoIN1sNQWku2lnmcpq4Qt g6mnRO6WeCCo3CkI86Ow6d6P+ZdylWpi+3ZVZ2jP0YTf+vKajsLxG7zhzrL9Apx76g20m2 pvSSVLQKhtxnAX/IlfuaNG2bQLjKC2hZzyPGD2Ufxj4bAYy6wNFayCG8bEtWS9k9SwadKK e02cNmVsfJ1w6h+kUWIPtGJopap2AuSPQAchezTS4blX/tKTZ9WEiyI9B3WhEQ== 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=1787472695; 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=N3MdwO3ATQ3qd3KAwbbP1XImoZso25KINmv4pRVQwRE=; b=YCPilZ0++7wv3D6y8xb1AQkVTIV6FNHpUxlGuNIKFDtTl8bN69Wp8m7UjhQXK5uxCfvq9z cBIbOiSCRoVJgce4I28aHNSZ17iP8t2fIYwVUgd6GD2uSB+ZPcbS/sXO/YXKH/J+BdHYRs +4zWpkkEyupiKPNOtaDLiosxIZopnVVeloxtupLJ/xjYZhRp4jtmCIBtD2eLavqo25ukm2 w8bsVJtTLTLZsuAQcN/2U0dtVSMw+uactRGwBpTCYo9m4EIUmsJ8xEEJq5W6jJ6hszGUnR 8FOZt/fDD0vqBzJvQgT6NNdUucPJ6VgAGyQesKC6TbesUemZwTrRxTM62Sq9uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSRZv1FWnz1NlH for ; Sun, 23 Aug 2026 08:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e25e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Aug 2026 08:11:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: d2e7fcb6dd79 - main - hwpmc: do not register RAPL when the unit register reads as zero 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2e7fcb6dd79691d336c3700e4727a887e5cabdc Auto-Submitted: auto-generated Date: Sun, 23 Aug 2026 08:11:35 +0000 Message-Id: <6a8aab37.3e25e.62f7baa2@gitrepo.freebsd.org> The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=d2e7fcb6dd79691d336c3700e4727a887e5cabdc commit d2e7fcb6dd79691d336c3700e4727a887e5cabdc Author: Alexander Leidinger AuthorDate: 2026-08-22 07:59:03 +0000 Commit: Alexander Leidinger CommitDate: 2026-08-23 08:09:36 +0000 hwpmc: do not register RAPL when the unit register reads as zero An energy status unit of zero means one joule per raw tick, which no part reports; it is what a hypervisor returns for an MSR it does not implement. Both energy rows are scaled by that field, so the class would be registered with counters that read zero forever. Refuse it, as the class is already refused when no energy MSR responds. Assisted-by: Claude Code (Opus 5) --- sys/dev/hwpmc/hwpmc_rapl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/hwpmc/hwpmc_rapl.c b/sys/dev/hwpmc/hwpmc_rapl.c index 4ca76bc12403..c505ae35c248 100644 --- a/sys/dev/hwpmc/hwpmc_rapl.c +++ b/sys/dev/hwpmc/hwpmc_rapl.c @@ -535,6 +535,11 @@ pmc_rapl_initialize(struct pmc_mdep *md, int maxcpu, int classindex) if (rdmsr_safe(unit_msr, &unit_val) != 0) return (ENXIO); esu = (unit_val >> 8) & 0x1f; + + /* A zero unit is a hypervisor's answer for an MSR it does not have. */ + if (esu == 0) + return (ENXIO); + dram_unit = rapl_intel_fixed_dram_unit() ? 16 : esu; /* Build the event table from the MSRs that actually respond. */