From nobody Tue May 30 15:07:37 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 4QVwk12p2Sz4Xf6k; Tue, 30 May 2023 15:07:37 +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 4QVwk12G9Rz4Z8j; Tue, 30 May 2023 15:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685459257; 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=DNJ/I6jUWgxmsKO/slt5/A5UGYV63KWti7EzrCSMPTI=; b=fSnjiVRrkAMt9moUHCNRwcbmyegvWfmoIO4LVF7+YhtWjTKIRvUwO1EHQLEIl+sZwXz2An 4gCTxK/Y8ZG2R/Mf/z2I1GItjSyoU+p9YTNlYPz01K8MvqFUDavuqapwgBq6bIGw/+JTbv yIAYa6MLkGXxPcrPdXOHGakHC8hwwjpogW0AMkRt+94VkGyzu2CLGm2WYT5/kM86tN854p kMgILeAOyhlAUtWP0bbtBcUTZSB24fZ3pgytCYhpxY4UNDrzx6wh7ngZ8xMC8MXCkCkttb 1GBUey+cBH6zqGei9+SM4l/PTMLpuo4pobfOLmo9l0qH/xf4X1lXYTCjxZ1AOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685459257; 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=DNJ/I6jUWgxmsKO/slt5/A5UGYV63KWti7EzrCSMPTI=; b=Otb4VA/6btVjLCA9L/421FVBSSkRbW46qKDfJf3yuAx3BJ3hDUhj62zWyeyfaUWm/ZP9E5 iJOMIKAAkH+xtqsQOzzoMhyqdMmQrrweh6ZdMdtc8jPsneKcnG4u5T39ZHYcHqfyorbaJU Fi7UwKWAEtoGJD3nBYthTK1QNwMsHJF98i9aXHTdVQ+Tao3RKGcobICSkEVUMOVCLxiaBi mTE9Z/2hBG+GpOD1nlJtTNWbdZI0QwCYSo79CoHOR0SfbagpCjXrj4BTPpMc5IY+WrEbxE i9hzTMB95Bi2tcrKkkiYjtBY9RyTkBcgkmSXVyhNEovI/1fJkk13fjLb9sHyUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685459257; a=rsa-sha256; cv=none; b=dLaGqtRk3Jt4E6NGvYr/0sLwjxjwSNmtKb45T35ycciKtl82zd1+B3tvn7uHmxYmuPtOJf WzXyT+JIkW/wvHk4MPl7Xt5L1C+cSoyqJz4XOfh64rgnRqRxDpu2NRmtiKHcjibKmp0GGJ Zk1ce13xyYbpLpV50cWnEMirSNvfqAoguI262X/WvIfWJ+1w/1FBXAwg6BoQPP1jbHjlSV Jy5Zsys30UZoiJA66WOD7OuJnwWXFc/P3/S1Gn585Lr3r57G3S3tQUdpn2RmKKsH6hBmg9 gTcZPm1DC06M/TsWzXC9xDIDrc8IaS8jA2x/paoKlzsa8AYmTGxsVlnTCfVKyg== 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 4QVwk11LXYzy5t; Tue, 30 May 2023 15:07:37 +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 34UF7b6H017018; Tue, 30 May 2023 15:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34UF7bIr017017; Tue, 30 May 2023 15:07:37 GMT (envelope-from git) Date: Tue, 30 May 2023 15:07:37 GMT Message-Id: <202305301507.34UF7bIr017017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 7a8cf053d15e - main - dtrace: deduplicate some RISC-V functions 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7a8cf053d15ed4be7f548bfc9fcbe1367338e2d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7a8cf053d15ed4be7f548bfc9fcbe1367338e2d2 commit 7a8cf053d15ed4be7f548bfc9fcbe1367338e2d2 Author: Christos Margiolis AuthorDate: 2023-05-30 15:07:18 +0000 Commit: Christos Margiolis CommitDate: 2023-05-30 15:07:18 +0000 dtrace: deduplicate some RISC-V functions match_opcode() is defined in FBT, kinst, and dtrace_subr.c. The function prologue-checking functions are defined in FBT and kinst. Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40335 --- .../contrib/opensolaris/uts/common/sys/dtrace.h | 8 +++ sys/cddl/dev/dtrace/riscv/dtrace_isa.c | 73 ++++++++++++++++++++++ sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 22 ++----- sys/cddl/dev/fbt/riscv/fbt_isa.c | 56 ++--------------- 4 files changed, 90 insertions(+), 69 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h index a9730c356e9e..b38bc71a6845 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h +++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h @@ -2433,6 +2433,14 @@ extern int dtrace_instr_size(uint8_t *instr); extern int dtrace_dis_get_byte(void *p); #endif +#if defined(__riscv) +extern int dtrace_match_opcode(uint32_t insn, int match, int mask); +extern int dtrace_instr_sdsp(uint32_t **instr); +extern int dtrace_instr_ret(uint32_t **instr); +extern int dtrace_instr_c_sdsp(uint32_t **instr); +extern int dtrace_instr_c_ret(uint32_t **instr); +#endif + #endif /* _ASM */ #if defined(__i386) || defined(__amd64) diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c index 666f754cc311..1521528c4205 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/riscv/dtrace_isa.c @@ -37,6 +37,8 @@ #include #include +#include +#include #include #include @@ -59,6 +61,12 @@ uint16_t dtrace_fuword16_nocheck(void *); uint32_t dtrace_fuword32_nocheck(void *); uint64_t dtrace_fuword64_nocheck(void *); +int dtrace_match_opcode(uint32_t, int, int); +int dtrace_instr_sdsp(uint32_t **); +int dtrace_instr_ret(uint32_t **); +int dtrace_instr_c_sdsp(uint32_t **); +int dtrace_instr_c_ret(uint32_t **); + void dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, uint32_t *intrpc) @@ -441,3 +449,68 @@ dtrace_fuword64(void *uaddr) return (dtrace_fuword64_nocheck(uaddr)); } + +int +dtrace_match_opcode(uint32_t insn, int match, int mask) +{ + if (((insn ^ match) & mask) == 0) + return (1); + + return (0); +} + +int +dtrace_instr_sdsp(uint32_t **instr) +{ + if (dtrace_match_opcode(**instr, (MATCH_SD | RS2_RA | RS1_SP), + (MASK_SD | RS2_MASK | RS1_MASK))) + return (1); + + return (0); +} + +int +dtrace_instr_c_sdsp(uint32_t **instr) +{ + uint16_t *instr1; + int i; + + for (i = 0; i < 2; i++) { + instr1 = (uint16_t *)(*instr) + i; + if (dtrace_match_opcode(*instr1, (MATCH_C_SDSP | RS2_C_RA), + (MASK_C_SDSP | RS2_C_MASK))) { + *instr = (uint32_t *)instr1; + return (1); + } + } + + return (0); +} + +int +dtrace_instr_ret(uint32_t **instr) +{ + if (dtrace_match_opcode(**instr, (MATCH_JALR | (X_RA << RS1_SHIFT)), + (MASK_JALR | RD_MASK | RS1_MASK | IMM_MASK))) + return (1); + + return (0); +} + +int +dtrace_instr_c_ret(uint32_t **instr) +{ + uint16_t *instr1; + int i; + + for (i = 0; i < 2; i++) { + instr1 = (uint16_t *)(*instr) + i; + if (dtrace_match_opcode(*instr1, + (MATCH_C_JR | (X_RA << RD_SHIFT)), (MASK_C_JR | RD_MASK))) { + *instr = (uint32_t *)instr1; + return (1); + } + } + + return (0); +} diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c index f42c073f94c9..e9e76180a055 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_subr.c +++ b/sys/cddl/dev/dtrace/riscv/dtrace_subr.c @@ -63,8 +63,6 @@ typedef struct dtrace_invop_hdlr { dtrace_invop_hdlr_t *dtrace_invop_hdlr; -static int match_opcode(uint32_t insn, int match, int mask); - int dtrace_invop(uintptr_t addr, struct trapframe *frame) { @@ -243,16 +241,6 @@ dtrace_probe_error(dtrace_state_t *state, dtrace_epid_t epid, int which, (uintptr_t)which, (uintptr_t)fault, (uintptr_t)fltoffs); } -static int -match_opcode(uint32_t insn, int match, int mask) -{ - - if (((insn ^ match) & mask) == 0) - return (1); - - return (0); -} - static int dtrace_invop_start(struct trapframe *frame) { @@ -265,7 +253,7 @@ dtrace_invop_start(struct trapframe *frame) if (invop == 0) return (-1); - if (match_opcode(invop, (MATCH_SD | RS2_RA | RS1_SP), + if (dtrace_match_opcode(invop, (MATCH_SD | RS2_RA | RS1_SP), (MASK_SD | RS2_MASK | RS1_MASK))) { /* Non-compressed store of ra to sp */ imm = (invop >> 7) & 0x1f; @@ -276,14 +264,14 @@ dtrace_invop_start(struct trapframe *frame) return (0); } - if (match_opcode(invop, (MATCH_JALR | (X_RA << RS1_SHIFT)), + if (dtrace_match_opcode(invop, (MATCH_JALR | (X_RA << RS1_SHIFT)), (MASK_JALR | RD_MASK | RS1_MASK | IMM_MASK))) { /* Non-compressed ret */ frame->tf_sepc = frame->tf_ra; return (0); } - if (match_opcode(invop, (MATCH_C_SDSP | RS2_C_RA), + if (dtrace_match_opcode(invop, (MATCH_C_SDSP | RS2_C_RA), (MASK_C_SDSP | RS2_C_MASK))) { /* 'C'-compressed store of ra to sp */ uimm = ((invop >> 10) & 0x7) << 3; @@ -294,14 +282,14 @@ dtrace_invop_start(struct trapframe *frame) return (0); } - if (match_opcode(invop, (MATCH_C_JR | (X_RA << RD_SHIFT)), + if (dtrace_match_opcode(invop, (MATCH_C_JR | (X_RA << RD_SHIFT)), (MASK_C_JR | RD_MASK))) { /* 'C'-compressed ret */ frame->tf_sepc = frame->tf_ra; return (0); } - if (match_opcode(invop, MATCH_C_NOP, MASK_C_NOP)) + if (dtrace_match_opcode(invop, MATCH_C_NOP, MASK_C_NOP)) return (0); #ifdef INVARIANTS diff --git a/sys/cddl/dev/fbt/riscv/fbt_isa.c b/sys/cddl/dev/fbt/riscv/fbt_isa.c index 5c8340d9f001..f17ce21a1b66 100644 --- a/sys/cddl/dev/fbt/riscv/fbt_isa.c +++ b/sys/cddl/dev/fbt/riscv/fbt_isa.c @@ -91,52 +91,6 @@ fbt_patch_tracepoint(fbt_probe_t *fbt, fbt_patchval_t val) }; } -static int -match_opcode(uint32_t insn, int match, int mask) -{ - - if (((insn ^ match) & mask) == 0) - return (1); - - return (0); -} - -static int -check_c_ret(uint32_t **instr) -{ - uint16_t *instr1; - int i; - - for (i = 0; i < 2; i++) { - instr1 = (uint16_t *)(*instr) + i; - if (match_opcode(*instr1, (MATCH_C_JR | (X_RA << RD_SHIFT)), - (MASK_C_JR | RD_MASK))) { - *instr = (uint32_t *)instr1; - return (1); - } - } - - return (0); -} - -static int -check_c_sdsp(uint32_t **instr) -{ - uint16_t *instr1; - int i; - - for (i = 0; i < 2; i++) { - instr1 = (uint16_t *)(*instr) + i; - if (match_opcode(*instr1, (MATCH_C_SDSP | RS2_C_RA), - (MASK_C_SDSP | RS2_C_MASK))) { - *instr = (uint32_t *)instr1; - return (1); - } - } - - return (0); -} - int fbt_provide_module_function(linker_file_t lf, int symindx, linker_symval_t *symval, void *opaque) @@ -174,15 +128,14 @@ fbt_provide_module_function(linker_file_t lf, int symindx, /* Look for sd operation */ for (; instr < limit; instr++) { /* Look for a non-compressed store of ra to sp */ - if (match_opcode(*instr, (MATCH_SD | RS2_RA | RS1_SP), - (MASK_SD | RS2_MASK | RS1_MASK))) { + if (dtrace_instr_sdsp(&instr)) { rval = DTRACE_INVOP_SD; patchval = FBT_PATCHVAL; break; } /* Look for a 'C'-compressed store of ra to sp. */ - if (check_c_sdsp(&instr)) { + if (dtrace_instr_c_sdsp(&instr)) { rval = DTRACE_INVOP_C_SDSP; patchval = FBT_C_PATCHVAL; break; @@ -213,15 +166,14 @@ fbt_provide_module_function(linker_file_t lf, int symindx, again: for (; instr < limit; instr++) { /* Look for non-compressed return */ - if (match_opcode(*instr, (MATCH_JALR | (X_RA << RS1_SHIFT)), - (MASK_JALR | RD_MASK | RS1_MASK | IMM_MASK))) { + if (dtrace_instr_ret(&instr)) { rval = DTRACE_INVOP_RET; patchval = FBT_PATCHVAL; break; } /* Look for 'C'-compressed return */ - if (check_c_ret(&instr)) { + if (dtrace_instr_c_ret(&instr)) { rval = DTRACE_INVOP_C_RET; patchval = FBT_C_PATCHVAL; break;