From nobody Thu Apr 09 13:30:05 2026 X-Original-To: dev-commits-src-main@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 4fs15B2Kfjz6Z8sp for ; Thu, 09 Apr 2026 13:30:06 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fs15B0pMKz3tDJ for ; Thu, 09 Apr 2026 13:30:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775741406; 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=xtJscoA8DPzR/qQH9m+Jz0qg4+j+I7vd+qsDd9/YrVg=; b=JCiOokq8UQrVnmPN7YciuxPPxZsnLrZEmix4zxv7eqjD3gpnBKeBX+uMJB/5iBYjb+mqxJ 05GBuAZG1XPJh0GgBl3qE31oWRp16QsnYGenvVpZoFsExxMQaKpZBbMPN1BWibXFjIUkI5 yM7UzB8cUZusPf7rJdCaj8zkc3R67PGxrJyRywN3mOmg56LmH+7AAW7hL6ZbmmT6w4GGQv p8EunDRjoRAHyHUHyjF2gNoMAgqIHqCfuzqIRKeeg2xIguS335i24uuwryo2O6Ek2qgDXD hKIW5LIIRA1JFMXk0R+uigaBGNW4TVINMGP5eeURcKw3sBAH6YbaHj4/Z5SPfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775741406; a=rsa-sha256; cv=none; b=yQKPK1U0bFFG+aSJyxBltIY/8L7lOfnPGPjKor/C0B89KYi5+6H2U3ohWGZMVsGjZUQas+ oMc9PvrIbQfn6OrXh97WhvLfM1/id1wys6IapibvPclqdWAbyTLU4HNnu5/REFdgrmnnFZ TdPOlXsSTGXeDKT1FrwSzeWvYstAO+6cpx6bsHqoq/7hHTrSV+SpHaKqex13qzoNh1EmB8 SXJHP/e/u3lqVX/muGd+0/pXvhexVk3e02uhDgOZi/BOCKMJgN3fb0zMRpveSmqV/99305 +Wxy+f8MNngI4A/O59PLB6TDAiIXslObbj0mgT4SCg80xUEeW2cCkYbolvyk2g== 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=1775741406; 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=xtJscoA8DPzR/qQH9m+Jz0qg4+j+I7vd+qsDd9/YrVg=; b=DHtWeZHFuyhGyNV0MAPlnHCAORffDHbfcVzFFsjLSJw55gdpV6CG2wYxcUNWnwGWw++QOz Rx9PzEt3Xj1jVYgZWzYYBZwlgX1gED5KGcCqYyqFS/cmgn4ej3Qfh09uy3DVOyCJLr7RXl MniLeHL+aPKMIepo1vGJj7S+pRjFCe9OCCHeqP28hXHK1ytEX6V7Nwl5pgWkjlVKr4RbW9 xxx+vrHVFuIYfctGr56iTfAGw2ib6eFdG3iS0b0alUu/3KMlREZ5ocaHzE2h8HyPZ7I5dQ 59jJe7y5W9A10rxPZ+kkQ1hXm0E5YoZPVmWwkswXsNY/MhzHjAamSkZUcHg5DQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fs1596yjTz1Dqh for ; Thu, 09 Apr 2026 13:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38e0d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 13:30:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: aacf448007f7 - main - loader.efi: panic() should show stack trace List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aacf448007f7adbcdb528556cabcd120c9e8cb75 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 13:30:05 +0000 Message-Id: <69d7a9dd.38e0d.6535c4c3@gitrepo.freebsd.org> The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=aacf448007f7adbcdb528556cabcd120c9e8cb75 commit aacf448007f7adbcdb528556cabcd120c9e8cb75 Author: Toomas Soome AuthorDate: 2026-04-09 11:36:12 +0000 Commit: Toomas Soome CommitDate: 2026-04-09 13:29:12 +0000 loader.efi: panic() should show stack trace Because panic() does provide mechanism to have architecture specific panic call, we can instruct it to print out stack trace too (in hope we actually can print). While there, also implement simple check to detect loop in trace. illumos issue: https://www.illumos.org/issues/17887 --- stand/efi/loader/arch/amd64/trap.c | 88 +++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 3fe86f7b1924..ff7190d214ad 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -82,14 +82,68 @@ struct frame { }; void report_exc(struct trapframe *tf); -void -report_exc(struct trapframe *tf) + +static void +stack_trace(struct frame *fp, uintptr_t pc) { - struct frame *fp; - uintptr_t pc, base; + uintptr_t base; char buf[80]; base = (uintptr_t)boot_img->ImageBase; + + printf("Stack trace:\n"); + pager_open(); + while (fp != NULL || pc != 0) { + struct frame *nfp; + char *source = "PC"; + + if (pc >= base && pc < base + boot_img->ImageSize) { + pc -= base; + source = "loader PC"; + } + (void) snprintf(buf, sizeof (buf), "FP %016lx: %s 0x%016lx\n", + (uintptr_t)fp, source, pc); + if (pager_output(buf)) + break; + + if (fp == NULL) + break; + + nfp = fp->fr_savfp; + if (nfp != NULL && nfp <= fp) { + printf("FP %016lx: loop detected, stopping trace\n", + (uintptr_t)nfp); + break; + } + fp = nfp; + + if (fp != NULL) + pc = fp->fr_savpc; + else + pc = 0; + } + pager_close(); +} + +void +panic_action(void) +{ + struct frame *fp; + uintptr_t rip; + + __asm __volatile("movq %%rbp,%0" : "=r" (fp)); + rip = fp->fr_savpc; + + stack_trace(fp, rip); + printf("--> Press a key on the console to reboot <--\n"); + getchar(); + printf("Rebooting...\n"); + exit(1); +} + +void +report_exc(struct trapframe *tf) +{ /* * printf() depends on loader runtime and UEFI firmware health * to produce the console output, in case of exception, the @@ -116,32 +170,8 @@ report_exc(struct trapframe *tf) tf->tf_r9, tf->tf_rax, tf->tf_rbx, tf->tf_rbp, tf->tf_r10, tf->tf_r11, tf->tf_r12, tf->tf_r13, tf->tf_r14, tf->tf_r15); - fp = (struct frame *)tf->tf_rbp; - pc = tf->tf_rip; - - printf("Stack trace:\n"); - pager_open(); - while (fp != NULL || pc != 0) { - char *source = "PC"; - - if (pc >= base && pc < base + boot_img->ImageSize) { - pc -= base; - source = "loader PC"; - } - (void) snprintf(buf, sizeof (buf), "FP %016lx: %s 0x%016lx\n", - (uintptr_t)fp, source, pc); - if (pager_output(buf)) - break; + stack_trace((struct frame *)tf->tf_rbp, tf->tf_rip); - if (fp != NULL) - fp = fp->fr_savfp; - - if (fp != NULL) - pc = fp->fr_savpc; - else - pc = 0; - } - pager_close(); printf("Machine stopped.\n"); }