From nobody Fri Mar 27 01:52:21 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 4fhkD72yvFz6WYPC for ; Fri, 27 Mar 2026 01:52:23 +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 4fhkD572VRz417C for ; Fri, 27 Mar 2026 01:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774576342; 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=qqlJsqzqWl1JNzvTAggNX9hClkOnlqPLVgpB8YsdTXw=; b=AO1+yiBUHWTgwOXszBRqVma2eE1+1zhQ/VYA2ImsqCgaT2uNmTTYWL4/WITDsbNTWHcLDW Dec54OOj9KD4jfeCwbkBJ9QMKtDmhyffu+GqUB2/yeFMyTobmeCJtSR3FNb8lXm0BFYLwk 7upo1yLqNzDFIcn8e71UYwnPdD/zNB82bJZWu0jqVGkM+Yi1CtexnaW6JjN5TNhn5nw00z MBhThZmXWuRFPmlyineBaDk+8Ql+Kxtp4URHgnARo+NJ1EDUvyF2Qq7hGixS7OrkiUyjky pISU1rlndnCJceLDAvrwxC+YQ8nYXhiV5mC3jsauNIliiLIBbsY3aLibCHbKBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774576342; a=rsa-sha256; cv=none; b=tpuIsIVQvanUXVu0aAjKfsreQw18pK36nDacl8P5BdDB1v5JexuJERe5G9V1+qjUTWro1l GChrx4rQrIKyTjAS/Qk2Wy4PC6Wnxowb6fn0X2PNiaEjjPa4GO1NCL5Hd2kqfen4srZIka bEjswJTgxkmLybQVJQfjBc0k+nyngZ8bqUUKiFdC0udPzy0EvyYrg5Hcg6EMFzW5+7srhN oubkieDUJk2CwPhmbE+3KuMZCFLcM3PykWuxLY5IeIrZt1Rko+7Qf3FKwlEGtvd8Csf1Ju ofqyRlilMNl9zy9MuRDlKk756wLzLjBw7qXdPKjzQ97ADof1Uii+pXdPqFnwlw== 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=1774576342; 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=qqlJsqzqWl1JNzvTAggNX9hClkOnlqPLVgpB8YsdTXw=; b=tLHoukir3f3cPBcvSwqJtk1IXOGHoaABh9h0ynsqaPGtOOOC6H9ymU7vzvf8DzrHVK2FcV 3wB6fLdXpnKp+3dF8kVgDd5/0h9Ilz1k9/e7m5CuIhb4ljnKjXYIHv2++P/Hc8Yy0VEDaG HXbxZzNpm3+UJOW8CQdmzQedehaILM+0pKZnZ9aTkD/Iq01Bev0+TMxLDxFPQlqai+csu1 nka0x15x0zD/pZCdB/2rDBDmAc184jGFTzLpfCuaA/KtLBiwgsgmDAjCixhmMTNyGQAilk djjreW4IR6iYnlkyhyxFPlf2J405JUZlarJLgiUMPaBd+bkn6M2tQgLWi5Kp2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhkD56RY4z3k3 for ; Fri, 27 Mar 2026 01:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f887 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Mar 2026 01:52:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 0d98b06ab1ce - stable/15 - amd64: move code to clear PSL_T on debug exception into a 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: 0d98b06ab1ce08d5b0b2d403a97d83410f2da425 Auto-Submitted: auto-generated Date: Fri, 27 Mar 2026 01:52:21 +0000 Message-Id: <69c5e2d5.1f887.65695a35@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0d98b06ab1ce08d5b0b2d403a97d83410f2da425 commit 0d98b06ab1ce08d5b0b2d403a97d83410f2da425 Author: Konstantin Belousov AuthorDate: 2026-03-12 09:40:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-03-26 23:42:56 +0000 amd64: move code to clear PSL_T on debug exception into a helper (cherry picked from commit d92ebde76430e99f78156fb1d865a18916380aed) --- sys/amd64/amd64/trap.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 6393da186db5..3a9323936d2d 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -249,6 +249,17 @@ trap_check_pcb_onfault(struct thread *td, struct trapframe *frame) return (res); } +static void +trap_clear_step(struct thread *td, struct trapframe *frame) +{ + PROC_LOCK(td->td_proc); + if ((td->td_dbgflags & TDB_STEP) != 0) { + td->td_frame->tf_rflags &= ~PSL_T; + td->td_dbgflags &= ~TDB_STEP; + } + PROC_UNLOCK(td->td_proc); +} + /* * Table of handlers for various segment load faults. */ @@ -395,14 +406,8 @@ trap(struct trapframe *frame) signo = SIGTRAP; ucode = TRAP_TRACE; dr6 = rdr6(); - if ((dr6 & DBREG_DR6_BS) != 0) { - PROC_LOCK(td->td_proc); - if ((td->td_dbgflags & TDB_STEP) != 0) { - td->td_frame->tf_rflags &= ~PSL_T; - td->td_dbgflags &= ~TDB_STEP; - } - PROC_UNLOCK(td->td_proc); - } + if ((dr6 & DBREG_DR6_BS) != 0) + trap_clear_step(td, frame); break; case T_ARITHTRAP: /* arithmetic trap */