From nobody Wed Sep 30 15:54:07 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 4hw0391x5fz6tk5N for ; Wed, 30 Sep 2026 15:54:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hw0385Mhpz4T7Y for ; Wed, 30 Sep 2026 15:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790783652; 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=W6pOhoAVLOZaBcrCHlIuXlRq6DCrgBluKg5qsUJeXbI=; b=gKdrvODB4WzwNt5NBZErjwbW7+T8r+GBMHxuIGjoZuOET97qBfqWrCjc2rEIoXKthheW6b c4KubSeW9asAxGBQsFEwL2CQHSODMfmNukWBB29L6r0Bw6u4zBKWtRW+d6/yw3rSNMYbo8 RfwHeSJydx9zOwtoEBbQWUrkLHc9ZTRgTQpltrTsdSuwvogLCMtuBPyYbYpKZE9KN+mMhh zlG+TqoWmvB9eHlAL9KO/uy63QtbYgDR2xGxFjZFV/SkKjKRnMEAizr54GxwoVohelUokC PQcCvM612xWqh02ivfyt/7VW4EPFjmpvhguUOskXCUJ2a0ckBoAr98Y0ql4EFQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790783652; b=X3SUAMNLVLUTu63tna6eSYkB6WfG5c5W8RISQsB1tOfR8mCJXTRkCCiSerzfKXJduQBnjo Id0GMs3sHzkgbcv+Z7Wlrhyf7WzUEpf2DdS7QWa5MYbpBLKxJxYXfAcSWfCufY4kTkgRRG PKxb+T+AFoxqohUd/kAIQIbcDz0i/Y1YR9FAAqHM0hO4TmBonW7zTFcjqenWK7LeKd+8+L O9zNYbLvIpKz6uhQ+8htJUYWlL4suN7093MryxNZscJJ0YiHOIL/29Lav85zasoOo4VAnB 4wOcq7CTvtvNRK+7Uw4+YeGAm1fgybJyyTDWB/SJR0VF/8ChlXCw9Rx9pA+S7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790783652; 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=W6pOhoAVLOZaBcrCHlIuXlRq6DCrgBluKg5qsUJeXbI=; b=f+oDDJYGxIxCxuvRztoEFrFZjTLDtXhbRW+WzXza5g5XRK3AVLwm80t5ZzpMBF1otNtA/j lUW31sa8ddxBf791LhcLwVdjwVoFUEvL6td1hMVJ1Gj9aqtPCO2vYs/ygfo6DLYpuhz66k gp4XSjN37omAcbfZnIGQGM2y1qFSPe+qOYvtrAx9bHh0e/JhLcn9/O+ilOPxxD1tWbV+q/ tHyxahuY3A08YaSp5ZByzEx72+EViuN22qmgPFB4bRqrwcgktZHIsS4re8zrbdg8981EQC ErM7qMbDA4v8KiwksO2tH8L7JdBPMd348H+E7xz7xQlGwhU0tmCfTYhTZF2ebA== 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 4hw0384NZwzrCj for ; Wed, 30 Sep 2026 15:54:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32dc6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 30 Sep 2026 15:54:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Hayzam Sherif From: Mark Johnston Subject: git: 873508de1eb6 - main - vmm: Suspend the VM on a hardware triple fault List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 873508de1eb6ee3e73a92a25dc769baffd3d3f64 Auto-Submitted: auto-generated Date: Wed, 30 Sep 2026 15:54:07 +0000 Message-Id: <6abd309f.32dc6.d4be80f@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=873508de1eb6ee3e73a92a25dc769baffd3d3f64 commit 873508de1eb6ee3e73a92a25dc769baffd3d3f64 Author: Hayzam Sherif AuthorDate: 2026-09-30 14:16:15 +0000 Commit: Mark Johnston CommitDate: 2026-09-30 15:53:51 +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 --- 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;