From nobody Fri Mar 27 01:52:20 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 4fhkD51PwNz6WYBy for ; Fri, 27 Mar 2026 01:52:21 +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 4fhkD46fxWz414N for ; Fri, 27 Mar 2026 01:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576341; 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=NIdKL5jKQM2n1M3gmd8mO1pg0w/ibOeKv89tUKCOzNE=; b=YfcJKFRsrPY8IdSIeVbUuIA7a9Dwvz4VFMs9TB/Gj3BHNGPsw6YeN9cA44zzAigq7ylUph Iu4xeIZNNEDM3GEliHOT1fmu0+Xb4r38fmVXwsu3i1noNeID6VWBBHEwMkyrnWvzoVPftZ xJfZ79jpNaIWDw0rAKYjIm13tNZ8kh/a/MBgLIZQ6eUaqof0tDSdTJkPRlS6c7H405srtk Ty0RmZ2P8T3OGxqrZLh16d8USX+wH8lrvIIYHd5o5zJ3N4RB+TTfcvlNRNcCa83dMM6xQJ I+G3xf3hZRmBXIJzyzlw9/Xyq2YwLdYQ/e02DT+DzV8f3B/nxkbbJMVm1CUCpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576341; a=rsa-sha256; cv=none; b=RTeqLy9+bq3xQ4F+O0ktpMfSJlDUmHBxBm4nINhAQ+k+g3bP3cy08A9hTpbOd0Uw3g4qns RoLoLVz8ty+nezs/LdCLNcUxxt0QeYIEQB9cioIKlG16wwKvATxxw8/c8Ivh53ySguSfjp 0I8kLVsMJ43cas542BTHqNjLNfqMh7C6auVCT1Td8qfcY6XQhmEAPylSb1fH+m6uEifaLm t98KPxFbkPm7/YFzfsLg62VDRqjG+m5aIai+XxyeQSEOnOei0Y/II3PAmLrndFCaju7Cik j9hnx/k1nM/ZDNW3drMbs4BS4Vpnhfzz1mKCthgUAahfM+tr9ZUcenOI79qxYA== 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=1774576341; 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=NIdKL5jKQM2n1M3gmd8mO1pg0w/ibOeKv89tUKCOzNE=; b=ZjZOnyxhZ7RIXDmGNOAyv0ARZL2ag3cmVzHziX8g7nUHfqWMrEMHmnDVZwQoWztr8EZazm zhoihbQ3pXLJ702VhVxOwXC+lfnwZhTkX5XKq03TlGr8yU+KPShncl/1vT+QFlKkC+fd2A Jqx8nUAmLk0hOV3qZz333wcDCJrg/0ifO/cdd7uonQrHXdUV696jVS6D5oQAJj75CUpVvo UjgEZe9JE2esOYlGmBKv9RecWoSLBlXjvzmTPKtq233W4TeSg4janUXx0hyqUljOJUNlYi Y0r7WYPmTuAxPo27krtGiWrvl0xqNT7hoMxrTrOw+Er2IP8LhzazbVXdBH45zA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkD45zZ6z3Ck for ; Fri, 27 Mar 2026 01:52:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c858 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 01:52:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 81c2819ce8e3 - stable/15 - amd64: do reset %rip after page fault if pcb_onfault is set 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: 81c2819ce8e38900f04f0d96fc9709126dad9c75 Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 01:52:20 +0000 Message-Id: <69c5e2d4.1c858.23d63b24@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=81c2819ce8e38900f04f0d96fc9709126dad9c75 commit 81c2819ce8e38900f04f0d96fc9709126dad9c75 Author: Konstantin Belousov AuthorDate: 2026-03-14 11:40:07 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-26 23:42:56 +0000 amd64: do reset %rip after page fault if pcb_onfault is set (cherry picked from commit 8365f877b1e4b6d4c30df72e0826ca60a412ce7d) --- sys/amd64/amd64/trap.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index a4676f156431..6393da186db5 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -219,15 +219,19 @@ trap_uprintf_signal(struct thread *td, struct trapframe *frame, register_t addr, } static bool -trap_check_efirt(struct thread *td, struct trapframe *frame) +trap_check_pcb_onfault(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) { + bool res = false; + + if (curpcb->pcb_onfault == NULL) + return (res); + + if (__predict_false((td->td_pflags & TDP_EFIRT) != 0)) { + /* + * Most likely, EFI RT faulted. This check prevents + * kdb from handling breakpoints set on the BIOS text, + * if such option is ever needed. + */ u_long cnt = atomic_fetchadd_long(&cnt_efirt_faults, 1); if ((print_efirt_faults == 1 && cnt == 0) || @@ -236,10 +240,13 @@ trap_check_efirt(struct thread *td, struct trapframe *frame) traptype_to_msg(frame->tf_trapno)); trap_diag(frame, 0); } - frame->tf_rip = (long)curpcb->pcb_onfault; - return (true); + res = true; + } else if (frame->tf_trapno == T_PAGEFLT) { + res = true; } - return (false); + if (res) + frame->tf_rip = (register_t)curpcb->pcb_onfault; + return (res); } /* @@ -489,7 +496,7 @@ trap(struct trapframe *frame) KASSERT(cold || td->td_ucred != NULL, ("kernel trap doesn't have ucred")); - if (type != T_PAGEFLT && trap_check_efirt(td, frame)) + if (type != T_PAGEFLT && trap_check_pcb_onfault(td, frame)) return; switch (type) { @@ -899,7 +906,7 @@ trap_pfault(struct trapframe *frame, bool usermode, int *signo, int *ucode) return (1); after_vmfault: if (td->td_intr_nesting_level == 0 && - trap_check_efirt(td, frame)) + trap_check_pcb_onfault(td, frame)) return (0); trap_fatal(frame, eva); return (-1);