From nobody Thu Apr 16 02:12:31 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 F338FC433FE for ; Wed, 23 Nov 2022 14:21:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237085AbiKWOVh (ORCPT ); Wed, 23 Nov 2022 09:21:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237621AbiKWOUv (ORCPT ); Wed, 23 Nov 2022 09:20:51 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 300BA65863 for ; Wed, 23 Nov 2022 06:20:39 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id z26so17462991pff.1 for ; Wed, 23 Nov 2022 06:20:39 -0800 (PST) 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 :message-id:reply-to; bh=qxhkKuZvqbaLoVEzfi+iXfk1DD9YbSKqrCN+Rkf9lGA=; b=mBP5+fAXxuAxdCSP7zz4tcSWzEJr0hKfXx05l9u3poc8f2lajrRDJ4om5XYRcd98cX NLSa3uq9HOym2r1qyYi9iYHEmbhSlyJKl/FNE5lZxwm0dzVo81wicYiH1ou3HUtugTqI rP4v9oD7NDJQfw2siOAoyIh7gfzl0Dgj2wrGWTbppytIC4j0Fn4EiXlXR82cRpZWKLHQ kujHqPeRV95YUrZxHUOXGG0YPe58U6En1STNS1KBld/YP6FHULqFQuAqRyTc8gkPuM+Q IlUhPgEsBIvmc5Uvd+rlFDrV3xE4ZTN2k34MiRwlB+AP0XFGtCEjv5+QbMRAUb4GpeyD gjNg== 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:message-id:reply-to; bh=qxhkKuZvqbaLoVEzfi+iXfk1DD9YbSKqrCN+Rkf9lGA=; b=lx7C8w6tw/tZ332wVv1JpRXHXx18d2rQ5L87t5iOR+G9z0DxDMj/Hvi2O8obutjtJD n8i82QmJv9ndj+R2QgwoQWlkcwJel5NUndJHgadU9uwFjiL0O912r07IA1y9laXNknpp /8NkPOnVDqSZYYog29uHUoL9ookxJlmCX/NkSKF8o2qcMKwrNAbIqQSxBRQa52tiVtgg SuDYD6K4gNeBVU4E17Gmt8+jnho99mraP7KdX4R5VcoiOctcUYuMGUs0eQglNFsT1tUS ha6fz8FbFO6hQe/Gsaqm/Jzi+KT0htMQRzfdJl9HoNKr5xRg+d5JhOYapjgXvBhS0YQf YlPQ== X-Gm-Message-State: ANoB5pkLX9ob4dyRn4UIabV7Adii6jAj6N9Lc/fwnHEtoAVOR8wSCA0y GlQ0rEPTl+qaCdEjUXoVpR+CBj69wn0= X-Google-Smtp-Source: AA0mqf7RhWSNHw9CyAtO67HOD5j0yS9Nu9HyQl1/3A0ZHyi4rX2EzsGLfDFDlpbeW9YxJh5zKL+jtw== X-Received: by 2002:a63:4909:0:b0:462:8605:7fe7 with SMTP id w9-20020a634909000000b0046286057fe7mr8277358pga.445.1669213238663; Wed, 23 Nov 2022 06:20:38 -0800 (PST) Received: from localhost.localdomain ([221.226.144.218]) by smtp.gmail.com with ESMTPSA id l12-20020a170903120c00b0016c5306917fsm14516732plh.53.2022.11.23.06.20.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 06:20:38 -0800 (PST) From: Song Shuai To: guoren@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, peterz@infradead.org, jolsa@redhat.com, bp@suse.de, jpoimboe@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH 1/2] riscv/ftrace: add DYNAMIC_FTRACE_WITH_DIRECT_CALLS support Date: Wed, 23 Nov 2022 22:20:24 +0800 Message-Id: <20221123142025.1504030-2-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221123142025.1504030-1-suagrfillet@gmail.com> References: <20221123142025.1504030-1-suagrfillet@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This patch adds DYNAMIC_FTRACE_WITH_DIRECT_CALLS support for RISC-V. select the DYNAMIC_FTRACE_WITH_DIRECT_CALLS to provide the register_ftrace_direct[_multi] interfaces allowing users to register the customed trampoline (direct_caller) as the mcount for one or more target functions. And modify_ftrace_direct[_multi] are also provided for modifying direct_caller. To make the direct_caller and the other ftrace hooks (eg. function/fgraph tracer, k[ret]probes) co-exist, a temporary register is nominated to store the address of direct_caller in ftrace_regs_caller. After the setting of the address direct_caller by direct_ops->func and the RESTORE_REGS in ftrace_regs_caller, direct_caller will be jumped to by the `jr` inst. Signed-off-by: Song Shuai --- arch/riscv/Kconfig | 1 + arch/riscv/include/asm/ftrace.h | 6 ++++++ arch/riscv/kernel/mcount-dyn.S | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 39ec8d628cf6..d083ec08d0b6 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -278,6 +278,7 @@ config ARCH_RV64I select ARCH_SUPPORTS_INT128 if CC_HAS_INT128 select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchab= le-function-entry=3D8) select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE + select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION diff --git a/arch/riscv/include/asm/ftrace.h b/arch/riscv/include/asm/ftrac= e.h index 01bebb28eabe..be4d57566139 100644 --- a/arch/riscv/include/asm/ftrace.h +++ b/arch/riscv/include/asm/ftrace.h @@ -114,6 +114,12 @@ struct ftrace_regs; void ftrace_graph_func(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *op, struct ftrace_regs *fregs); #define ftrace_graph_func ftrace_graph_func + +static inline void arch_ftrace_set_direct_caller(struct pt_regs *regs, uns= igned long addr) +{ + regs->t1 =3D addr; +} + #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ =20 #endif /* __ASSEMBLY__ */ diff --git a/arch/riscv/kernel/mcount-dyn.S b/arch/riscv/kernel/mcount-dyn.S index 466c6ef217b1..b89c85a58569 100644 --- a/arch/riscv/kernel/mcount-dyn.S +++ b/arch/riscv/kernel/mcount-dyn.S @@ -233,6 +233,7 @@ ENDPROC(ftrace_caller) #else /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ ENTRY(ftrace_regs_caller) SAVE_ABI_REGS 1 + REG_S x0, PT_T1(sp) PREPARE_ARGS =20 ftrace_regs_call: @@ -241,7 +242,10 @@ ftrace_regs_call: =20 =20 RESTORE_ABI_REGS 1 + bnez t1,.Ldirect jr t0 +.Ldirect: + jr t1 ENDPROC(ftrace_regs_caller) =20 ENTRY(ftrace_caller) --=20 2.20.1 From nobody Thu Apr 16 02:12:31 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 7666AC4332F for ; Wed, 23 Nov 2022 14:21:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236175AbiKWOVe (ORCPT ); Wed, 23 Nov 2022 09:21:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237927AbiKWOVK (ORCPT ); Wed, 23 Nov 2022 09:21:10 -0500 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78D836586D for ; Wed, 23 Nov 2022 06:20:43 -0800 (PST) Received: by mail-pf1-x42a.google.com with SMTP id z26so17463262pff.1 for ; Wed, 23 Nov 2022 06:20:43 -0800 (PST) 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 :message-id:reply-to; bh=cpISd1d/uhv2+upzDxICvohf61x5+Sa1ZjCwlVU0Tf0=; b=Y2tNspjdXDud07SoecBE7gvF/ldPswCAM3oeqKHCW1Fyjuz0133YIjEz5n6pA4wSOk HAUGIgas6x+bVwvRmIm5n7Fp5Y/k6rDJ4Yw/Mfk6gSOBSk+UVyDFZ1Sn0ZpJRYtHiRhx 1JBpnnqHsFY8a9tq/uetUMeEi1FqzzrPLLNGhkd9fvKm+TnbaUSkWit6CDW2yiqrtYbX OJk8IkeL2nim0glmSzO5UiBXIqJP9cbCMzjtufg1eRfLX2n95tDE9m+qUOZbFCg4yOaY YfeZbdA9uf2ltO9y5eaZIVh1w0S6HxOGPgkFDAdIzBuVeO205/xY5E3bHQannje0RnqF x82Q== 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:message-id:reply-to; bh=cpISd1d/uhv2+upzDxICvohf61x5+Sa1ZjCwlVU0Tf0=; b=VN4W61EnvCZLlgWS9KYPls6WhUG5sX4zNT+Vw2dNepk+rIyLVF0G4k0j9Xuz79OStM NDlmhXH5fqkH6U3k0TheUdi+KKMOqZbG1UreTCvQ2sCGjQfSDRLy/kbA6sOS6NVMhGiu CUOQYWF0Nw7mCic0W9DaEkDZxwwEi7MPgoqV4Us1rIyliB+COQfUJFxUExfh/Gcd8O2p nsbPiRmW92nLCLGWNsMp84btPNBgUb9c706zZzukHb/y0QqZk1tkMsVj8bmlVECWMJiV eXo5oVFjymdZp4nyAjGao6d63koaA6NtAl81FMCK35r1MiIbRPUURvFCcgNS2r4azfLt 5UqQ== X-Gm-Message-State: ANoB5plsLIqwMKgS9ytSnNE38bGJS8pPVPvYGCiWmPAPwbO+pncmJn2Y KePtuomFz3aInwM9uOk9+Ws= X-Google-Smtp-Source: AA0mqf6rnuo5eYZ5Q8KZ6gnEEZI+xbyqKhr4y2Gdiw/hYL3qOvvNWezCFQN1irYSyz5KyYy/jotCMQ== X-Received: by 2002:aa7:9635:0:b0:56b:6936:ddf6 with SMTP id r21-20020aa79635000000b0056b6936ddf6mr8811622pfg.84.1669213242754; Wed, 23 Nov 2022 06:20:42 -0800 (PST) Received: from localhost.localdomain ([221.226.144.218]) by smtp.gmail.com with ESMTPSA id l12-20020a170903120c00b0016c5306917fsm14516732plh.53.2022.11.23.06.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Nov 2022 06:20:42 -0800 (PST) From: Song Shuai To: guoren@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, peterz@infradead.org, jolsa@redhat.com, bp@suse.de, jpoimboe@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Song Shuai Subject: [PATCH 2/2] samples/ftrace: add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] Date: Wed, 23 Nov 2022 22:20:25 +0800 Message-Id: <20221123142025.1504030-3-suagrfillet@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20221123142025.1504030-1-suagrfillet@gmail.com> References: <20221123142025.1504030-1-suagrfillet@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" select HAVE_SAMPLE_FTRACE_DIRECT and HAVE_SAMPLE_FTRACE_DIRECT_MULTI for ARCH_RV64I in arch/riscv/Kconfig. And add riscv asm code for the ftrace-direct*.c files in samples/ftrace/. Signed-off-by: Song Shuai --- arch/riscv/Kconfig | 2 ++ samples/ftrace/ftrace-direct-modify.c | 35 ++++++++++++++++++- samples/ftrace/ftrace-direct-multi-modify.c | 37 +++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 22 ++++++++++++ samples/ftrace/ftrace-direct-too.c | 26 +++++++++++++++ samples/ftrace/ftrace-direct.c | 22 ++++++++++++ 6 files changed, 143 insertions(+), 1 deletion(-) diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index d083ec08d0b6..572973103d73 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -279,6 +279,8 @@ config ARCH_RV64I select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && MMU && $(cc-option,-fpatchab= le-function-entry=3D8) select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS + select HAVE_SAMPLE_FTRACE_DIRECT + select HAVE_SAMPLE_FTRACE_DIRECT_MULTI select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER if !XIP_KERNEL && !PREEMPTION diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-= direct-modify.c index 39146fa83e20..5582d000d803 100644 --- a/samples/ftrace/ftrace-direct-modify.c +++ b/samples/ftrace/ftrace-direct-modify.c @@ -17,10 +17,43 @@ void my_direct_func2(void) trace_printk("my direct func2\n"); } =20 +static unsigned long my_ip =3D (unsigned long)schedule; + extern void my_tramp1(void *); extern void my_tramp2(void *); =20 -static unsigned long my_ip =3D (unsigned long)schedule; +#ifdef CONFIG_RISCV + +asm (" .pushsection .text, \"ax\", @progbits\n" +" .type my_tramp1, @function\n" +" .globl my_tramp1\n" +" my_tramp1:\n" +" addi sp,sp,-16\n" +" sd t0,0(sp)\n" +" sd ra,8(sp)\n" +" call my_direct_func1\n" +" ld t0,0(sp)\n" +" ld ra,8(sp)\n" +" addi sp,sp,16\n" +" jr t0\n" +" .size my_tramp1, .-my_tramp1\n" + +" .type my_tramp2, @function\n" +" .globl my_tramp2\n" +" my_tramp2:\n" +" addi sp,sp,-16\n" +" sd t0,0(sp)\n" +" sd ra,8(sp)\n" +" call my_direct_func2\n" +" ld t0,0(sp)\n" +" ld ra,8(sp)\n" +" addi sp,sp,16\n" +" jr t0\n" +" .size my_tramp2, .-my_tramp2\n" +" .popsection\n" +); + +#endif /* CONFIG_RISCV */ =20 #ifdef CONFIG_X86_64 =20 diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/f= trace-direct-multi-modify.c index 65aa94d96f4e..43e02d39c652 100644 --- a/samples/ftrace/ftrace-direct-multi-modify.c +++ b/samples/ftrace/ftrace-direct-multi-modify.c @@ -20,6 +20,43 @@ void my_direct_func2(unsigned long ip) extern void my_tramp1(void *); extern void my_tramp2(void *); =20 +#ifdef CONFIG_RISCV + +asm (" .pushsection .text, \"ax\", @progbits\n" +" .type my_tramp1, @function\n" +" .globl my_tramp1\n" +" my_tramp1:\n" +" addi sp,sp,-24\n" +" sd a0,0(sp)\n" +" sd t0,8(sp)\n" +" sd ra,16(sp)\n" +" call my_direct_func1\n" +" ld a0,0(sp)\n" +" ld t0,8(sp)\n" +" ld ra,16(sp)\n" +" addi sp,sp,24\n" +" jr t0\n" +" .size my_tramp1, .-my_tramp1\n" + +" .type my_tramp2, @function\n" +" .globl my_tramp2\n" +" my_tramp2:\n" +" addi sp,sp,-24\n" +" sd a0,0(sp)\n" +" sd t0,8(sp)\n" +" sd ra,16(sp)\n" +" call my_direct_func2\n" +" ld a0,0(sp)\n" +" ld t0,8(sp)\n" +" ld ra,16(sp)\n" +" addi sp,sp,24\n" +" jr t0\n" +" .size my_tramp2, .-my_tramp2\n" +" .popsection\n" +); + +#endif /* CONFIG_RISCV */ + #ifdef CONFIG_X86_64 =20 #include diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-d= irect-multi.c index 41ded7c615c7..df91339d3095 100644 --- a/samples/ftrace/ftrace-direct-multi.c +++ b/samples/ftrace/ftrace-direct-multi.c @@ -15,6 +15,28 @@ void my_direct_func(unsigned long ip) =20 extern void my_tramp(void *); =20 +#ifdef CONFIG_RISCV + +asm (" .pushsection .text, \"ax\", @progbits\n" +" .type my_tramp, @function\n" +" .globl my_tramp\n" +" my_tramp:\n" +" addi sp,sp,-24\n" +" sd a0,0(sp)\n" +" sd t0,8(sp)\n" +" sd ra,16(sp)\n" +" call my_direct_func\n" +" ld a0,0(sp)\n" +" ld t0,8(sp)\n" +" ld ra,16(sp)\n" +" addi sp,sp,24\n" +" jr t0\n" +" .size my_tramp, .-my_tramp\n" +" .popsection\n" +); + +#endif /* CONFIG_RISCV */ + #ifdef CONFIG_X86_64 =20 #include diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-dir= ect-too.c index 6690468c5cc2..fe3b8c4f3336 100644 --- a/samples/ftrace/ftrace-direct-too.c +++ b/samples/ftrace/ftrace-direct-too.c @@ -17,6 +17,32 @@ void my_direct_func(struct vm_area_struct *vma, =20 extern void my_tramp(void *); =20 +#ifdef CONFIG_RISCV + +asm (" .pushsection .text, \"ax\", @progbits\n" +" .type my_tramp, @function\n" +" .globl my_tramp\n" +" my_tramp:\n" +" addi sp,sp,-40\n" +" sd a0,0(sp)\n" +" sd a1,8(sp)\n" +" sd a2,16(sp)\n" +" sd t0,24(sp)\n" +" sd ra,32(sp)\n" +" call my_direct_func\n" +" ld a0,0(sp)\n" +" ld a1,8(sp)\n" +" ld a2,16(sp)\n" +" ld t0,24(sp)\n" +" ld ra,32(sp)\n" +" addi sp,sp,40\n" +" jr t0\n" +" .size my_tramp, .-my_tramp\n" +" .popsection\n" +); + +#endif /* CONFIG_RISCV */ + #ifdef CONFIG_X86_64 =20 #include diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c index e8f1e440b9b8..0784024b6653 100644 --- a/samples/ftrace/ftrace-direct.c +++ b/samples/ftrace/ftrace-direct.c @@ -14,6 +14,28 @@ void my_direct_func(struct task_struct *p) =20 extern void my_tramp(void *); =20 +#ifdef CONFIG_RISCV + +asm (" .pushsection .text, \"ax\", @progbits\n" +" .type my_tramp, @function\n" +" .globl my_tramp\n" +" my_tramp:\n" +" addi sp,sp,-24\n" +" sd a0,0(sp)\n" +" sd t0,8(sp)\n" +" sd ra,16(sp)\n" +" call my_direct_func\n" +" ld a0,0(sp)\n" +" ld t0,8(sp)\n" +" ld ra,16(sp)\n" +" addi sp,sp,24\n" +" jr t0\n" +" .size my_tramp, .-my_tramp\n" +" .popsection\n" +); + +#endif /* CONFIG_RISCV */ + #ifdef CONFIG_X86_64 =20 #include --=20 2.20.1