From nobody Tue Nov 17 21:38:50 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 4jTdQg3Hssz6w0Tc for ; Tue, 17 Nov 2026 21:38:51 +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 4jTdQg1QDqz4L6f for ; Tue, 17 Nov 2026 21:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794951531; 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=6ri/C5DcBvLhfoA2FOYwY49SjHgiYur20QGJYqBchgQ=; b=nwaGBb2j3RQzhnf+S6LMIpmxFNbDBik8cKB7iSoqbY0ULhIVHAIj3skeL1lQi9K0zGiGrX wDWs3Np7ps5jYWErdZa5Hd+VL0Bpu1BOISSJgBzJgb1O4NAVB0DCBec3ZKuYtJ1wn47knD iDOJOqkB29MU1Sc2GntXUhZfhKV4EZwJpD47lK2t6EwGl2bIqTwIYOZWQQEZqOCYd9k/h0 K39OofJyUr4Hu/rXbeFvB/URKSZe4mo958e8oobtn85taa4gzBrNff/bhBLh9bca46oXS9 G6HaoJ8E44DUqTDqZ/6vAKjlw03mskwlZ0d8kTzGUCgIYVVCLgU5D9l95gmIKQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794951531; b=UaH5xB7AiOX0plm9/Lt8+z4Sj7PuP3NtnBXcbEVJc6ur0YH9Mz9nuNc/wgKQo5M3lP+8tP K78ng9/Aey7yppBggV3UgqSSPTdIJ6xlMGW8s+IeJfj1TZZm+vF9HBalBIyhUoBDdwjPZr Fk1yy6CpSf/RlQiUZe+98nkxncrydkRsTucfTQGfV0/e7QTEspwU/uq37RNgB+bVeztLJn 0Lzh7qYrvOtojyGWHzumbwsXAbtDdPd8PYsRRlmhoiRzcXjWk4aiBWhbRa+drALQaAmu0S bySrLM7H0h/tsju+/UXFbQ/T2CgB0DNFA9x284YfX/vT0hnCezkISB6XpQd/LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794951531; 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=6ri/C5DcBvLhfoA2FOYwY49SjHgiYur20QGJYqBchgQ=; b=NwVFThtwHuHB+AXvx0A49KdvOVHPbbXsFUYHQPtKd325PrkvSnXf74fpLjJtAR4ByoyAOR Z78B7j5eC+fb4loEyN3qqiTlIqNNkZ6uNY9M5NTK4+Auh+mHnAW9lT5Z3v1sQC7O/zPFUl DVE7blQNjCPtqb8ostRPeN6pZM8Zks5LL28m6LAFi/pxAdACd/Z1EQy6a09BRiM3Ps/Z61 ipya5MSK7HwhNKGMBLanyQlNYcMqOsIS/XzNwdUkG8cxDxTGadFMAJUZF7T89t7uojk1Z1 HfBGjzEvY9votW41TcMFhl85YEtNZ1BcwwArpQa6Oanjw0pJs9chTQh7Jd2qkQ== 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 4jTdQg0KKSz10s2 for ; Tue, 17 Nov 2026 21:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1af0f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 21:38:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hayzam Sherif Subject: git: 919ec3e939db - main - vmm: Avoid redundant AMD DEBUGCTL writes 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: hayzam X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 919ec3e939db71a6fc0d4ef5d72a9c3007a5c929 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 21:38:50 +0000 Message-Id: <6afcc96a.1af0f.6e77515c@gitrepo.freebsd.org> The branch main has been updated by hayzam: URL: https://cgit.FreeBSD.org/src/commit/?id=919ec3e939db71a6fc0d4ef5d72a9c3007a5c929 commit 919ec3e939db71a6fc0d4ef5d72a9c3007a5c929 Author: Hayzam Sherif AuthorDate: 2026-11-17 21:36:40 +0000 Commit: Hayzam Sherif CommitDate: 2026-11-17 21:36:40 +0000 vmm: Avoid redundant AMD DEBUGCTL writes Skip clearing and restoring DEBUGCTL when the saved host value is zero. The entry path leaves DEBUGCTL zero, and LBR virtualization restores that host value on VM exit. A rejected guest entry also returns with the pre-VMRUN DEBUGCTL value. Guest accesses to DEBUGCTL remain intercepted. Preserve the existing writes for nonzero host state. Avoiding the redundant writes can also avoid intercepted MSR accesses when bhyve runs under another hypervisor. Reviewed by: markj, bnovkov Approved by: markj (mentor) Sponsored by: Alchemilla Ventures Private Limited MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D61218 --- sys/amd64/vmm/amd/svm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index 37c950cfbc5f..2ac84e36aa5a 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -2079,7 +2079,8 @@ svm_dr_enter_guest(struct svm_regctx *gctx) * VMCB. */ load_dr7(0); - wrmsr(MSR_DEBUGCTLMSR, 0); + if (gctx->host_debugctl != 0) + wrmsr(MSR_DEBUGCTLMSR, 0); /* Save host debug registers. */ gctx->host_dr0 = rdr0(); @@ -2114,7 +2115,12 @@ svm_dr_leave_guest(struct svm_regctx *gctx) load_dr2(gctx->host_dr2); load_dr3(gctx->host_dr3); load_dr6(gctx->host_dr6); - wrmsr(MSR_DEBUGCTLMSR, gctx->host_debugctl); + /* + * LBR virtualization restores the zero DEBUGCTL value used at VMRUN. + * Only a nonzero original host value needs restoring here. + */ + if (gctx->host_debugctl != 0) + wrmsr(MSR_DEBUGCTLMSR, gctx->host_debugctl); load_dr7(gctx->host_dr7); }