From nobody Thu Oct 22 17:32:17 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 4j9YB95f6bz6xPCj for ; Thu, 22 Oct 2026 17:32:17 +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 4j9YB93BjNz3HVk for ; Thu, 22 Oct 2026 17:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690337; 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=Z/hu5hWZfMrvUhpoVaqSCdLMAftXD7mIeYh2oWTte3U=; b=Iz99Nh5s6p3aijOKPEJMxVDqjrU7gUVvb+g3NdY/c5ybAdtuie6nSXu8S1Bs1sgHX7n/rc i7RlxgLj8gtOAJp6Xt5+mGF7It0Ca9wsklRAkpbS0Ao2XTs7jU+t0FeNnhwy/MsokDAUTU JHcvSX4Wvt3xDnA7IZ8BduUDpholp4R+/9G0ZS2a6+6AgRzCzCQi+WFOA4dRqZMLIweKkc 24Czc6xMgV2qnwQWz0erMoWZLGrJB2JHCnF+6jwJUDP9ZbE3c/rR5LPRF+r4Q1Piy5LkoK Xs18WHRBjqcLfnN60v5CVYAv7i222o+7O4Q8QtPSpFtJ9ZFifI1G8tPX5SGUFw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792690337; b=W5MRa0ePcItQ5LvRc9kI+N1A/k2hSwRUmMppGxTxK7PXVqxF3ucfA9CT0bC6xzQZJEPND0 TXZUQHPStx9WPtFC+JYK5qUKmI7VB14gW/aMQ5hZXUvT+EH76Cw+TOZSEikOHvtWoz5ize ZJuVtx4yrtAob71hqKHMb02UWmrsnO0kjJ5N7jnfq6NcFIfkSwGksdLnAskR5ksCUzl/lH GW/u8isYQ+EbV0t5VXXbTUsX3mUDL89GKYulQtwxbxQr8X6ym4M2CkpewwSg5/HUSasJRK Xi5xUR4btP8gYgF81+1KBSCGYhj0LjGZ5u+oroyHtF2gjydYc7uKDa/Uy2TQpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792690337; 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=Z/hu5hWZfMrvUhpoVaqSCdLMAftXD7mIeYh2oWTte3U=; b=Hblm4J0UCJOD6k45ZQ1VFAHIukHkU7/7PzGoDs5EabhZykH8tmQ67GwpfPUkolupiaPFhv ETENr9Fj3yw80Fm710D/LANHypvUQspZdgaGR55ZfBxjMl1GWLtfFY8vFTXrONI6ZdZQ4K 1A+wfTZpV1pJX1CCaQv/LbqwaS7w7J2vupuEpdc8RWX8uH68XVOmIrJoUDL+HRwISUesDz 5PgcMCMqWVvYyqGOPKXFIebIskjUzcUBrZU1s8pT8VYrWii+qjDpMrZ363a7JLDAfS1jII 7FcQ3iG0ImUGN9ldoP5D8UT9+LdCerqehDBQb0krtPSF1i0W46I7/MtDKv/EcA== 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 4j9YB92spqzsST for ; Thu, 22 Oct 2026 17:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c540 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Oct 2026 17:32:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: e913982469be - stable/15 - vmm: Suspend the VM on a hardware triple fault List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e913982469be8f859df1f542c6610d238d430f6a Auto-Submitted: auto-generated Date: Thu, 22 Oct 2026 17:32:17 +0000 Message-Id: <6ada48a1.3c540.63737495@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e913982469be8f859df1f542c6610d238d430f6a commit e913982469be8f859df1f542c6610d238d430f6a Author: Hayzam Sherif AuthorDate: 2026-09-30 14:16:15 +0000 Commit: Mark Johnston CommitDate: 2026-10-22 15:45:41 +0000 vmm: Suspend the VM on a hardware triple fault The VMX backend did not handle EXIT_REASON_TRIPLE_FAULT, so a hardware triple fault fell through as an unhandled exit: bhyve printed a raw VMX exit dump and aborted, instead of suspending the VM with the reason the software exception path already uses. Add the missing case so the VM suspends with VM_SUSPEND_TRIPLEFAULT and bhyve exits with BHYVE_EXIT_TRIPLEFAULT. This matches illumos change 14664. Obtained from: illumos 83b49c54d9c0766e810b6c8ff849dfb6693fc68a Reviewed by: bnovkov, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D59840 (cherry picked from commit 873508de1eb6ee3e73a92a25dc769baffd3d3f64) --- sys/amd64/vmm/intel/vmx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 29aadb5881f3..ff0e1cb2b882 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -2471,6 +2471,10 @@ vmx_exit_process(struct vmx *vmx, struct vmx_vcpu *vcpu, struct vm_exit *vmexit) } switch (reason) { + case EXIT_REASON_TRIPLE_FAULT: + (void)vm_suspend(vmx->vm, VM_SUSPEND_TRIPLEFAULT); + handled = HANDLED; + break; case EXIT_REASON_TASK_SWITCH: ts = &vmexit->u.task_switch; ts->tsssel = qual & 0xffff;