From nobody Fri Mar 27 01:52:19 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 4fhkD41M8Qz6WYP8 for ; Fri, 27 Mar 2026 01:52:20 +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 4fhkD35hp0z419R for ; Fri, 27 Mar 2026 01:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576339; 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=VWx/1M/WNNfPmMmBLjo3GJaTaDhWyxsEJ+B/JvNXV5U=; b=mFczUWB1eUGdr1gEd7P5VFJ3q15xk0KCKrzofYryAxA0Ep4/xQZi+7+7qcv59eEd6mgBqR aH2UyuhNnv299aaqc0xCYDFtl8CS7ryTDpQTQ2LDDFB6i+qnvo9iQIS8J8e1ANY1APXH65 CDkZ9f5As1mwQnIwbLzOuhNxxDf/xb67u5SnNyqHq1bKJDxvt+wrr2wgIbs5DORqwgkEOj cVxITRGCurv8IBGt9whmHZwuKv0E6tQNRdbjH8NS45cybOzEBz2f0YOrenH96e+RpM5B2B GWKofcGkcrc4gAHfq+/Y5ONkdPCHxckRpSc+Qd2h2NThTijdWe5li4L9tDvsOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576339; a=rsa-sha256; cv=none; b=ssCIPKGT87wFUcRlPKb1M93X33/BeUWr3avALgzMj/wGzTagpAMDmo8ycT4rV4RhmVVvdw XLcapQLT2bZ9d8Hq7cKKMEji9cfAzcH3EYnj4Ea0w0MGlkECAOUYrHzdyyZNK/LG/mwZxD lJ/9DdSEi9wHCaLiYdYZoK12KeM3QteyrEMGVi2PzijO/dilzLf6qXIHqwrpZnsf4qDEHQ tMtxxFvYEmq8OLjo3F8+khB4PhFuVXNA2KM5/rp0qpu9/2RLDqfNGf6TU/RcdZxfNZoz5p jw0/oIe0qm1fjY28df+l8ns092XHVjQXvTphbctXk79dwDJcCEtWgwBLzk2jtg== 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=1774576339; 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=VWx/1M/WNNfPmMmBLjo3GJaTaDhWyxsEJ+B/JvNXV5U=; b=C6+TlmAEFN7PsZGRRcOZuHc9OGqAHiR6ELXiF/whaPgqJVnrCQBOsCLgeWY06N+2Wy45gD iBw3pp9B/O4xtkMjUQf1jJBVZdqyeXOZ0PKNVm6UxrBPLuR2Qdnae407tFk1isKy3C/xoL Eff0HjNh6G03rhppRCitGH8fGvaNspnTTPyvArqDO7HGeNnyRogLWjyzfUlp+WwCliTf7G cxX8hc0NCPPf4YQo3A66oarkSQrPwx/CCysC3E38PHeQV+2VU7wLRu2ReD8UoykrM4MqKb lDmRbEy1DlNPHrdDXH3ypJjSQcu2rNevsKZIQNkWak8HrrEd5Y2uwKIZZTQjLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkD35CMmz396 for ; Fri, 27 Mar 2026 01:52:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1ea8b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 01:52:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 975969096784 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 9759690967840388fcb68edc46b478b4d4df7c3b Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 01:52:19 +0000 Message-Id: <69c5e2d3.1ea8b.575d5784@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9759690967840388fcb68edc46b478b4d4df7c3b commit 9759690967840388fcb68edc46b478b4d4df7c3b Author: Konstantin Belousov AuthorDate: 2026-03-11 11:53:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-26 23:42:56 +0000 amd64: move efirt trap checks into the helper (cherry picked from commit 914a53570750ce5a104a5870403d7669656fddc3) --- 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); }