From nobody Sat Nov 14 17:26:23 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 4jRgyl6GQGz6y1NS for ; Sat, 14 Nov 2026 17:26:23 +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 4jRgyl5bVJz4p82 for ; Sat, 14 Nov 2026 17:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794677183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ep7PHwLHBkiDNxefOfNxVLbUHP5j6sl4gv6c55Tnjoc=; b=edZ6W0ua011NCYpzgGN65H3ekaK8kO/wadSNAmSlEFb7DA9b/EVcSXPAwOv10FHlNCOesU Puj+VB4eqTFt8RIkmD/mghEmiPKmxuaVDZvUu8RiBCfQimV86OqfHsRMN+SvPZRmJVZ/rn MF/k90Vl/6x93bXGGeNh6cz8KfvfifW1YUKpCv9Eik/7Cj1x8GUetcpoOESUutAShp/Ufy J9rcmgnJazW7NeP5h+wfFmBHR/qYZI5OnBn0c0NEFGLb2imGzMpDxipdSkZpbK7xdxZL1i HOyr/XXccpBch1hAwc3PyEaul4f2Tn8OHfYMzDawX9BD0BC5Yg1emzUPWQCWjw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794677183; b=BcPPZhGV+LJgdTuCOTAxwy/G/jwyunZfBZAivJ7HnB5dH9InVw5cwWUi1jr78fxzziGo18 f47BFnYbRrcOBWCYF258VFNLqmSXs/txeeZYLibLqqVr27UK42k5YVYInATvXoUBByTQtH +NeFuPxXwQZG44iyGtUCTmMLRlisd5JsbMhaxcFbSc303hAUGFA1sYPrpBk/svdLlAr9BT QzfbeMt/VnvsIC9zaH8F8SHGMmRE/RhP6cTI3cQnTNVoYZ6KnxyhpiVv4KGkjgRa6AjASM l7p9G7P0Re9COqUZzdGRCLIBeX6PUBJMupYQhyU42gDQtS8zZIEc2loj2vj9YQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794677183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ep7PHwLHBkiDNxefOfNxVLbUHP5j6sl4gv6c55Tnjoc=; b=BEAsgU7r0TWg2P7g7g+VntV//JrF9jrURSrZLTnlpTEN/GsmYwxDOoOqXrhY0mpYg4+t0j i5XEe+2AofQeiUrfd5n9LDfaA3vpw7YGxYsvcCElzlj7lwahVPLpTpeAjZSPUDAaVP7s6K MxQ7bmvreC79w/fRWgxzkxxwvsSUNPhpZajUHwdPnqtdMFv1MVX+lkM09cbEx3Co05aU+s HrIVJR3W0Oz59vWZJ/jeosa8FuMeCGF6wqLubEUBFBYkqIboJ7LHT8ov2i4L5EUEcTyrya ly9q7WyK/eP5PesSNwXcZaIMOWEOI1fcAwkX0z++HQ9PsVRySp1ukvcNcvT60A== 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 4jRgyl4zhgzV71 for ; Sat, 14 Nov 2026 17:26:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1da11 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 14 Nov 2026 17:26:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Christos Margiolis From: Colin Percival Subject: git: d555f6b974a1 - releng/15.2 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.2 X-Git-Reftype: branch X-Git-Commit: d555f6b974a1b6264f7e438af45db833356bbb82 Auto-Submitted: auto-generated Date: Sat, 14 Nov 2026 17:26:23 +0000 Message-Id: <6af899bf.1da11.1b062add@gitrepo.freebsd.org> The branch releng/15.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d555f6b974a1b6264f7e438af45db833356bbb82 commit d555f6b974a1b6264f7e438af45db833356bbb82 Author: Christos Margiolis AuthorDate: 2026-11-02 17:15:33 +0000 Commit: Colin Percival CommitDate: 2026-11-14 17:25:44 +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. Approved by: re (cperciva) 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) (cherry picked from commit ade540f274d52366b46da2898b2c264b4e89883a) --- 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 ee6be833cc7e..4c779c450d96 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -299,6 +299,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 97e759847abb..97bd9dd5cad8 100644 --- a/sys/amd64/vmm/x86.h +++ b/sys/amd64/vmm/x86.h @@ -53,6 +53,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: