From nobody Tue Apr 28 15:13:56 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 4g4kVD1xfXz6bcJG for ; Tue, 28 Apr 2026 15:13:56 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4kVD0TzQz3L0D for ; Tue, 28 Apr 2026 15:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777389236; 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=dd83dBTZgw9lZrL5U45ljMvLJkjDUvD3mNwBC9KS91s=; b=YI6Z8OqiwEvP2hImUsS0CJ2tcBhFZXSkA2oXSmri1S4WMxl++svUVgg8XRuhp9I+7EVAEU YfOtXdz85lHiSNhTw/U/p6eZ64pl9oH5AnTkn8qYMrDuoCuvOApx12Hmb0R8Ife+YcccaW ncgOcmu/bddwU8jPFO9yh0NSZ8jxMrvA3INN9+N97wQbvX14Q45LJ0+P9R+8DX9kUOAbGw dHv0rSUtr/mye73TWqSs4i1Fwmc30UGBIdJX5SqgUeD7DANGqkbS7AMkHGWhgG32H6MVCv K/1tWeLjoDFEP3LYsdXbDr23TiaRy9ZOnLYBTq7nWHa0xJzzCVd+cQEETl7XhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777389236; a=rsa-sha256; cv=none; b=UfAXmm2KBtmcBybvBrRkj4i7ocrgksgwBa//toVQXCnYIr4OIhyoMqSsJAAOmZNHzti5Sa kYbw9SzfBFCQLALTHpg3W2lCC7R1Piqn6WMf/f/KLaiaM0sNGNtgzgToyUSws25KubXm34 QSGnO44cdtK1oDMR1b0TzZLORwTQ+iyihoKCPQoqZLtRJoEThB5c4ybsWGtl2hJKldulSn t14x2t6fIphtwIkhalul3ULdwd2WWxz4vQYn2/1ydaCL1xVHiOlnDJTqVjrd2t6ebTJUMe EA0l5H50ONxTCAOULMQoVcjoT7J3TnAEWNoSmdsLaQcxlGcbxSRdy4X/repY4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777389236; 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=dd83dBTZgw9lZrL5U45ljMvLJkjDUvD3mNwBC9KS91s=; b=ZHQcdX2kiK7PGkxqRyzU4VlKnAlqIMB/DpDeIDYF6Qq74/pGKvLoHP+OXckczUEl+8iBUd s5VMTKYgGz24cZQNEqRg3doXMiJGKdQZWbx+Z2sl//Ka04YIspaeNQGx8ib2TCGIZ733EP IvHatURsJqyVFDiYDN/b2kAr3YfOvssz32ryUY1gHuSZYIGEh/ufMKxVgzJ2N9ATKefYQb aYoA17/15qiieZkaFZAaaGmpWxKWrWLxdvWo3wV2XKeMFCdObIZG8AI525jHUUt9rSlWj5 vBlD+kGQrL2MIC/oxJcdK8YjVoryJNeSHeQhaVrZbWts3H2TDu2HPOwM+WLaRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4kVD04zFzyPx for ; Tue, 28 Apr 2026 15:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d365 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 15:13:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ddabf7f3ea4f - main - amd64: Make EFI runtime faults look less like panics 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddabf7f3ea4f0497dc5a5ffcbbb1d852ea77a4cd Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 15:13:56 +0000 Message-Id: <69f0ceb4.3d365.659a926f@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ddabf7f3ea4f0497dc5a5ffcbbb1d852ea77a4cd commit ddabf7f3ea4f0497dc5a5ffcbbb1d852ea77a4cd Author: Ed Maste AuthorDate: 2025-11-26 19:28:13 +0000 Commit: Ed Maste CommitDate: 2026-04-28 15:11:46 +0000 amd64: Make EFI runtime faults look less like panics EFI runtime faults may be mistaken for kernel panics, and do not necessarily represent actual problems. Try to differentiate them some more by printing "EFI runtime trap" rather than "Fatal trap". PR: 291193 Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56309 --- sys/amd64/amd64/trap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 359b3dfe3609..fb18b7d06f9e 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -104,7 +104,7 @@ void trap_check(struct trapframe *frame); void dblfault_handler(struct trapframe *frame); static int trap_pfault(struct trapframe *, bool, int *, int *); -static void trap_diag(struct trapframe *, vm_offset_t); +static void trap_diag(struct trapframe *, vm_offset_t, const char *); static void trap_fatal(struct trapframe *, vm_offset_t); #ifdef KDTRACE_HOOKS static bool trap_user_dtrace(struct trapframe *, @@ -238,7 +238,7 @@ trap_check_pcb_onfault(struct thread *td, struct trapframe *frame) print_efirt_faults == 2) { printf("EFI RT fault %s\n", traptype_to_msg(frame->tf_trapno)); - trap_diag(frame, 0); + trap_diag(frame, 0, "EFI runtime"); } res = true; } else if (frame->tf_trapno == T_PAGEFLT) { @@ -940,7 +940,7 @@ after_vmfault: } static void -trap_diag(struct trapframe *frame, vm_offset_t eva) +trap_diag(struct trapframe *frame, vm_offset_t eva, const char *type_str) { int code; u_int type; @@ -952,7 +952,7 @@ trap_diag(struct trapframe *frame, vm_offset_t eva) gdt = *PCPU_PTR(gdt); sdtossd(&gdt[IDXSEL(frame->tf_cs)], &softseg); - printf("\n\nFatal trap %d: %s while in %s mode\n", type, + printf("\n%s trap %d: %s while in %s mode\n", type_str, type, type < nitems(trap_msg) ? trap_msg[type] : UNKNOWN, TRAPF_USERMODE(frame) ? "user" : "kernel"); /* Print these separately in case pcpu accesses trap. */ @@ -1013,7 +1013,7 @@ trap_fatal(struct trapframe *frame, vm_offset_t eva) u_int type; type = frame->tf_trapno; - trap_diag(frame, eva); + trap_diag(frame, eva, "\nFatal"); #ifdef KDB if (debugger_on_trap) { bool handled;