From nobody Fri Mar 27 01:52:20 2026 X-Original-To: dev-commits-src-branches@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 4fhkD51Qhxz6WXvy 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 4fhkD46Sw2z419S 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=1774576340; 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=Xo8X5mV42GFYW05IfIKzTzvmFPqV0b6wuOZUDD6IDVf5xEyEVV2MEYemxVvRAfT1FW7jXj Cla6Mof4E1br/U3IPnyxvQE5Uu3HQ8LGqW1oQOqGigGuM+WWJBob3OMJ7iyOmd1/u/4CIU z4ecxCONhuaq4e3VjClqnb6pTL4earFPODSBtziIJXu28CMhRIUAhIsylCfZS3g+DnLamJ PLdoNzI6sQthKHSm19K3DLFdB4vErtkVN6m0N5O6o5UIL07asqvXfeQaI6bsnye8A4SYdG jynXrQ2FVahunXI6clkDU7hjDLsqeYGb6SBxlRqzX60rN3/FQOD6VKZ/crvQTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576340; a=rsa-sha256; cv=none; b=amE1ylcY2k7MIURrId03vuU3UHZFz180qdEQtsOJ6bqN/PS0SFB+Y9vRJFDi/ZIcmyDYIl 5FhVPtZ+RqcaMmGzaE3ybIxx9a3D8KNKCX2Hl48QJz649hgNcCcNNFam0AjHZ537sn7LEF R3kdyN/4ayhxRBJswWL7NjAw3VjOJEQexQ/C/4ZCsegaa9N+OfU0QrOUp9vYv2J1qrpnmK mPZrVSXLHXuz9uG42EAk/lUuM3WIho2D466fOgVHapCOBzF93NVmf+9ynw+PUrOu+7a7fF gJFGd9WK4tVKnZ4MeBv+dzmFV5Ee6iY4cVKgiCCwjmeRPSfjz346fx7kcd6XtA== 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=1774576340; 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=s0cDqWwC4oy/Gy6tGCO74zj0bFTWE0IR2Ho0gUDoiXsQTWsol0Dqi5LDB8lc2DPCN0b6sm FyoazwyEeRsH3mcjuPlbdVechbc0FXa6+Uguv3fxXPdKTcMkNho3rnojQKt683J2ZOfiVF 4PCnF8SFqSCbLj8YpHrNUU0JT973fX3gH1c8oilXOaInFau85m+kYg4T5Vzcc2DycVfHnD d+v1uTS4VjiBkZQA269iXbwpWpreRyyyeq+B9JByM80jqtHF50T1l5rmNlU46ZcZrn1qW9 sDDfd00hpbBZHT6iKvgiqaQudKa0JmuG5KOEWEd4Zpdj0Q8vco6veXspAGJNEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkD4618Kz3Rv 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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);