From nobody Wed Jan 29 02:21:34 2025 X-Original-To: dev-commits-src-main@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 4YjQrb0nZsz5lZyH; Wed, 29 Jan 2025 02:21:35 +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 4YjQrZ5hyjz3rhM; Wed, 29 Jan 2025 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117294; 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=UvnlinbofBgluhFHTzdqPD/ofBB3y4u56wXVqBwNoPQ=; b=x44gsaMZ8NXNDFcWM24+06mTc7UkjG7d+s2lYdNya2R7GGo+7sBfmW3iCPNJXi4aoKa2G/ c1+GpvIZQox+PW4D4ThOtrzinI+VFDxt4Swzwj6OqjSfBTh2J4v8s6yyF4eChwKcj51/X3 komPFkFbn9jGCCnGQRTvCuwFRq5SQouF+L1ex3Nxv8/Poia7vmf5zEbNIIwRhrhkxJ4LyT MNUssJanqi1s+je6DjcQA9Aj6q6n/kj1k2MvQSlejKl68zjs7O1O/sweG/J4sl2nQBcMPk v0Uh3unE6qgmQy0d4zAIFAUQjlunVyJl2ZQUSYDSboVw498OPIL4XvHg7CIK+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738117294; 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=UvnlinbofBgluhFHTzdqPD/ofBB3y4u56wXVqBwNoPQ=; b=bK9RdqF7uILdCqrrDdW95B7qME1m3fql1uxI20BvVd3snHwRyAGQ3ltdpHyF11/BWA6MLU oM/Hf/2Gg0k8VH01s2w34rFvYSo1Vc/pnfkVXlo7kUMj1dhhtXWWE2VPEWiIJMK8uE3PTc RedWd+wUp8Ai/RXQjqJHFS8kjGn8q76bo8gGZpPIwMmgBNA+4zj27kJ8nmx6NNMyLkZM0G DSPZgqreGXh+k/K48b/aQ/+cWnufTaprJkqXRYnGv8DtTd3eRGyOp5X5tWXufQ4Uig9YM8 c8JkhBQtmFMVhjz3VmVLniUKyJEmQef+Kmdx+C3sIqFCT0C3LAkTqvukON/Z5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738117294; a=rsa-sha256; cv=none; b=eiK++BHL+NtQTFNDqF2FkDtnXZHeeJF4886uDOoaK3j6FQZw2tY3PfZtLCWbZTO/9gUKi1 PsW2oEJy5l+lkghXHsMikFOvHqeqaahWUR0P4orZgWkIbG90WFcQcQWDLMxFVx2EqrrxTH x9mriTEUwnHxsW5ksER6ADVWl95x9WkxuxwnYncwQFvcxy0NrWmbbXard/A8tzqYEZZ/PO 1BIMh5CiR0o11ei6/7Q2pE+daTURy+J9YvF14tEiKeZddF4A1jhZxeHp4SkpgPpLFPhrU5 tTcAeAPoigQH1bcKRS0F/pR6NGWwnp414aCjY502mHF/UkN1kBor7Iyruwfebg== 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 4YjQrZ577LzhNx; Wed, 29 Jan 2025 02:21:34 +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 50T2LYkm006404; Wed, 29 Jan 2025 02:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T2LYFo006389; Wed, 29 Jan 2025 02:21:34 GMT (envelope-from git) Date: Wed, 29 Jan 2025 02:21:34 GMT Message-Id: <202501290221.50T2LYFo006389@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: 4da070ce6c01 - main - dtrace/arm64: Fix enumeration of FBT return probes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 4da070ce6c015a994ec4ecf3d31ee94810ea19f1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4da070ce6c015a994ec4ecf3d31ee94810ea19f1 commit 4da070ce6c015a994ec4ecf3d31ee94810ea19f1 Author: Mark Johnston AuthorDate: 2025-01-29 02:03:02 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 02:03:02 +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 --- 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 4f6d28c2f32b..ffe2f37a6d16 100644 --- a/sys/cddl/dev/fbt/aarch64/fbt_isa.c +++ b/sys/cddl/dev/fbt/aarch64/fbt_isa.c @@ -177,8 +177,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;