From nobody Thu Apr 2 15:00:37 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A7B4C6FA82 for ; Thu, 22 Sep 2022 13:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231261AbiIVNot (ORCPT ); Thu, 22 Sep 2022 09:44:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230365AbiIVNon (ORCPT ); Thu, 22 Sep 2022 09:44:43 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B194A13D3C for ; Thu, 22 Sep 2022 06:44:41 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id 207so9164650pgc.7 for ; Thu, 22 Sep 2022 06:44:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=gpOm99lTje5wgZKlnX/gKBRay3j0WOioL6NHdvtdKYk=; b=m86aDIvEpyTBbA4YjL9ruxWrastIhSyWD0XCHBxcll38kxyfs52rOxoDOlsNY52n3C UA5ZrdZqOPUIumqd38obWqaT3Fu9YZl+6nTVNPeI+jnMLOssLbvOEP4IUBkMQ9cIspfw PYCk2WOV24niUz9w8/leme8yN5H5MeCYAuTK1QN0RULITeIOsHdmJbP+Md5JIBH99z7f lTKNazNnMqnofozcD0KboZptKEpII+nQ12Jj/tVh1uGGW9ykqIXGbzd4ayEusV63vmFj bkb6TyBMbUlHIPi9SAFTfQhmwClT5rBbP2m3XQOJMKpTYU0mu2sT05Ysoz4+5bONYjHx WG5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=gpOm99lTje5wgZKlnX/gKBRay3j0WOioL6NHdvtdKYk=; b=Sl6t+rDWA0NewWcSflhMAR/X0v5u5QL9Nge5xSlY4RhdmwcNrqPXQRzcvLw2/VTf0L RuiG6kA4Pz1IE+OR7jkVym45Cff6wXsx9haeTUrODQinqOEqmAcnNyqONQyh17P1LzlG XHybA3R/Zu4sT6vRcWNp9cyKg0OyAk8EHSAY88ElNZzd4Sc98bwxv9pzbbLYOI3LpKpf 0OdOCCcN4uhohpgh9cxBCnagVbAwoqHd7yGdfW7U+EdxMP/YU0q72L/8HNcdwCdIGVFu mmZEA61f7ED2M/L4rQfigBxAedwWaiYiL7oEIs1GQ64Wc4Gx9ZVU2Tw5uDmmoP/qDCNX V+kA== X-Gm-Message-State: ACrzQf0j/J7bx9ImvFcS4fimC4FSGN53j3j3jt5Ol1RFTx9n8jops9yR p43/bFPB6O3fQZQjrZwgOxM= X-Google-Smtp-Source: AMsMyM6FYmknz4eIO6k4NptriATZpvMdF0RAHGNj3zNU8b4VotgALuRnvHZ6inA+Ggqb7JRMFQGMAA== X-Received: by 2002:a05:6a00:b4d:b0:540:cee1:657e with SMTP id p13-20020a056a000b4d00b00540cee1657emr3822237pfo.22.1663854280869; Thu, 22 Sep 2022 06:44:40 -0700 (PDT) Received: from localhost.localdomain ([173.82.120.158]) by smtp.gmail.com with ESMTPSA id e15-20020a056a0000cf00b0053f2505318asm4504236pfj.142.2022.09.22.06.44.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 06:44:40 -0700 (PDT) From: l3b2w1@gmail.com To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, naveen.n.rao@linux.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, mhiramat@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Binglei Wang Subject: [PATCH v4] rethook: add riscv rethook implementation. Date: Thu, 22 Sep 2022 21:44:28 +0800 Message-Id: <20220922134428.19203-1-l3b2w1@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Binglei Wang Implement the kretprobes function on riscv arch by using rethook machenism which abstracts general kretprobe info into the struct rethook_node to be embedded in the struct kretprobe_instance Signed-off-by: Binglei Wang --- arch/riscv/Kconfig | 1 + arch/riscv/kernel/probes/Makefile | 1 + arch/riscv/kernel/probes/kprobes.c | 8 -- arch/riscv/kernel/probes/kprobes_trampoline.S | 73 +---------------- arch/riscv/kernel/probes/kprobes_trampoline.h | 79 +++++++++++++++++++ arch/riscv/kernel/probes/rethook.c | 24 ++++++ arch/riscv/kernel/probes/rethook_trampoline.S | 22 ++++++ include/linux/kprobes.h | 6 ++ 8 files changed, 134 insertions(+), 80 deletions(-) create mode 100644 arch/riscv/kernel/probes/kprobes_trampoline.h create mode 100644 arch/riscv/kernel/probes/rethook.c create mode 100644 arch/riscv/kernel/probes/rethook_trampoline.S diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index ed66c31e4..c5cae0825 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -97,6 +97,7 @@ config RISCV select HAVE_KPROBES if !XIP_KERNEL select HAVE_KPROBES_ON_FTRACE if !XIP_KERNEL select HAVE_KRETPROBES if !XIP_KERNEL + select HAVE_RETHOOK if !XIP_KERNEL select HAVE_MOVE_PMD select HAVE_MOVE_PUD select HAVE_PCI diff --git a/arch/riscv/kernel/probes/Makefile b/arch/riscv/kernel/probes/M= akefile index 7f0840dcc..ee345e7e9 100644 --- a/arch/riscv/kernel/probes/Makefile +++ b/arch/riscv/kernel/probes/Makefile @@ -3,4 +3,5 @@ obj-$(CONFIG_KPROBES) +=3D kprobes.o decode-insn.o simulat= e-insn.o obj-$(CONFIG_KPROBES) +=3D kprobes_trampoline.o obj-$(CONFIG_KPROBES_ON_FTRACE) +=3D ftrace.o obj-$(CONFIG_UPROBES) +=3D uprobes.o decode-insn.o simulate-insn.o +obj-$(CONFIG_RETHOOK) +=3D rethook.o rethook_trampoline.o CFLAGS_REMOVE_simulate-insn.o =3D $(CC_FLAGS_FTRACE) diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/= kprobes.c index e6e950b7c..04911cc42 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -350,14 +350,6 @@ void __kprobes __used *trampoline_probe_handler(struct= pt_regs *regs) return (void *)kretprobe_trampoline_handler(regs, NULL); } =20 -void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, - struct pt_regs *regs) -{ - ri->ret_addr =3D (kprobe_opcode_t *)regs->ra; - ri->fp =3D NULL; - regs->ra =3D (unsigned long) &__kretprobe_trampoline; -} - int __kprobes arch_trampoline_kprobe(struct kprobe *p) { return 0; diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.S b/arch/riscv/ker= nel/probes/kprobes_trampoline.S index 7bdb09ded..54937f342 100644 --- a/arch/riscv/kernel/probes/kprobes_trampoline.S +++ b/arch/riscv/kernel/probes/kprobes_trampoline.S @@ -2,78 +2,7 @@ /* * Author: Patrick St=C3=A4hlin */ -#include - -#include -#include - - .text - .altmacro - - .macro save_all_base_regs - REG_S x1, PT_RA(sp) - REG_S x3, PT_GP(sp) - REG_S x4, PT_TP(sp) - REG_S x5, PT_T0(sp) - REG_S x6, PT_T1(sp) - REG_S x7, PT_T2(sp) - REG_S x8, PT_S0(sp) - REG_S x9, PT_S1(sp) - REG_S x10, PT_A0(sp) - REG_S x11, PT_A1(sp) - REG_S x12, PT_A2(sp) - REG_S x13, PT_A3(sp) - REG_S x14, PT_A4(sp) - REG_S x15, PT_A5(sp) - REG_S x16, PT_A6(sp) - REG_S x17, PT_A7(sp) - REG_S x18, PT_S2(sp) - REG_S x19, PT_S3(sp) - REG_S x20, PT_S4(sp) - REG_S x21, PT_S5(sp) - REG_S x22, PT_S6(sp) - REG_S x23, PT_S7(sp) - REG_S x24, PT_S8(sp) - REG_S x25, PT_S9(sp) - REG_S x26, PT_S10(sp) - REG_S x27, PT_S11(sp) - REG_S x28, PT_T3(sp) - REG_S x29, PT_T4(sp) - REG_S x30, PT_T5(sp) - REG_S x31, PT_T6(sp) - .endm - - .macro restore_all_base_regs - REG_L x3, PT_GP(sp) - REG_L x4, PT_TP(sp) - REG_L x5, PT_T0(sp) - REG_L x6, PT_T1(sp) - REG_L x7, PT_T2(sp) - REG_L x8, PT_S0(sp) - REG_L x9, PT_S1(sp) - REG_L x10, PT_A0(sp) - REG_L x11, PT_A1(sp) - REG_L x12, PT_A2(sp) - REG_L x13, PT_A3(sp) - REG_L x14, PT_A4(sp) - REG_L x15, PT_A5(sp) - REG_L x16, PT_A6(sp) - REG_L x17, PT_A7(sp) - REG_L x18, PT_S2(sp) - REG_L x19, PT_S3(sp) - REG_L x20, PT_S4(sp) - REG_L x21, PT_S5(sp) - REG_L x22, PT_S6(sp) - REG_L x23, PT_S7(sp) - REG_L x24, PT_S8(sp) - REG_L x25, PT_S9(sp) - REG_L x26, PT_S10(sp) - REG_L x27, PT_S11(sp) - REG_L x28, PT_T3(sp) - REG_L x29, PT_T4(sp) - REG_L x30, PT_T5(sp) - REG_L x31, PT_T6(sp) - .endm +#include "kprobes_trampoline.h" =20 ENTRY(__kretprobe_trampoline) addi sp, sp, -(PT_SIZE_ON_STACK) diff --git a/arch/riscv/kernel/probes/kprobes_trampoline.h b/arch/riscv/ker= nel/probes/kprobes_trampoline.h new file mode 100644 index 000000000..48895a5e3 --- /dev/null +++ b/arch/riscv/kernel/probes/kprobes_trampoline.h @@ -0,0 +1,79 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +#ifndef _KPROBES_TRAMPOLINE_H +#define _KPROBES_TRAMPOLINE_H +/* + * Author: Patrick St=C3=A4hlin + */ +#include + +#include +#include + + .text + .altmacro + + .macro save_all_base_regs + REG_S x1, PT_RA(sp) + REG_S x3, PT_GP(sp) + REG_S x4, PT_TP(sp) + REG_S x5, PT_T0(sp) + REG_S x6, PT_T1(sp) + REG_S x7, PT_T2(sp) + REG_S x8, PT_S0(sp) + REG_S x9, PT_S1(sp) + REG_S x10, PT_A0(sp) + REG_S x11, PT_A1(sp) + REG_S x12, PT_A2(sp) + REG_S x13, PT_A3(sp) + REG_S x14, PT_A4(sp) + REG_S x15, PT_A5(sp) + REG_S x16, PT_A6(sp) + REG_S x17, PT_A7(sp) + REG_S x18, PT_S2(sp) + REG_S x19, PT_S3(sp) + REG_S x20, PT_S4(sp) + REG_S x21, PT_S5(sp) + REG_S x22, PT_S6(sp) + REG_S x23, PT_S7(sp) + REG_S x24, PT_S8(sp) + REG_S x25, PT_S9(sp) + REG_S x26, PT_S10(sp) + REG_S x27, PT_S11(sp) + REG_S x28, PT_T3(sp) + REG_S x29, PT_T4(sp) + REG_S x30, PT_T5(sp) + REG_S x31, PT_T6(sp) + .endm + + .macro restore_all_base_regs + REG_L x3, PT_GP(sp) + REG_L x4, PT_TP(sp) + REG_L x5, PT_T0(sp) + REG_L x6, PT_T1(sp) + REG_L x7, PT_T2(sp) + REG_L x8, PT_S0(sp) + REG_L x9, PT_S1(sp) + REG_L x10, PT_A0(sp) + REG_L x11, PT_A1(sp) + REG_L x12, PT_A2(sp) + REG_L x13, PT_A3(sp) + REG_L x14, PT_A4(sp) + REG_L x15, PT_A5(sp) + REG_L x16, PT_A6(sp) + REG_L x17, PT_A7(sp) + REG_L x18, PT_S2(sp) + REG_L x19, PT_S3(sp) + REG_L x20, PT_S4(sp) + REG_L x21, PT_S5(sp) + REG_L x22, PT_S6(sp) + REG_L x23, PT_S7(sp) + REG_L x24, PT_S8(sp) + REG_L x25, PT_S9(sp) + REG_L x26, PT_S10(sp) + REG_L x27, PT_S11(sp) + REG_L x28, PT_T3(sp) + REG_L x29, PT_T4(sp) + REG_L x30, PT_T5(sp) + REG_L x31, PT_T6(sp) + .endm +#endif diff --git a/arch/riscv/kernel/probes/rethook.c b/arch/riscv/kernel/probes/= rethook.c new file mode 100644 index 000000000..47853bc36 --- /dev/null +++ b/arch/riscv/kernel/probes/rethook.c @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Generic return hook for riscv. + */ + +#include +#include + +/* This is called from arch_rethook_trampoline() */ +unsigned long __used arch_rethook_trampoline_callback(struct pt_regs *regs) +{ + return rethook_trampoline_handler(regs, regs->s0); +} +NOKPROBE_SYMBOL(arch_rethook_trampoline_callback); + +void arch_rethook_prepare(struct rethook_node *rhn, struct pt_regs *regs, = bool mcount) +{ + rhn->ret_addr =3D regs->ra; + rhn->frame =3D regs->s0; + + /* replace return addr with trampoline */ + regs->ra =3D (u64)arch_rethook_trampoline; +} +NOKPROBE_SYMBOL(arch_rethook_prepare); diff --git a/arch/riscv/kernel/probes/rethook_trampoline.S b/arch/riscv/ker= nel/probes/rethook_trampoline.S new file mode 100644 index 000000000..e81c3d4e0 --- /dev/null +++ b/arch/riscv/kernel/probes/rethook_trampoline.S @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Author: Patrick St=C3=A4hlin + */ +#include "kprobes_trampoline.h" + +ENTRY(arch_rethook_trampoline) + addi sp, sp, -(PT_SIZE_ON_STACK) + save_all_base_regs + + move a0, sp /* pt_regs */ + + call arch_rethook_trampoline_callback + + /* use the result as the return-address */ + move ra, a0 + + restore_all_base_regs + addi sp, sp, PT_SIZE_ON_STACK + + ret +ENDPROC(arch_rethook_trampoline) diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 55041d2f8..a3805b5b2 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -210,6 +210,12 @@ static nokprobe_inline unsigned long get_kretprobe_ret= addr(struct kretprobe_inst { return ri->node.ret_addr; } +static nokprobe_inline +unsigned long kretprobe_trampoline_handler(struct pt_regs *regs, + void *frame_pointer) +{ + return 0; +} #else extern void arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs); base-commit: f30480cdeafc79d1f017d41335a96d8e3b973c91 --=20 2.25.1