From nobody Fri Nov 13 08:05:47 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 4jQqZM2Xcpz70CRH for ; Fri, 13 Nov 2026 08:05:47 +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 4jQqZM1t7Hz4kLN for ; Fri, 13 Nov 2026 08:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794557147; 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=cM/havkT0TK4peYy20xf58wyg+hzxn1T+cgK7UpILsg=; b=hwkvcMfFfXPf9WCisdhLNVPP+ksut76lnmgoGHU6SI0Ta6linaF50eifqECrUZ0QPDPkid MqGXjQ00Q8c/K0UlXydc11an7Kq8SvK3UZVk60pOc7X/c4AlJQslvw1Zw4QGEBu28KQfwn lkx0guNCf6M2N4tDTORaiKgwdW4P/iyxrs8mx63Ps1PFNm097lFBtoOnPiZeKTcho3A+3v 1NkNNIuqE6gp3z4KLx6fkZKegrYx7ZyeSMBKKnXVWl8YVbeoeyvyfVa21rJ7C4BgmEhmD+ EYFnJvE1Cf9XwFc9H1Yu2Nx2CRdk5vdadA4AYgN49wsCusWe5j97xZZdRA/mPg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794557147; b=mA/v0DqANpjVpg6mTpsrwxQvmz6SbnctCq/YDgIz+YPyblX46f/wS6h3n1eQDV68dEofI7 fd9B8M+t0cM7dPydEl8jjzT/pr4PiGvGwvdWloPArD3auLUjxQ2T8n9vSBfaeFM2UpGfSi uuYm670//ndE7OMbaHqpb10tUsfgCc373Cia93UxPDn3IG8izbPyn+NtqIpUFo1BYG9hPq f49UXeIS8hEiPO3x32gqsg/9BOHQEOWqz+pFJgw+ple5pmX5bGwP7vGU2aDZofgKyuOz4z AYv1ojbIgs50wk8UCZPVcBNsMgxJ7R50h+1tBJ+zvFXI7EULoUuF1NAnQoljiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794557147; 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=cM/havkT0TK4peYy20xf58wyg+hzxn1T+cgK7UpILsg=; b=sSCQkVw+BuLBebg4U53KIeq5s8A3ar1dhpQOiJ1TaJI7X+DfU9G8CkDa4J/FpoBNQnnpb7 oDalV3Te08eqMLrrydLdSEeccJDeKgaPGeEMKCHP7WG9h/QukXXf2D2y6+kBTya4v7vQTq a/NI9O5o0Xkn5t7CFBcZft155ohGQG/FG5urK9mDaHO6PwlDnlDgAXr2hqk12PAp7Pn+PH 0pP0DXTjFjRovmwBq1FoOi4XyL1Yuj7PixTQuJEjopN9CaQwB5mEDJFIbNQv5ziddQZP81 EFl4rRYgiwumjZqa811/ePS6f/xoH3o2rOh27BhizkoR+sSKqyUfu0G/AvtzbQ== 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 4jQqZM1Nw2zPnb for ; Fri, 13 Nov 2026 08:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1cd2c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Nov 2026 08:05:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 17802b56ecb9 - stable/14 - amd64/vmm: Don't advertise AMD PerfMonV2 or performance counters List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17802b56ecb9b1ff53f3a446d6f0a2b7f845a784 Auto-Submitted: auto-generated Date: Fri, 13 Nov 2026 08:05:47 +0000 Message-Id: <6af6c4db.1cd2c.797a0d75@gitrepo.freebsd.org> The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=17802b56ecb9b1ff53f3a446d6f0a2b7f845a784 commit 17802b56ecb9b1ff53f3a446d6f0a2b7f845a784 Author: Christos Margiolis AuthorDate: 2026-11-02 17:15:33 +0000 Commit: Christos Margiolis CommitDate: 2026-11-13 08:05:26 +0000 amd64/vmm: Don't advertise AMD PerfMonV2 or performance counters vmm does not handle CPUID leaf 0x80000022, so a FreeBSD guest on a Family 19h or later host panics on "kldload hwpmc", which trusts the PerfMonV2 bit and writes AMD_PMC_GLOBAL_CTL. Tested by: Osvaldo Janeri Filho MFC after: 1 week Sponsored by: The FreeBSD Foundation Reviewed by: markj, kib Differential Revision: https://reviews.freebsd.org/D61141 (cherry picked from commit 8fb539b081dbfe3e93e607a5d4d36184c53c8aaf) --- sys/amd64/vmm/x86.c | 11 +++++++++++ sys/amd64/vmm/x86.h | 1 + 2 files changed, 12 insertions(+) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index ee07842a20c8..6065b1148785 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -300,6 +300,17 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, regs[3] = 0; break; + case CPUID_8000_0022: + /* + * AMD uses this leaf to advertise performance + * counters and PerfMonV2. vmm implements neither. + */ + regs[0] = 0; + regs[1] = 0; + regs[2] = 0; + regs[3] = 0; + break; + case CPUID_0000_0001: do_cpuid(1, regs); diff --git a/sys/amd64/vmm/x86.h b/sys/amd64/vmm/x86.h index 56364f4f5cb4..9210e7abe1a3 100644 --- a/sys/amd64/vmm/x86.h +++ b/sys/amd64/vmm/x86.h @@ -52,6 +52,7 @@ #define CPUID_8000_0008 (0x80000008) #define CPUID_8000_001D (0x8000001D) #define CPUID_8000_001E (0x8000001E) +#define CPUID_8000_0022 (0x80000022) /* * CPUID instruction Fn0000_0001: