From nobody Mon Oct 19 15:29:31 2026 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 4j7fbw2kB7z6vV1m for ; Mon, 19 Oct 2026 15:29:32 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j7fbw0HLsz4KV9 for ; Mon, 19 Oct 2026 15:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792423772; 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=e09o2+otg6cE9MDfB7uoFn8bJkPRB5gB7STQfASra/w=; b=mgTEXfprjpvKQSMfWnEm7q8uhDeaoGh1Xra3L+UF/+RCGKiFX3OdLeHX6qTIAHwTyrrhWn jia8D/N9kRt0Bzj9HnD8neNEPATT/eGhOBW104yGVif+7z2FpaYePRg8Y7UNDLGzCYrFT0 hvYofI2wl3hbAALpNyISotEwc/SuB4qjh/1pVy3mHrVB3w/C7nnE56AqwafBfPKbWMs7WN UtSf1fkEfDQxnDPAdzxzA8K1W4gxo9NGbLAYLqr8POM9RBTEAUaRuQzX08sBDf+34Vbne0 J5bzmLyZso19CGdp8YG49uQV0Zowyo/iAIW7zDE7zN49dh27HwZT7fjQnCrLZg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792423772; b=s4ro2sAJb5TCWu4JUPIHQJAZ7rNKRUvz4HqS7P5lfV1UqWkHV0tUqCbyqL+kswGHG4b2JB 1L7jHkOcBCaGUamzx0DqdeRzumZJLXcxM8Uv2dkutvagkWRaGZ1sslkNgdbjCJHgZA9rP8 d6DWAN8CwN/jy+5oKkhOLchvZZCRFnBcD+gyG1ikWesvQIWTDudKqIWEATCJQhk3GSuGXN idHA30gwjgIcGa4E92Le6xF4VSD+B4pm6soLxFLnof7rfEBEKNQNyxxk1wMmY6vaPeoJyx 1n6iuwnooJvV1xEdIK8EzDzYcIuWTvn4aFfX+xgbM9uzgE+RrlHbXOlduY18vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792423772; 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=e09o2+otg6cE9MDfB7uoFn8bJkPRB5gB7STQfASra/w=; b=IJSeH0cXojryQeF1Kzwn7jJgMKhDQdV5ZxX4CozDoZDmdBg/DE2mclQaDirsvSKCzusUJ5 P2fze0w7ZAQ8QdJR2AF689SqirX2tUH5FT/Y4rOFWfoECEe+bjndSnmcqZ2fXGHQarigvW hjCqd8FVh7eEvSyUHHxlIjAx/fAxoArq78dsamhsIb38SnLpzB8L8aEPKeCDKQCyzN/QKZ 7dWYq1KeUtBVDJi1WICC9i2vGuNDULxh3mcOCzWrTVlXSvObdE78/7X+LUpuaB7rD9zB0n V2htaopinicZoRZi12qKcVyJ8VteUfVtfFJy9OSdJtxNY34pDtaZAPzb6pxuHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j7fbv6YsdzPgS for ; Mon, 19 Oct 2026 15:29:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 431fb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 15:29:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 32f7bddb443a - main - amd64: Don't probe MSR_IRPERF when running under bhyve List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32f7bddb443ad7ddc72fa65ab0eb3a3658703cc7 Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 15:29:31 +0000 Message-Id: <6ad6375b.431fb.6dc14d38@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=32f7bddb443ad7ddc72fa65ab0eb3a3658703cc7 commit 32f7bddb443ad7ddc72fa65ab0eb3a3658703cc7 Author: Mark Johnston AuthorDate: 2026-10-19 13:59:41 +0000 Commit: Mark Johnston CommitDate: 2026-10-19 15:29:13 +0000 amd64: Don't probe MSR_IRPERF when running under bhyve vmm doesn't implement it, and bhyve simply aborts. I fixed this in commit c83e075d72f6, but it'll still be impossible to boot newer FreeBSD guests on older hosts without this workaround. Reviewed by: adrian Fixes: 2272fac218a8 ("hwpmc: Add support for AMD-only IRPERF in hwpmc PERF class") Differential Revision: https://reviews.freebsd.org/D60730 --- sys/amd64/amd64/initcpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index a690e3829e7a..6ca89f2b36d4 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -375,11 +375,15 @@ initializecpu(void) * returns inaccurate values. That case is handled entirely by the * family/model check above. * + * Released versions of vmm erroneously advertise IRPERF support, so + * ignore it when running under bhyve. + * * This runs on every core (BSP and each AP) via initializecpu(); * pmc_amd_initialize() later assumes IRPERF's enabled/disabled state * is consistent across all cores. */ if ((amd_extended_feature_extensions & AMDFEID_IRPERF) && + vm_guest != VM_GUEST_BHYVE && ((CPUID_TO_FAMILY(cpu_id) > 0x17) || (CPUID_TO_FAMILY(cpu_id) == 0x17 && CPUID_TO_MODEL(cpu_id) >= 0x30))) { wrmsr(MSR_HWCR, rdmsr(MSR_HWCR) | HWCR_IRPERFEN);