From nobody Wed Jan 29 03:13:14 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 4YjS0B20rLz5lgBh; Wed, 29 Jan 2025 03:13:14 +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 4YjS0B1X46z40Mc; Wed, 29 Jan 2025 03:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738120394; 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=AsXdT0HLz8VSgAWmCsIpxhx3Th2LLhK1ffpbtS/mFgk=; b=CvgnqtPxT40a3eZK95J5+XojeQfHr2SM+hE5+HXdwR3hhsdl5AoKxVR4Gj9+yHu/rU2Qdy ZSeviwpL21g68s9saFJrakGV5BqjE0gWC26A1IVOJ2s9G/7cv8wHFEQhV73J7yldjPx5dN DxDrhGKGeROvOU+3mAdRmPA8jR5ysxGTxARp1d5Ii9hUv1wA/1QW3m18lFuXaQljAWIzx7 D4PQG+9k69Au23BujwSik9AF82HoUhW7+slfthxta9M3wUfCjGRewV6uyQUAymduEIXLFB IGnN3YCNGV/qG5kSHoi298qIntkqMgXB/q3PexhM+eF6v2gNElBpk2OxodqHTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738120394; 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=AsXdT0HLz8VSgAWmCsIpxhx3Th2LLhK1ffpbtS/mFgk=; b=P9HEOGH5/Qc/Jaai/1kkEEojkmF4B/a9Mqg+67GWYIstPy6hEMpqInrIW372EJCcDXgGHD BOUFRb8q4MQ1B3ixl1vlh1+Y9ujtAMVfxPUoKe1P1Mm9WfaFl5biyq1sK0BM7ylYFaLtLC s9I7/ozr6KxbR9br3/1OwzA9RymNgTuxtyPZVBh6bbtW/DenSPWFKvK6yANOUapZg0uZ2k 3rV/vRjOpPQ6d5ExDc2f8yvRThR78GmxrpGkFjJEUKmWADtUjhRgXz0EO5unpcDfemIPZO fQiSjOTOsQL8drcD5Dk6Kp1qeDILkFRhShDtgQYvuyuTuq8oyQc922q8IWaT5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738120394; a=rsa-sha256; cv=none; b=nAfDkX0Z8O7WYGXnkTfcEGw6fr36EePtYJuxxJBOLOVtknhGthsGpshNl6FF/K/Xm57is5 WXasw9w6AisrAsw27l+AoZroWitztueqa7hXrScqM7spJ/s/v+ejzBVKU4E22W4r5CPT2F NJcAIMY+EVuFSrMTek3ozVxoZc4Ad7/FhtW2x2K4ptjQZzxUjUJdez7JPCtajrF7tBANIK l4+D8uHUuQNV02JXuwdYRGqvolMonoG6d603iyaVtCMCgoE2yTQDtL0OtWfEO2rSqZEJoQ 2SBoM9oCL3xa9wbJJGWvpLrUUVwsEalOVcDQ4e43kUjTuqChYFzOFQDLBezZig== 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 4YjS0B0zgTzkjn; Wed, 29 Jan 2025 03:13:14 +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 50T3DEqB005811; Wed, 29 Jan 2025 03:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50T3DEAD005808; Wed, 29 Jan 2025 03:13:14 GMT (envelope-from git) Date: Wed, 29 Jan 2025 03:13:14 GMT Message-Id: <202501290313.50T3DEAD005808@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: 94fb5ab9043c - main - Revert "dtrace/arm64: Simplify dtrace_getarg() slightly" 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: 94fb5ab9043cbe6188cf30f51f7e85739ba41503 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94fb5ab9043cbe6188cf30f51f7e85739ba41503 commit 94fb5ab9043cbe6188cf30f51f7e85739ba41503 Author: Mark Johnston AuthorDate: 2025-01-29 03:11:48 +0000 Commit: Mark Johnston CommitDate: 2025-01-29 03:12:46 +0000 Revert "dtrace/arm64: Simplify dtrace_getarg() slightly" The change is clearly wrong as it removes a dereference of the pointer into the stack. Just revert for now. This reverts commit 70c067062217a5295ed321427b91cfd857c18b77. Reported by: jrtc27 --- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c index 3e36004c6f0d..ff0e068006bd 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_isa.c @@ -256,6 +256,7 @@ dtrace_getarg(int arg, int aframes __unused) return (tf->tf_x[arg]); } else { uintptr_t p; + uint64_t val; p = (tf->tf_sp + (arg - 8) * sizeof(uint64_t)); if ((p & 7) != 0) { @@ -268,7 +269,8 @@ dtrace_getarg(int arg, int aframes __unused) cpu_core[curcpu].cpuc_dtrace_illval = p; return (0); } - return (p); + memcpy(&val, (void *)p, sizeof(uint64_t)); + return (val); } }