From nobody Fri Feb 14 19:25:33 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 4Yvhpk5Jdfz5nXBk; Fri, 14 Feb 2025 19:25:34 +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 4Yvhpj4h1Zz48nD; Fri, 14 Feb 2025 19:25:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561133; 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=G0BdGFdFmDPvvZuc+9Qe4IpsSixqtLC8DZhc04sLJN4=; b=u4ohf1AVzha6Jo+o09gXv4oslAJ1gN5aoSckURf5bYamRw54hrSZbuVmikmXJZWRZYwLdH u0xuDv539wD9QlIs5swg3CCrHDcWTcnmJ9XqOPPOhBPlsIcSiweD2+8feIJCpv6XVIoh96 7ttWMbJC+QjaOlp/aKXQJRoKAUZEjo9NV/J/X6c0WCzfvG7WYOjbq/+Vt6o18/KJtyH9TK LHpfBCQXmakMkSXgFFYZ9ei0R9xWSXZjvWv+L2yR1m02M64K/aa2TlDW7Z48CphQuBa4So gWxxDXaOi0jW2aFY/XMbl6UuadUCIBixFcDENoJz2U69xlOCuUXBVhyZKUuidw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739561133; 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=G0BdGFdFmDPvvZuc+9Qe4IpsSixqtLC8DZhc04sLJN4=; b=ADqCn2m1W2l9boagESxmlOP7aOTPkF8ARU8dtWDS8lb3BNk4KrXwV4u6hxvqLdCQ3PzZnZ p+sfjQVRvLlUC50HgXIMLT8lG8OmVQNAS+Xjrsr1goxIz5WV8hxGMfzGOb3qi4Hngqq6OO nRx1qrJzoi+rok095W3HimYsC44ygksgntrMmufKvPYwvgir0Ew5Y1Z77uONLbmbKO/H9L hUVsqlIbNW9ppXHvBBFdN+RZSSO9TGcIjV5Y26i7Y0lDu1ZXPn3CDlM0UsDO5ZxjtKk0kV 7u8lmM0QChoMvaY5CGROLluFUDpLLvANqhX4DSBL3zOsFWYMky3dI1DrhzykzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739561133; a=rsa-sha256; cv=none; b=h3qU6i4qBwTSufNPZzub/AsYnLfRFUCVIi/fvqYlyyeOvWVvrXE6jVvjOnTNr9EKcKOSUW OncNeQq+nuG41rTc+KW0EMgxaCX4JKd/POEpKiDmwTVO/3ZaTGa7QP+MgtbDj0pCc4qyeV +8eHxmvNAMFL9KkR6xCZlG76S/5DF4p1oNdToc5ZbgkwdfLZ5Jy9QgltBhm5//vnoZv017 UMFP3Y5Iss3i1OpHDGJLkvtOhVu9s+RYoJdraI41kvRJ/SDyhjFPX5SlIcaq3r9WhBY9Qz ssYyJgbRA/L7JbUk0dNpA9b75OjkNgYfsyJBQcO1fClaMkRWo5wvaFUUWWOLkQ== 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 4Yvhpj45QZzkGL; Fri, 14 Feb 2025 19:25:33 +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 51EJPXHk038963; Fri, 14 Feb 2025 19:25:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51EJPXqb038959; Fri, 14 Feb 2025 19:25:33 GMT (envelope-from git) Date: Fri, 14 Feb 2025 19:25:33 GMT Message-Id: <202502141925.51EJPXqb038959@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: 9ab9e138f30e - stable/14 - dtrace/arm64: Fix enumeration of FBT return probes 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 commit 9ab9e138f30e9590f40cfce40f7a4075d5bbdac0 Author: Mark Johnston AuthorDate: 2025-01-29 02:03:02 +0000 Commit: Mark Johnston CommitDate: 2025-02-14 19:25:19 +0000 dtrace/arm64: Fix enumeration of FBT return probes On arm64, the FBT provider treats tail calls as return probes. Ignoring the question of whether this is really correct, the implementation is wrong: instr is a pointer to uint32_t, so the removed multiplication by the instruction size is wrong. As a result, FBT would create return probes for intra-function branches. MFC after: 2 weeks Sponsored by: Innovate UK (cherry picked from commit 4da070ce6c015a994ec4ecf3d31ee94810ea19f1) --- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/aarch64/fbt_isa.c b/sys/cddl/dev/fbt/aarch64/fbt_isa.c index 44690b97f77a..fd666770d3a2 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -178,8 +178,7 @@ again: break; else if ((*instr & B_MASK) == B_INSTR) { offs = (*instr & B_DATA_MASK); - offs *= 4; - target = (instr + offs); + target = instr + offs; start = (uint32_t *)symval->value; if (target >= limit || target < start) break;