From nobody Mon Nov 17 22:16:38 2025 X-Original-To: dev-commits-src-branches@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 4d9MXl2Cvlz6H4Ty; Mon, 17 Nov 2025 22:16:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9MXl1fRyz3gTF; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; 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=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=TjU9ot+G2IDd03iqpQXXnXGFZt0LqGlVyz2CwdnP0+49eC80s6OHYp8rMmPj+5jF481Oin FEt5Hza4R+LC5FJBiEajyvY3PPz9xw6J4cqzGhON7UFCxDOwUcjawvT+0bp4j7Dte8wiG2 HVykMYlEkndlEBHfGYaFouQH49j9DUEaqOe2AbxiowvbZOrtaTbnArFX6msVilwQK85HkC drLChHvFMyxkxgeSEn+qmFy94J3yKn9pxKgUNxBTuHYUy7+H2dZ0fzTIUc8kpDfBC6zQFy uQnQTO5WjgNFrwaS4k8oK5CeipwPP4EP59u0m/b49ImPxTuoWxgc0O8omUAfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763417799; 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=z/0DffE6wFsjHuOJvk9f8ZJkbeqFagV20PogMX+GueQ=; b=PmTUseBgZy2Iz5IbsOrR6k/3lH20lvw5WocPRQGLSgUljGScTRtVVvm4Valekx7E8cCFVy ZyUkraB+hhQMFKLELjfbV9J/FQOmSxuu+9yTvI48l9Jez7rR3+G3Ue+Ib7ZnutpliXKRdk VmahMOsjx1iZj6PxldtHghzA0WL64jkvFMIQiTZ5GlOWy1PWfkR6/yy2QLweRYdi7joj5D 8F6ugeoJaWjca9w7n1AsCFNmXmM1fGEim83yMs+6LsEXTcbKJmu/msEBNLNU2yKGU69sa+ qiA8B7dAzH+yP9CjdySr+/LqPBw1IkHnJ/hWQpIOGH2bGZYnBxugffs020HPLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763417799; a=rsa-sha256; cv=none; b=qsahfR1bln0Ei9vQRZAv7YSNgXnE7tNmKtgPUmKk70lPAWVNtgOcQ7/9N+9HqfEHVHDOZB ukmdbaKckdyi4nhB94k9U7/iauV/lo+KmvJ/JrMESx/i/2NrEMyUvT30mhW0ZuxNjNF0rr u43r1tUExsY8OT1jP0e3rYgjtUozsOZXJW8cntW3RDlIsc3XDtyu1U0+/dF1fEpoYEq+Xw 2ETN0KQD4zCM7bSEnZ+UzVtqTdKEzYPSVAy6rrNEuZpBnJ7EiHArJYvn2CCukqy5H0JaD3 +JaVRe+hK6LrGaz88IzpB8Oc4yE8QM1QwgFKVMCio6DCX22YPXMrnsu7Eo9LdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9MXl0jmKzBQt; Mon, 17 Nov 2025 22:16:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5AHMGcbW049884; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AHMGcp7049881; Mon, 17 Nov 2025 22:16:38 GMT (envelope-from git) Date: Mon, 17 Nov 2025 22:16:38 GMT Message-Id: <202511172216.5AHMGcp7049881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Chuck Tuffli Subject: git: 321a15380668 - stable/14 - bhyve: Report SVM as disabled on AMD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chuck X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 321a153806685dff031c6ab2d453f077914910ec Auto-Submitted: auto-generated The branch stable/14 has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=321a153806685dff031c6ab2d453f077914910ec commit 321a153806685dff031c6ab2d453f077914910ec Author: Chuck Tuffli AuthorDate: 2025-07-26 22:09:59 +0000 Commit: Chuck Tuffli CommitDate: 2025-11-17 21:54:00 +0000 bhyve: Report SVM as disabled on AMD bhyve with a Windows 2025 guest will hang/freeze with the message rdmsr to register 0xc0010114 on a system with an AMD Ryzen 5. Evidently, recent versions of Windows ignore the CPUID bits and still read this MSR. Fix is to report Secure Virtual Machine (SVM) mode as disabled in the VM CR. PR: 288308 (cherry picked from commit 92dfc3fbcd79422a4586590edabe483f361b7e0e) --- usr.sbin/bhyve/amd64/xmsr.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/amd64/xmsr.c b/usr.sbin/bhyve/amd64/xmsr.c index 7481df4669e7..b245fc27045d 100644 --- a/usr.sbin/bhyve/amd64/xmsr.c +++ b/usr.sbin/bhyve/amd64/xmsr.c @@ -205,6 +205,15 @@ emulate_rdmsr(struct vcpu *vcpu __unused, uint32_t num, uint64_t *val) *val = 1; break; + case MSR_VM_CR: + /* + * We currently don't support nested virt. + * Windows seems to ignore the cpuid bits and reads this + * MSR anyways. + */ + *val = VM_CR_SVMDIS; + break; + default: error = -1; break;