From nobody Mon Feb 6 19:28:08 2023 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 4P9brm6fsBz3n5T0; Mon, 6 Feb 2023 19:28:08 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9brm5fDJz3ldD; Mon, 6 Feb 2023 19:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711688; 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=9cExyV34WmM2Fhx4isS403woFmmiNba9nNEXJ2A8JrQ=; b=Qp2wV/+gWHMbTUaCCAIEvzAsZyY6+npRULUCQkxTlSAKZJ7g6gaMVMF4TVdbTQbnDfEm+W mBrUqCMvdUOAEntxbTfJiD3gI1t63rYEdjLSwPjmqqA0Vxi6rsBIZefFfQMiz/zJ9DTmyE OpkzgwxxXjF+XKBbpybhrtaapBOpC3qC4OHi8k8dvO0r5Pb8vckRDQlAIZBW/OzheITUBH udsvSpdzbtlvSfkBlO2JcLU8q4ZUdTshWD/txjJWBq3axiw/wBxOF/MPm1+k1gUrKW/HjU COkU60hqRHLcO7urBbx1jimJml1edjXjrDqv6x9ORF5h+/Y8Bx5pBuPVLrZeJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675711688; 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=9cExyV34WmM2Fhx4isS403woFmmiNba9nNEXJ2A8JrQ=; b=olM6eAQuVWfjODCZY7fnFz9q4PQLen4LK06upww1IEV18DcGYmaIyjtuZYZdIpVNMF/afr Y68GloggVYWSx659Olvs3qi6o6ufF7fO57pmbFBI/FYcLgEQUxwOSbonI7U9aYJhX+36jC 2SUnb0Or3nbBLYR7o3u8ioAchxtVHa2EqlPi65vaSS5HNEEQlqPhBGsLqyKkRndFy/Jy9m 8cnpqUFuohS/itNVC59R7QMn90nM7diTU/p1W60xmsODI1KR2q+HEYn5jF2Vr/fF2o8v0C KICq9XuDA1IPKUdxcyC45lJFnK6R83evFH2GvWejJTXY6T3lj+xivC0Sx+69kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675711688; a=rsa-sha256; cv=none; b=XX3C+1XUp4oH0HG7yH08e7Lso4BxR0cT/0i5KF/4Lf0DlEub6yk/sDdyKQysv8mfwm/joq TyoQJTVTLjbI9izBONFdMLfzo1w3lxH8Z/sI8QcmtQLT6wv9WRugaQS+Q3XB5/bNFAeW6p Us8SIy50rituUn67DgoVzEUXzte3ANkKtphfbiK+7jFGCGr9PO58zt29TlAUuPW6+dhYJZ 05PVjRwd3kt5OLOLq/rLsszhZ9W2+4ny8hjYo9cza7Bg7To4VY3oOZxOMi9MFWFmEAbvwu BViS8MGxNhkBkScPiFOvVzaO/lDL/LgABKUgByQXhqOtLsQljuZbF1JbrOhQ8A== 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 4P9brm4l2gzms9; Mon, 6 Feb 2023 19:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316JS8t0006469; Mon, 6 Feb 2023 19:28:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316JS8Da006468; Mon, 6 Feb 2023 19:28:08 GMT (envelope-from git) Date: Mon, 6 Feb 2023 19:28:08 GMT Message-Id: <202302061928.316JS8Da006468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 38720107324b - main - dtrace: Fix RISC-V user stack unwinder 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38720107324b3903f342bcb0306c72c4e4235053 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=38720107324b3903f342bcb0306c72c4e4235053 commit 38720107324b3903f342bcb0306c72c4e4235053 Author: Jessica Clarke AuthorDate: 2023-02-06 18:30:57 +0000 Commit: Mitchell Horne CommitDate: 2023-02-06 19:26:53 +0000 dtrace: Fix RISC-V user stack unwinder The unwind logic was copied from AArch64 which follows the peculiar AACPS (where, unlike typical RISC architectures, its frame pointer follows an x86/stack machine-like convention where the frame pointer points at the bottom of the frame record, not the top). Delete the pointless riscv_frame struct and fix this. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D28054 --- sys/cddl/dev/dtrace/riscv/dtrace_isa.c | 5 ++--- sys/riscv/include/frame.h | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c index bc8426a752df..6d44a0cee9ee 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c @@ -150,9 +150,8 @@ dtrace_getustack_common(uint64_t *pcstack, int pcstack_limit, uintptr_t pc, if (fp == 0) break; - pc = dtrace_fuword64((void *)(fp + - offsetof(struct riscv_frame, f_retaddr))); - fp = dtrace_fuword64((void *)fp); + pc = dtrace_fuword64((void *)(fp - 1 * sizeof(uint64_t))); + fp = dtrace_fuword64((void *)(fp - 2 * sizeof(uint64_t))); if (fp == oldfp) { *flags |= CPU_DTRACE_BADSTACK; diff --git a/sys/riscv/include/frame.h b/sys/riscv/include/frame.h index 3917aebfac76..a822a285996c 100644 --- a/sys/riscv/include/frame.h +++ b/sys/riscv/include/frame.h @@ -59,11 +59,6 @@ struct trapframe { uint64_t tf_scause; }; -struct riscv_frame { - struct riscv_frame *f_frame; - u_long f_retaddr; -}; - /* * Signal frame. Pushed onto user stack before calling sigcode. */