From nobody Sun May 07 17:59:53 2023 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 4QDsdQ0qLjz49J6F; Sun, 7 May 2023 17:59:54 +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 4QDsdP6hPxz48gm; Sun, 7 May 2023 17:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683482394; 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=+dRd7aDM2wfavjqqgjoTpTdJ1HbsD2jOihI2f4/EJBc=; b=dwcGlBNpAMaf5mwBym6Aqg6RL8Yg9/ttJ3bh/z13/jA4Oo0UCS/Q52ceToT/Q9+uuLzqea lnp4EayUnCw7ovc7cvohaCI7LYNBhQXnWWVjVh8wnRYjWpx+O2ug/eEl/mFIogJGWACnFh xw2xUVy/JuqlGpOHd49dmZ3H/U9djStRr99J2oStABOriKQ6tz/fJgoZRFfNPbnij14qRN i1r0UslPP6LLOXrleUS7oV7FDvoe9jdMbkBIZtocuwF73rbP0gSo6rn4ns6FcS/HlRm5Mk pczaGpS6KpBil6il0LLxxgpSUlAgwx9oaHqQtSR7Mylpf1ofmSG2QfI0wCqgUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683482394; 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=+dRd7aDM2wfavjqqgjoTpTdJ1HbsD2jOihI2f4/EJBc=; b=n6wIRJIQuXy7yZvedzkVMZ3UiGmXLbHy/Y4I5tPsYSv4f/PqvsSXLsvZz+E73s+plQhtMc 8LHKfbalRvVo1Zw1KAeJ1YOm/RgKX6iFncNFmahYYraL2uHRx7gWHnL1bnN2tceYk1xW+P f7+HncLE012fbC17Uv6G4YswZBRIedknMYF2UG5nUjl67tcDIAYb4LTXcwhXMaPHck2u92 4JE3THisMYQvGa0NK16WiSVUb5iUBQE2hAERGCkeHd35nuiwLY5CqzUWgipHQe90nkDQ7Y gJniMCCWqpILbOzouD1bAagUm4gsdxpNbig3WzXHx8+cNv6x3G6kT5fiYACiTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683482394; a=rsa-sha256; cv=none; b=qyFIFe4B/NW1dZi1gHyfG4i1K0S7ZNMqTpxB4oxWrI9fijBb/2JQucSMk49Wsaa8htQajs YS7worf9BsbvsQmm65CwcN6Ss1rkEuHYPEd0QFXZrUmh2UsiXYyMTxh2pkUNxQGBzmNeWa 7f0xObEWS75WT4JxFbpN2HyHbjz1JubVfdjS6t1HQES9AxESsot5wmrY0oSs3cl+67n3Xu 9R9Ut95wcdEBE9Dd71QZRbVX/tkQyYexRpaR9nVn/NgOGwE6Y/fXoPG6wHQ1cGhaW7GaNt gORvcq/5CXnCmgS/Cp//kYe78bdOfeVh00UUoVTMkkD0bmxgTydNEnUGPCgFXw== 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 4QDsdP5TkqzSbS; Sun, 7 May 2023 17:59:53 +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 347HxrQT007764; Sun, 7 May 2023 17:59:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347HxrUq007763; Sun, 7 May 2023 17:59:53 GMT (envelope-from git) Date: Sun, 7 May 2023 17:59:53 GMT Message-Id: <202305071759.347HxrUq007763@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: 4d9000cb22a9 - stable/13 - dtrace: expose dtrace_instr_size() to userland and implement it for riscv 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 4d9000cb22a9b17df4815df5f34773cf8862383a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d9000cb22a9b17df4815df5f34773cf8862383a commit 4d9000cb22a9b17df4815df5f34773cf8862383a Author: Christos Margiolis AuthorDate: 2023-04-20 16:21:46 +0000 Commit: Mark Johnston CommitDate: 2023-05-07 17:54:08 +0000 dtrace: expose dtrace_instr_size() to userland and implement it for riscv dtrace_instr_size() is needed by the forthcoming RISC-V port of kinst, as well as by libdtrace in D38825 for both amd64 and RISC-V. Reviewed by: markj, mhorne MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39489 (cherry picked from commit 080e56a6c98c7e7a241a4260d4c19d3cad5b22af) --- cddl/lib/libdtrace/Makefile | 6 +++++- .../contrib/opensolaris/uts/common/sys/dtrace.h | 5 ++++- sys/cddl/dev/dtrace/riscv/instr_size.c | 22 ++++++++++++++++++++++ sys/modules/dtrace/dtrace/Makefile | 4 ++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index 05b183215f4c..3fb0ec0bafb0 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -125,10 +125,14 @@ CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .endif .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -SRCS+= dis_tables.c +SRCS+= dis_tables.c instr_size.c DSRCS+= regs_x86.d .endif +.if ${MACHINE_CPUARCH} == "riscv" +SRCS+= instr_size.c +.endif + YFLAGS+=-d LIBADD= ctf elf proc pthread rtld_db diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index d3d8fbca6164..7b8da08e9ae9 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2399,7 +2399,6 @@ extern void dtrace_safe_synchronous_signal(void); extern int dtrace_mach_aframes(void); #if defined(__i386) || defined(__amd64) -extern int dtrace_instr_size(uint8_t *instr); extern int dtrace_instr_size_isa(uint8_t *, model_t, int *); extern void dtrace_invop_callsite(void); #endif @@ -2428,6 +2427,10 @@ extern void dtrace_helpers_destroy(proc_t *); #endif /* _KERNEL */ +#if defined(__i386) || defined(__amd64) || defined (__riscv) +extern int dtrace_instr_size(uint8_t *instr); +#endif + #endif /* _ASM */ #if defined(__i386) || defined(__amd64) diff --git a/sys/cddl/dev/dtrace/riscv/instr_size.c b/sys/cddl/dev/dtrace/riscv/instr_size.c new file mode 100644 index 000000000000..bfdc962f4aa9 --- /dev/null +++ b/sys/cddl/dev/dtrace/riscv/instr_size.c @@ -0,0 +1,22 @@ +/* + * SPDX-License-Identifier: CDDL 1.0 + * + * Copyright 2023 Christos Margiolis + */ + +#include +#include + +#include + +#define RVC_MASK 0x03 + +int +dtrace_instr_size(uint8_t *instr) +{ + /* Detect compressed instructions. */ + if ((~(*instr) & RVC_MASK) == 0) + return (INSN_SIZE); + else + return (INSN_C_SIZE); +} diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 0bd81bb39db0..1513418281ad 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -22,8 +22,12 @@ SRCS+= dis_tables.c \ instr_size.c CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \ -I${SYSDIR}/cddl/dev/dtrace/x86 +.endif +.if ${MACHINE_CPUARCH} == "riscv" +SRCS+= instr_size.c .endif + CFLAGS+= ${OPENZFS_CFLAGS} SRCS+= bus_if.h device_if.h vnode_if.h