From nobody Tue Nov 17 21:32:12 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 4jTdH071GGz6vylc for ; Tue, 17 Nov 2026 21:32:12 +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 4jTdH04f0Rz4KSb for ; Tue, 17 Nov 2026 21:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794951132; 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=AVGcjj7BezoLRz5gSwQHrL1xRg/ekJmQxADkM6YKx94=; b=g7SoPYEYFrWdOVDB73MmI3Xmo44EFtr6ATLnTvmJAFP8HFC90Xp6ROepaVZy0WptxAOFmU MBMU3qcYT+XQO9S4/G2mtxXiaAjYr7XARe3Ur6bMRVgLCJ8demyhPHWJ56QpaVnqLpuXuc U4pG7BDuo2Lv/wgMzQ1Z7OzJClmrbYJ+lEafj4wRer7RaPqoiBog0sidcNDKC9fAgH9vPf VyghPMh98QSl7O/g6g6ymnjZfEBs+gD914MTgIKNTjCNvnIQoID/LQxfNMhREdsAql17hy jfvmfpp2daxHoPOQwG98E4kSUc7oKiEwdkZ8bJ0kaJo05zhAyE0kbgL1vhtD3A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794951132; b=dp9W8wrwA6OByl2DDtCdK6tHTcfU9mXYY2mvLQpyEqCQ5gCpjNXMBB8iZuUxaxN/ao2AIQ QUCBQ2+CsG2SFFjF4o9PmPq9v+fWxOXnL7zqmLGuN5Lcqgg70V2TwQ+Oh6FH6WFFXc8XgJ oBWs2UthSoKJLZYr6OvB7s03EHq0QnLDxZo51eTLXCe7XBjVH3QgosbCVhGwkIBPamGcyK 7nC1pcsRMHBNRLS6/37tnORRtzKjDrpFAH9Q5vtJ6xiXkHK/sBhQta1duKrfAWXQwE9oCi OJwvIc2tiAKQQjozWPlP4EN7TWZnJ+ZwjHBdC5jdIEJb4p8FEPFyQIetfZUdcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794951132; 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=AVGcjj7BezoLRz5gSwQHrL1xRg/ekJmQxADkM6YKx94=; b=usXEDFMNldrsF6k7hURAA9wmmCB/EoMgyB0pDgzhYOCkcdA3tUVAeLRV/mFTS7sv1xJ/nq 6wjo93GG2K46ncJWCL8FKh34WlxobMS3oo1iRTGF75aYkUvuKk/YK+0Y+oNT/eOPyybF9i WaqdXsyM1rY3X8aqzbXXrixsGsHKtW+zWMhi1s4wBMlYgZoHgQ9UHL51//JQ/gZQFaQgJV QJGfVqteFoR/wAYSkp8RJZ40f6flmRu/rcUhS/CK10ZcLWheSQ+SKgyyO7ugH4zMWckgHx 5dPucYJ+lGVXn+flr6H8M2xmk3qiWmdP4mPdBbA7u/3UQwY44nIXlo6UxYuYrQ== 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 4jTdH04JJkz116x for ; Tue, 17 Nov 2026 21:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5ca by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 21:32:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hayzam Sherif Subject: git: e52e4f8a71f9 - main - vmm: Avoid redundant Intel 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: e52e4f8a71f9d0c80be0d0adb687437667723185 Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 21:32:12 +0000 Message-Id: <6afcc7dc.1a5ca.595f6e7d@gitrepo.freebsd.org> The branch main has been updated by hayzam: URL: https://cgit.FreeBSD.org/src/commit/?id=e52e4f8a71f9d0c80be0d0adb687437667723185 commit e52e4f8a71f9d0c80be0d0adb687437667723185 Author: Hayzam Sherif AuthorDate: 2026-11-17 20:58:09 +0000 Commit: Hayzam Sherif CommitDate: 2026-11-17 21:29:49 +0000 vmm: Avoid redundant Intel DEBUGCTL writes Skip clearing and restoring IA32_DEBUGCTL when the saved host value is zero. VM exit clears the register. If VM entry fails, the entry path has already cleared any nonzero host value, so restoring zero is also unnecessary in that case. Preserve the existing writes for nonzero host state. Avoiding these 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/D61219 --- sys/amd64/vmm/intel/vmx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 0b9a4eea3ebb..4ad17861a437 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -2959,7 +2959,8 @@ vmx_dr_enter_guest(struct vmxctx *vmxctx) * guest DR7 and DEBUGCTL are saved/restored in the VMCS. */ load_dr7(0); - wrmsr(MSR_DEBUGCTLMSR, 0); + if (vmxctx->host_debugctl != 0) + wrmsr(MSR_DEBUGCTLMSR, 0); /* * Disable single stepping the kernel to avoid corrupting the @@ -3006,7 +3007,9 @@ vmx_dr_leave_guest(struct vmxctx *vmxctx) load_dr2(vmxctx->host_dr2); load_dr3(vmxctx->host_dr3); load_dr6(vmxctx->host_dr6); - wrmsr(MSR_DEBUGCTLMSR, vmxctx->host_debugctl); + /* VM-exit clears DEBUGCTL; a failed entry also leaves it cleared. */ + if (vmxctx->host_debugctl != 0) + wrmsr(MSR_DEBUGCTLMSR, vmxctx->host_debugctl); load_dr7(vmxctx->host_dr7); write_rflags(read_rflags() | vmxctx->host_tf); }