From nobody Sat Jul 26 23:11:11 2025 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 4bqL8H6LDjz62rKB; Sat, 26 Jul 2025 23:11:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bqL8H5VJSz3CMF; Sat, 26 Jul 2025 23:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753571471; 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=uy+yC9NGN7Q7NrG/ESzq3zy181BjhDwltQnYpsbe0Kw=; b=h9issxu0FhcWx6wKvDZYHGbd8ka6Y7oeMC/0vGiItoGwT+QwDlpuU+gNAmhbk5LcVPHYe7 0CqPFZR4XnZ00OllZ1K5WNPxehgSLtSFMEKp9bwPVT47aCT8vWW/ccL2GIkX+TwWLHsDxA coZNtVfnyHooFu4uor5Oqhn6TO0tCK/DJhnT6Lih7Cn3YzsETlxQIdLEM3/VwKmIHo0fVe EC+I1nPz9TfDBau0iWaaI2SxjP4pAl5C/51wcX8XUyfs2DII+emb8lode4O1QYlMRbkM/x 4Zpbdx4n/dmFvN6n6+fiY4RWnqkbVPuU6SjXdgRo6WuGXtC9+G41cyi0PF+Qtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753571471; 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=uy+yC9NGN7Q7NrG/ESzq3zy181BjhDwltQnYpsbe0Kw=; b=wttlI6oeOHuP/XwncBWJGq31EwgAv6F7pKPQ4hKwq3HJSlH95ue+1/4XD8zrYKz9vIwgPZ jOM8SbBlY999U0QXaj/DBC/Eek3syh5kQNLa45mOL2GF9ujbAaciNPm7bAHjSLXa8zK758 WmO21fXhcUITrHAfJwVQqifet3M42p8J39xnEK12/qS+lTMInc5yZc/YgftPxLjKRatwxo gP+sZEeCysqE4fEGpA8KOn7t2Ce0a1krUBb0tl8steN4qTfMQ8JjpUBeL4T9BjSke0glZb yXBNRLR18mK9d/ofcTW/Jayb5xG9PMpebeJVvEyx8CUAsD4GTmV7F27SdAC5rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753571471; a=rsa-sha256; cv=none; b=heyD4JNQDImpVqHOtKiuitLZy0OrRfeMcV7tGzy/Zvvqcgx8uSxUgXrOZIqFW78IVJ0I0L BQc84dDBnyEaRcObXm9Ms7ylGRYevbnC8fg9NactOZwV98qcn9Z/we5eVWk8CLtial2xyn xtDoPTrssH4nOY2+mgmp4qE5BxX48kmoXJ3MnzDdD0YL48WfBZ3EYuWOsTmopVwnqwRGWV rnDg9OU2zYEuBKYDwsG8+QsspJMO+Vo71Zb3aVtCvFTpI/EzUJUsfFXeNU6Q+BnLddA1eT GIoDo6dZdMDtFe6jrVhKbHXY0g4H8ucVsj15w0qCTZamCcrJ+fxbqJr1+jU/hw== 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 4bqL8H53mXzqnJ; Sat, 26 Jul 2025 23:11:11 +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 56QNBBbR052342; Sat, 26 Jul 2025 23:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56QNBB3g052339; Sat, 26 Jul 2025 23:11:11 GMT (envelope-from git) Date: Sat, 26 Jul 2025 23:11:11 GMT Message-Id: <202507262311.56QNBB3g052339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Tuffli Subject: git: 92dfc3fbcd79 - main - bhyve: Report SVM as disabled on AMD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 92dfc3fbcd79422a4586590edabe483f361b7e0e Auto-Submitted: auto-generated The branch main has been updated by chuck: URL: https://cgit.FreeBSD.org/src/commit/?id=92dfc3fbcd79422a4586590edabe483f361b7e0e commit 92dfc3fbcd79422a4586590edabe483f361b7e0e Author: Chuck Tuffli AuthorDate: 2025-07-26 22:09:59 +0000 Commit: Chuck Tuffli CommitDate: 2025-07-26 23:01:42 +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 Reported by: demik+freebsd@lostwave.net Tested by: demik+freebsd@lostwave.net Obtained from: Illumos MFC after: 1 week Reviewed by: avg, markj, jhb Differential Revision: https://reviews.freebsd.org/D51480 --- 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 cd80e4ef782e..7c174728f4fa 100644 --- a/usr.sbin/bhyve/amd64/xmsr.c +++ b/usr.sbin/bhyve/amd64/xmsr.c @@ -204,6 +204,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;