From nobody Fri Feb 14 19:25:27 2025 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 4Yvhpc1r33z5nXNJ; Fri, 14 Feb 2025 19:25:28 +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 4Yvhpc0QZwz48jp; Fri, 14 Feb 2025 19:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561128; 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=AftY76POuyE8iWEKB2TRwbkomGqezUQldYWcqBbq2tc=; b=kVZcKeKqQ8grF9YOBJzVtYdDwxSc0s/qcQB+1N+RptnbVGE3oXI761rPvEPxp6tBtVrY3n J086oj8K01z0C1AOyqMicQoqkH19Kud/AopqglRYA48YHWQiyo7N/YxU3SrJAuaaencJQr RptVSdrt0wQRF3SWOuv8JcY+0Eid/J/CZl3FsxpgoiromY/YyIPHB1K2rgMbJWi2d9IB1f bubU2/jIihzfHG9N4lyae/sa+ccOqw+E9pHNzQpFhrW0r0AMy1Vx0/QcPaN22PeV/A4DUn 9KTDa0ENqg6tC4nQbefaNV0lNc3LcAs9fxAbE8KtmS3qu9oPxzDVSC4FodS9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561128; 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=AftY76POuyE8iWEKB2TRwbkomGqezUQldYWcqBbq2tc=; b=GT8XoLzzEMRQZp2t1YuXW0gt0aRXldgquF+44ah1RLHVf8t+1ptphSRoMMASRN7eqOQk1c yTEWIuNzuyXYpCSTlgg0XzgF5PNyJf/KHVEeIGVTGxIxaWLWvhqBs24hqtsnEvEkpZZgwB AvA7dsiqq6efegyqr6yD2wUpE1s1a4mk0YWSmxyl548Bxic+nuEoCMx5KmiV1nekos5S2A JVK5rIATOr8AxMcWbCrqAIVbHcNO80reo+eCLT3/rifWtSi4Z9y7+UBiDYGe9dlj6/ulIN wPsy2ldJxXVLuSmRzoGTeS0pKSq05sN/k+uWsVkOzricHagAcOqjn6h51RGR8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561128; a=rsa-sha256; cv=none; b=gC2OwxhCFApAV8AcD4s/PrBls/Olc9c5xknBVG+LiDKggj6Dk2A7+Qt2BmVpqJiyBmagR6 PeoE3+Q1o2qBfBS1LkPCPBqT8SQLQOTDOsFgxvne+6mK/25aYQ3HRij8SQepdFiMqU8GIR 7AuDCN6if6oFvyyWW4xKPdgZBFRC38I/87XeS7mCznxm4VqD/sBLLxdL6g6r+W3AuEefF2 izbvZkgkeVTcVXYKSToCiqOS8GphpkAhGJMxyS9L59pRxCYD7RkVqI/09A6+7w+ZviucMK DNOkvHU32STgeI3L+OokTZNn08Oc6yVYR94n+G6G50Jn9eQT+johm9ezjPokTA== 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 4Yvhpb6x5kzkfc; Fri, 14 Feb 2025 19:25:27 +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 51EJPR55038786; Fri, 14 Feb 2025 19:25:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPRpZ038783; Fri, 14 Feb 2025 19:25:27 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:27 GMT Message-Id: <202502141925.51EJPRpZ038783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f44f65ff03f7 - stable/14 - arm64: Clean up usage of the dtrace invop handler 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 commit f44f65ff03f7dd2ad508480dc5d8fcf4ce6f33a4 Author: Mark Johnston AuthorDate: 2025-01-25 16:17:03 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:18 +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 (cherry picked from commit 853cd8723494ccc2e972aaa09e7d04ede1508c95) --- 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 64a27b138a9a..fdcb7e708daf 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -538,11 +538,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);