From nobody Tue Jul 14 14:56:16 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 4h02SK2QkBz6kqxp for ; Tue, 14 Jul 2026 14:56:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h02SK030cz3M6n for ; Tue, 14 Jul 2026 14:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784040977; 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=C1Lkxvc3GTcmP6WgNAlkmrHTjPPAdzQKeOxOK5VjqTs=; b=G3HEk1QseF1Kh4h6PNhweP5tbPZbX5BnaIr9thM+7k2w0TEqq+WJHRNgtAQ6X2FL2djOX+ 7WTw37GP7Hph9Ou63IO/Md4B8P3NMMDkVIKH/zP2kNLsXJDUNL5rTKRLuTLvFMuk8t1Rl/ TM005kiZu7RtC0GDrQ5pyqp2+yUgXwZovMIoPGZqxqrcXZsexXM9s4EEOz0OcMY/g3WmiO H+uFzpXyJ6vtKugwobMpnOLDBBE3pttsylXwMkZ10b7RRPQGu2OJgwfjF1t+q7i3C56ACI nPGspKnEJ0vty+/GL81AHa19rUlhOyR31NmQbBvKD4fSBz3/l2N2gPI+OtSAxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784040977; a=rsa-sha256; cv=none; b=ym9FM9pDnfRGxoy+m8Bu4A/Zt6qahBe+/B5mVtQuEjO51DBO+uCF8LLDAIx+tGe7/U/Lo2 kcOZWtf+5K4KGYBJ/kGV1ei/Y0zwJqME/vqbwp3dMjAsg9+BuT4rVkac7enPLKI8OlxbTQ +vQeWT9aGdL1ZhKUISwxdZ7HMKvMJ6YoxKX1HQLIJlULjKTszoB7NqDpAMusp30jVhIyUr CH8Pc49u2PdZNlWmoyVL2dv085V2e/c3uWmww66hQq6fCAeK65ShB4Q/QRL4ARzqUn4ktT /ZaQcNnFmY31EeAZIgppYyty1n1vc8QQY6aDBpbN3K8v09pTvzqN+XH1SPo8sw== 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=1784040977; 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=C1Lkxvc3GTcmP6WgNAlkmrHTjPPAdzQKeOxOK5VjqTs=; b=pe1toBgz16cEkbbrkoX+l9fvnj6o7+5Gem7MMnAr5P8VSBvmn/qOzTSXe4mxO3tkrXzKOI IQwPhV7I0C6YqhFDPyUNBWsOch/MStKjPX2BGl4k7bjzZC8pH0mUnpLS4Jd6prfBclSIfb b1PznO+gmugWXJ+KJYwqM0oA3u1purxMigoNnSRoBmOooanlRD8FWT7lp+xH7+CV4C37T/ bc+sbmRJxTp8ctKvs2oXNYB505SAfW6mOH29CSffiYcbs9jU35d4t9VlZWGWH4stsGhqAu pE8WRFlu/p5UkQqwD1F4qwAxlHuKALVMa1Jd2hbJSIybt59WkaVmrKgv1CNe4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h02SJ2p3hzq1r for ; Tue, 14 Jul 2026 14:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3da5f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 14 Jul 2026 14:56:16 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7cf84b5c9954 - stable/14 - kinst/arm64: Fix return values from kinst_invop() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7cf84b5c995456ddc3807d918c684438042cb977 Auto-Submitted: auto-generated Date: Tue, 14 Jul 2026 14:56:16 +0000 Message-Id: <6a564e10.3da5f.6d174cd6@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7cf84b5c995456ddc3807d918c684438042cb977 commit 7cf84b5c995456ddc3807d918c684438042cb977 Author: Mark Johnston AuthorDate: 2026-05-20 14:49:28 +0000 Commit: Mark Johnston CommitDate: 2026-07-14 14:08:40 +0000 kinst/arm64: Fix return values from kinst_invop() After commit 853cd8723494 it became invalid for kinst_invop() to return 0: dtrace_invop_start() would convert this to a sentinel value indicating that it did not consume the breakpoint, and so we'd just call kdb_trap() to handle it. Change kinst_invop() to return NOP_INSTR after handling a matching breakpoint. NOP_INSTR is handled by advancing the ELR, so we have to compensate by subtracting INSTR_SIZE before returning. Reviewed by: christos MFC after: 1 week Fixes: 853cd8723494 ("arm64: Clean up usage of the dtrace invop handler") Differential Revision: https://reviews.freebsd.org/D56987 (cherry picked from commit d6f0e671d0797b56011880f84d12ce5fb20bf099) --- sys/cddl/dev/kinst/aarch64/kinst_isa.c | 38 ++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/cddl/dev/kinst/aarch64/kinst_isa.c b/sys/cddl/dev/kinst/aarch64/kinst_isa.c index bf3ab1d35de3..bfc3c5d66eec 100644 --- a/sys/cddl/dev/kinst/aarch64/kinst_isa.c +++ b/sys/cddl/dev/kinst/aarch64/kinst_isa.c @@ -18,7 +18,7 @@ DPCPU_DEFINE_STATIC(struct kinst_cpu_state, kinst_state); -static int +static void kinst_emulate(struct trapframe *frame, const struct kinst_probe *kp) { kinst_patchval_t instr = kp->kp_savedval; @@ -132,17 +132,13 @@ kinst_emulate(struct trapframe *frame, const struct kinst_probe *kp) else frame->tf_elr += INSN_SIZE; } - - return (0); } static int kinst_jump_next_instr(struct trapframe *frame, const struct kinst_probe *kp) { - frame->tf_elr = (register_t)((const uint8_t *)kp->kp_patchpoint + - INSN_SIZE); - - return (0); + frame->tf_elr = (register_t)(uintptr_t)kp->kp_patchpoint; + return (NOP_INSTR); } static void @@ -216,21 +212,27 @@ kinst_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch) dtrace_probe(kp->kp_id, 0, 0, 0, 0, 0); cpu->cpu_dtrace_caller = 0; - if (kp->kp_md.emulate) - return (kinst_emulate(frame, kp)); + if (kp->kp_md.emulate) { + kinst_emulate(frame, kp); + } else { + ks->state = KINST_PROBE_FIRED; + ks->kp = kp; - ks->state = KINST_PROBE_FIRED; - ks->kp = kp; + /* + * Cache the current SPSR and clear interrupts for the duration + * of the double breakpoint. + */ + ks->status = frame->tf_spsr; + frame->tf_spsr |= PSR_I; + frame->tf_elr = (register_t)kp->kp_tramp; + } /* - * Cache the current SPSR and clear interrupts for the duration - * of the double breakpoint. + * NOP_INSTR is handled in dtrace_invop_start() by advancing the ELR, so + * compensate by subtracting INSTR_SIZE before returning. */ - ks->status = frame->tf_spsr; - frame->tf_spsr |= PSR_I; - frame->tf_elr = (register_t)kp->kp_tramp; - - return (0); + frame->tf_elr -= INSN_SIZE; + return (NOP_INSTR); } void