From nobody Fri Mar 13 22:51:06 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 4fXfq52dWDz6VvX0 for ; Fri, 13 Mar 2026 22:51: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fXfq41kFDz3vcW for ; Fri, 13 Mar 2026 22:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1773442272; 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=+QH/KambtZy54AYBuWj0WGMUpypWEi6nwXo4VoHFQeM=; b=NcZsHdKLsQid9zU466dep1cFaegFTdjIqkP3pvurqexb5XW59RoEoH/9FYxF3jZomaCjun j96bgEFU1HolEgYayT1D8QoR1EapRcWXO7e5Zp/Ik/HUih+OQv4anTla5+Dpd4H5eOvGTh 9IoN1Si1KiAZvWfl2kWhiRYCD9SF0XEhUdRYuL1km2MwtnCsTkdniOfxX5C+kFinFEivVr V4AU9DqByZknfKAvT5jrPkN/Gb/pibbySShRR4U1yiTKtRK+ZDMLOVulADwSLLH/jwrJEK CbjUotT+6tLe5x9VvsVWKiqh+lkJa1RFS26IBjB662I/9N2PRj+pU/vlDyLdBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1773442272; a=rsa-sha256; cv=none; b=SqD91pR7s9t7uYoAF8gxcF2URkmSzXpbXXpI9bPXn8cPNwvaM3nRpwtYubmjg9hKYCaBjc MBIz6i6FITRAtNajK9fpLYwofsLY4XV73LLS5XpGS1VlKWIkzKqByIsGBj2uDTqJRa1skU hedWymx85sRjccwSBbzl431Gc4/Xvlgzt1tw7dH0tQWOdrtnDgDIhtJKVsf8znVUUfIV1A 0Jm72OKqSdxRA9HOWdPQdmmLaevaDpFuxFQH5ClRmwAxpvuv4+oGAvIE7XxMENK+L7SyRE 9OSJSULoiKjnsuc2iYDQU/M2y8np/Qj8Zc3ToRT5P72zLaM4icaGaXn1N0HGhw== 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=1773442272; 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=+QH/KambtZy54AYBuWj0WGMUpypWEi6nwXo4VoHFQeM=; b=ICI3kGepswE9aLgU1B9LSCLbibjgOI/0ovFU/UUPJQnVG5gfAE2UWzavekJs6xTKrs/1pa UtlNxt+wzQTLqf/oNoudXKvfA9epdhfdMBnCvUyAa4NuFy9jQEf7XizEYBo+U36RoBvTXh C1RWZNxQNcMNddoVHS30YO/Qj5+E0Bnsf3N1pjnDM8WkTQUk+IMtwBlxseJrKeTyy9+vYf s6HUzWm9lcWPhEajbSS2aMKkS6ut8nvFUW+4uTLKahVND8qbhUAl/sprFCF4sXktod0fRs RTjYBZ94U+zScH5gPl9MCNoOH7qE2TWdENTLcLEQMxDTUt4bQuiBUsfEaYvEkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fXfq41BZmzs7Q for ; Fri, 13 Mar 2026 22:51:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d7bf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 13 Mar 2026 22:51:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 914a53570750 - main - amd64: move efirt trap checks into the helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 914a53570750ce5a104a5870403d7669656fddc3 Auto-Submitted: auto-generated Date: Fri, 13 Mar 2026 22:51:06 +0000 Message-Id: <69b494da.1d7bf.7cef39b3@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=914a53570750ce5a104a5870403d7669656fddc3 commit 914a53570750ce5a104a5870403d7669656fddc3 Author: Konstantin Belousov AuthorDate: 2026-03-11 11:53:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-13 22:47:13 +0000 amd64: move efirt trap checks into the helper Reviewed by: imp, jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D55808 --- sys/amd64/amd64/trap.c | 55 ++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index d173f57e2e4f..a4676f156431 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -218,6 +218,30 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, fubyte((void *)(frame->tf_rip + 7))); } +static bool +trap_check_efirt(struct thread *td, struct trapframe *frame) +{ + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ + if ((td->td_pflags & TDP_EFIRT) != 0 && + curpcb->pcb_onfault != NULL) { + u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); + + if ((print_efirt_faults == 1 && cnt == 0) || + print_efirt_faults == 2) { + printf("EFI RT fault %s\n", + traptype_to_msg(frame->tf_trapno)); + trap_diag(frame, 0); + } + frame->tf_rip = (long)curpcb->pcb_onfault; + return (true); + } + return (false); +} + /* * Table of handlers for various segment load faults. */ @@ -465,24 +489,8 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); - /* - * Most likely, EFI RT faulted. This check prevents - * kdb from handling breakpoints set on the BIOS text, - * if such option is ever needed. - */ - if ((td->td_pflags & TDP_EFIRT) != 0 && - curpcb->pcb_onfault != NULL && type != T_PAGEFLT) { - u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - - if ((print_efirt_faults == 1 && cnt == 0) || - print_efirt_faults == 2) { - printf("EFI RT fault %s\n", - traptype_to_msg(type)); - trap_diag(frame, 0); - } - frame->tf_rip = (long)curpcb->pcb_onfault; + if (type != T_PAGEFLT && trap_check_efirt(td, frame)) return; - } switch (type) { case T_PAGEFLT: /* page fault */ @@ -891,19 +899,8 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) return (1); after_vmfault: if (td->td_intr_nesting_level == 0 && - curpcb->pcb_onfault != NULL) { - if ((td->td_pflags & TDP_EFIRT) != 0) { - u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); - - if ((print_efirt_faults == 1 && cnt == 0) || - print_efirt_faults == 2) { - printf("EFI RT page fault\n"); - trap_diag(frame, eva); - } - } - frame->tf_rip = (long)curpcb->pcb_onfault; + trap_check_efirt(td, frame)) return (0); - } trap_fatal(frame, eva); return (-1); }