From nobody Thu Jun 11 17:09:39 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 4gbpzS2CVrz6htNv for ; Thu, 11 Jun 2026 17:09:40 +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 4gbpzS0M9Tz45wD for ; Thu, 11 Jun 2026 17:09:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781197780; 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=aqn87U3131LmCOaedlUM1ig4u0S+lrNKmn2QBHLvQHc=; b=OD2edtAVNg4Um1NU+pcMB751c/TJtFDhTFQeFw/DD+ZqJlHiDyhRhgIgyGQHa1MDqGmyOw kEvKYkEbQvGKd2Z5m+nVnEdHPozYyV9Sr0ADV2tpJUJFO60uTLwNYUizplC+RANKU0CzLN +frXyYcV4FmN1ztZHS+nNKWke6VUZzOy5PpmwNpEcIPBKE6G+iFJG9hL6ghjAL8f8ZOHLl cYaz/tSiRSPExnqxdKgqnpUDcxbKRMFFAH+q0reqR1r9p4x1/cPkiH1HIGB9wX7m2lIXcs 5eQKbpLaHkcqPkOhRGwGFqKgWgyMNrqwqauurGWVYWGGnqQEw6vgtLrh1OYIOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781197780; a=rsa-sha256; cv=none; b=LFaw39+C4DbPtMTK2iNhQcFfwMe+mvgD4dzIvuAWJG2Hi5yR4F4Qefrv4+DpXnNVY7yKll 5pccG9sMg6u1gmtXn6/qCXM5Rua/UJgGfFWwbDzgN34X2UsDH607AmFlPIC2vYIw4C0IuU YP+c3vhi2/IlDQWBu8n0NNGlsuJnewYBNUufUy0M6oDlVPwePOc9hWwPWd4LTR5gn88tfx avzP8e81iGr29xdyDxvGOQSCLIoQAkLV18d/r8IozdBbB5Y8fv3uTyMCeP+BZUxvfF0uUa 5oComvHvCxwMGpMc4KNxbPK0WKPA9e9L2fx7kUe8TsY1KXYQPBtl+/xFb6yP2w== 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=1781197780; 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=aqn87U3131LmCOaedlUM1ig4u0S+lrNKmn2QBHLvQHc=; b=RzB5TOaSuHZ5bLDVMK7onos7HwLhO1fr3XFqTyjFTpepunefvKaOQUqu6HQ2PEvck6N9vP cfyI6J+7Rr0t2yc03pjd6+4JW06IRYGsjgWBudQUgkpzrgFFrtjoB33tPBo6KG/hJmSVdv uh5MKi15aTkktRAJQSHuK5tcwWl89q2JwawgqOtdWQKCI3qO3YNWABUZ2jmPvpu4sCKqzq fbyNbg6q48i5v9AOBIgMXOchoxGbe8G6C0XkNiqQ7uSeVw1LEZYPYOmB1NjmUk4+l8v6SV a18JQVOgUTHG7u/JaRW5M3Ekd3n6P68r3cU0tG/8h5BZzT3fFnK+hJIpMKtNSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gbpzR6p6kz10gH for ; Thu, 11 Jun 2026 17:09:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ce6a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 11 Jun 2026 17:09:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 314c85574ae0 - stable/15 - 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 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 314c85574ae08eea6499380556decfcda3e0f49c Auto-Submitted: auto-generated Date: Thu, 11 Jun 2026 17:09:39 +0000 Message-Id: <6a2aebd3.3ce6a.a3d8343@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=314c85574ae08eea6499380556decfcda3e0f49c commit 314c85574ae08eea6499380556decfcda3e0f49c Author: Ed Maste AuthorDate: 2025-11-26 19:28:13 +0000 Commit: Ed Maste CommitDate: 2026-06-11 17:08:35 +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 (cherry picked from commit ddabf7f3ea4f0497dc5a5ffcbbb1d852ea77a4cd) --- 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;