From nobody Sat Jan 25 17:34:09 2025 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 4YgMHQ11jqz5lfVw; Sat, 25 Jan 2025 17:34:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YgMHQ0G7qz4PfW; Sat, 25 Jan 2025 17:34:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826450; 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=CZc2+jybeAXs3RzHzs9+04Lq47zTec2SLrGsaYfyfDE=; b=dYK75maHPufh4Bpop4WupNKoiCAQ9TGxcKlP/Y7exRqSuuird9YT5rjXzG102zyTgNKat/ a7mNWrmsVbJ5NtbLGV/39mWXi29gHSqLrybx2MELuqShEiONBSkiUqX6s9BRDAw/YFU4cL ClnBYoKEcEh4sGmSqgaFJJwYd5/K/8OZhSTO2ZaBlB0XVGFcVj3QA9UgFA2dO8mTodjyB9 PCD4ncen940KszZkjR8VsO3ZvPhrZY98DpUrmVFbquT/C7x+r+Y9YisQnj6JzcJ8fQl18X R/tHM48/USam1VjweEMLQyGVpl9VvMjePlF+kwTqoGqxGNJyGmFuPsfNMUueBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737826450; 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=CZc2+jybeAXs3RzHzs9+04Lq47zTec2SLrGsaYfyfDE=; b=pEl3sYmet2DKXOFxaCWU4SHjoaxkDvmz8vQuXj+J3/hJ4cIM1l52+UVnfIl4Afye742IE0 jAP43xH1t2EAc6YN2lz6t2IH8fbRVF2fsbQyt3gORoJdDnfG/jFcVCjweaqkztFk3xGnOa HsgU4y4xq0Y/XYSrXu07Dil4QqPvoZtpZTd60lrQuUE4bMdleXTwxiFShJl0aoZOCFWXED F88dtMxMvCvutj1ES8EMV+zFasuWGCRbGr+wTZwpy66HKLjgG+FmA3SeAGMqn/ww9dcmLk wilSVe4yfSWWM8A91fie0gScaBzn6vOLmQQozqKgXeJD+4NfL106iid1ETscKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737826450; a=rsa-sha256; cv=none; b=Xmc4qXVkYSN5TR1WJaXrgh65w8hKNTMMyJBz8c05QZt/6vSHbawmJVJq6AREIm/DDvbe2d P8nDlkTJssMFY09RNOqbYNq7ri/Ld0za1Nj0riGfdMf9ShEweG99Y2Da3CvaGsK3Sohd/o RmyHmnnEsOKPhNBcyuY7YzEZgOBexDzm/N5P4mUAx/NwDFWAW1mCLrS7FdMs7SAudNgHDL yH4AlX8+GwcCj7H/J/ZsVhE4zQDD1bSTxxoKQHUXvW1TIekRV4fYNQbQawZrsmVBcB03ri 3CtunyUDFGVq/q5MVOsr/8EMtSeqhDZ1h8Wd9UfvGqAZYgqwV6kPfXOIgpzGQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YgMHP6mT5z1LDy; Sat, 25 Jan 2025 17:34:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50PHY9KR044716; Sat, 25 Jan 2025 17:34:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50PHY9No044713; Sat, 25 Jan 2025 17:34:09 GMT (envelope-from git) Date: Sat, 25 Jan 2025 17:34:09 GMT Message-Id: <202501251734.50PHY9No044713@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 853cd8723494 - main - arm64: Clean up usage of the dtrace invop handler 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 853cd8723494ccc2e972aaa09e7d04ede1508c95 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=853cd8723494ccc2e972aaa09e7d04ede1508c95 commit 853cd8723494ccc2e972aaa09e7d04ede1508c95 Author: Mark Johnston AuthorDate: 2025-01-25 16:17:03 +0000 Commit: Mark Johnston CommitDate: 2025-01-25 16:17:03 +0000 arm64: Clean up usage of the dtrace invop handler - Don't consume the breakpoint if all invop handlers returned a non-zero value. - Fix style nits. MFC after: 2 weeks Sponsored by: Innovate UK --- sys/arm64/arm64/trap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 544189964ef0..d612905b77c8 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -548,11 +548,10 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) break; case EXCP_BRK: #ifdef KDTRACE_HOOKS - if ((esr & ESR_ELx_ISS_MASK) == 0x40d && \ - dtrace_invop_jump_addr != 0) { - dtrace_invop_jump_addr(frame); + if ((esr & ESR_ELx_ISS_MASK) == 0x40d /* BRK_IMM16_VAL */ && + dtrace_invop_jump_addr != NULL && + dtrace_invop_jump_addr(frame) == 0) break; - } #endif #ifdef KDB kdb_trap(exception, 0, frame);