From mboxrd@z Thu Jan 1 00:00:00 1970 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 110E7C433FE for ; Mon, 28 Nov 2022 12:55:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbiK1Mzu (ORCPT ); Mon, 28 Nov 2022 07:55:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230462AbiK1Mzs (ORCPT ); Mon, 28 Nov 2022 07:55:48 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20B6615A2C for ; Mon, 28 Nov 2022 04:55:47 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id CFB57B80BA6 for ; Mon, 28 Nov 2022 12:55:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C5DAC43149 for ; Mon, 28 Nov 2022 12:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669640144; bh=N2jz2MyDPCx7Xd+BDRjSFxdG7EbluFXklRmTdFxBHs0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=VbrZTQqyZN3hWZ9lm0byfYrTfU7CqmNQm6ToED3hvZZAqJGSnE/yz9Jlm3zh4Ovf0 gpQPC4tsSGLhCZS65nE1srd3zcbEfn18P3kTwwdahY/s/PAfXd//BSUTeF347XayyA XHqVj8/Rbwd5theKH8xy02fayTK13XrLeYGaVFD8u+CKD/QJExyOQ9dEmfplmuBLcO WmSfWRDz01+bxVDYe50syLsHtn1VypGyi/CK1Ac1rcQSxcA6wHDzT0Akro6nz4iy1W GhGG/IT/B3DcAJ0iIblEfmEIqOUySZzxNRw49HD0XIdYo6J6EXKZwxvApd0Hf4NjsA Xa4TVhMiWC3Hw== Received: by mail-ed1-f46.google.com with SMTP id v8so15309150edi.3 for ; Mon, 28 Nov 2022 04:55:44 -0800 (PST) X-Gm-Message-State: ANoB5ploJrSbPZZFQ+JVb5gflAGv+nopdIM1MJbU9UyO0caclLxKsXCJ lAcz/L5hERM5KQShppY2x/oy/eGfQWutxKv/ISo= X-Google-Smtp-Source: AA0mqf5e0CzOn/wO9uQnxEYa2/sdWv3isHv0uwALPM3XqwN3Y0CQhmBW0rMwstpJOuzq7gNyA3qDzzXrE5txmneQ6Jo= X-Received: by 2002:aa7:d912:0:b0:46b:2b37:ffa9 with SMTP id a18-20020aa7d912000000b0046b2b37ffa9mr4607745edr.79.1669640142770; Mon, 28 Nov 2022 04:55:42 -0800 (PST) MIME-Version: 1.0 References: <20221128101201.4144527-1-guoren@kernel.org> <20221128101201.4144527-2-guoren@kernel.org> In-Reply-To: <20221128101201.4144527-2-guoren@kernel.org> From: Guo Ren Date: Mon, 28 Nov 2022 20:55:30 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/2] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] To: suagrfillet@gmail.com, guoren@kernel.org Cc: aou@eecs.berkeley.edu, bp@suse.de, jolsa@redhat.com, jpoimboe@kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, mark.rutland@arm.com, mhiramat@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, peterz@infradead.org, rostedt@goodmis.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Abandoned. On Mon, Nov 28, 2022 at 6:12 PM wrote: > > From: Song Shuai > > 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 > Co-developed-by: Guo Ren > Signed-off-by: Guo Ren > --- > Below is modified by Guo Ren: > > diff --git a/samples/ftrace/ftrace-direct-modify.c > b/samples/ftrace/ftrace-direct-modify.c > index 5582d000d803..d970b46ecc4e 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -29,6 +29,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " .globl my_tramp1\n" > " my_tramp1:\n" > " addi sp,sp,-16\n" > +" move t0,t1\n" > " sd t0,0(sp)\n" > " sd ra,8(sp)\n" > " call my_direct_func1\n" > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c > b/samples/ftrace/ftrace-direct-multi-modify.c > index 43e02d39c652..9534e18fa6ed 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -28,6 +28,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp1:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func1\n" > diff --git a/samples/ftrace/ftrace-direct-multi.c > b/samples/ftrace/ftrace-direct-multi.c > index df91339d3095..2111478b0463 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -23,6 +23,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func\n" > diff --git a/samples/ftrace/ftrace-direct-too.c > b/samples/ftrace/ftrace-direct-too.c > index fe3b8c4f3336..e80981d3dc0a 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -27,6 +27,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " sd a0,0(sp)\n" > " sd a1,8(sp)\n" > " sd a2,16(sp)\n" > +" move t0,t1\n" > " sd t0,24(sp)\n" > " sd ra,32(sp)\n" > " call my_direct_func\n" > diff --git a/samples/ftrace/ftrace-direct.c > b/samples/ftrace/ftrace-direct.c > index 0784024b6653..b6cae1b5cb66 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -22,6 +22,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func\n" > --- > arch/riscv/Kconfig | 2 ++ > samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ > samples/ftrace/ftrace-direct-multi-modify.c | 38 +++++++++++++++++++++ > samples/ftrace/ftrace-direct-multi.c | 23 +++++++++++++ > samples/ftrace/ftrace-direct-too.c | 27 +++++++++++++++ > samples/ftrace/ftrace-direct.c | 23 +++++++++++++ > 6 files changed, 147 insertions(+) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 2828537abfcd..0a1da03e88c2 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,-fpatchable-function-entry=8) > 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..6a633ff4cf6d 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -22,6 +22,40 @@ extern void my_tramp2(void *); > > static unsigned long my_ip = (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" > +" move t0,t1\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 */ > + > #ifdef CONFIG_X86_64 > > #include > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > index 65aa94d96f4e..9534e18fa6ed 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -20,6 +20,44 @@ void my_direct_func2(unsigned long ip) > extern void my_tramp1(void *); > extern void my_tramp2(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > index 41ded7c615c7..2111478b0463 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -15,6 +15,29 @@ void my_direct_func(unsigned long ip) > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > index 6690468c5cc2..e80981d3dc0a 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -17,6 +17,33 @@ void my_direct_func(struct vm_area_struct *vma, > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > index e8f1e440b9b8..b6cae1b5cb66 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -14,6 +14,29 @@ void my_direct_func(struct task_struct *p) > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > -- > 2.36.1 > -- Best Regards Guo Ren From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4319CC43217 for ; Mon, 28 Nov 2022 12:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+RfuF9PryFOKB7HeIhLTM18/xqpilp9NpKUW6bbmSnc=; b=Af+gx/n1cMpc5Z oZPNZFfUu0a5SOgajynrhtJRpFfk/oZdCJR7Jo5r3TWFOIIfgdI5UINjFOkh6rAG+M2EmIEgtwbZL K4JtC55t1WkeesMeebziH+4QhBacV3f6Am9V6l5l7j+i6h6PzUFsv08Ds8ZVaGrteTY1Z0UeHt9RY rZbPgcc1xT9ptY8oiIREPHJE97ElGm7Kg6yI5uTpg1O47xPYdovoRt+CDrn+HlL1tIJVtSlMxbbY5 4dPy4IMWvwS7nLVJcQmADLKfAbH/V95kcWYc+OKs9veyVAzJBt7d8xuAlX7sGj1A/YcfzyJFJglJa EjWFV7U8GkBSM6hEQkUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ozdfr-001gyZ-G3; Mon, 28 Nov 2022 12:55:51 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ozdfn-001gxD-VG for linux-riscv@lists.infradead.org; Mon, 28 Nov 2022 12:55:50 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7143AB80DB2 for ; Mon, 28 Nov 2022 12:55:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99BDCC4347C for ; Mon, 28 Nov 2022 12:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669640144; bh=N2jz2MyDPCx7Xd+BDRjSFxdG7EbluFXklRmTdFxBHs0=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=VbrZTQqyZN3hWZ9lm0byfYrTfU7CqmNQm6ToED3hvZZAqJGSnE/yz9Jlm3zh4Ovf0 gpQPC4tsSGLhCZS65nE1srd3zcbEfn18P3kTwwdahY/s/PAfXd//BSUTeF347XayyA XHqVj8/Rbwd5theKH8xy02fayTK13XrLeYGaVFD8u+CKD/QJExyOQ9dEmfplmuBLcO WmSfWRDz01+bxVDYe50syLsHtn1VypGyi/CK1Ac1rcQSxcA6wHDzT0Akro6nz4iy1W GhGG/IT/B3DcAJ0iIblEfmEIqOUySZzxNRw49HD0XIdYo6J6EXKZwxvApd0Hf4NjsA Xa4TVhMiWC3Hw== Received: by mail-ed1-f48.google.com with SMTP id d20so4521786edn.0 for ; Mon, 28 Nov 2022 04:55:44 -0800 (PST) X-Gm-Message-State: ANoB5plQUOtvHPXqFBWmeflOSo8WsWxYaaWew1pwHlflPQLcmdYI7gH1 kxT+S6bXB+tNC0oZ+RZHzDIXN+Dv1eUwCbAn/bA= X-Google-Smtp-Source: AA0mqf5e0CzOn/wO9uQnxEYa2/sdWv3isHv0uwALPM3XqwN3Y0CQhmBW0rMwstpJOuzq7gNyA3qDzzXrE5txmneQ6Jo= X-Received: by 2002:aa7:d912:0:b0:46b:2b37:ffa9 with SMTP id a18-20020aa7d912000000b0046b2b37ffa9mr4607745edr.79.1669640142770; Mon, 28 Nov 2022 04:55:42 -0800 (PST) MIME-Version: 1.0 References: <20221128101201.4144527-1-guoren@kernel.org> <20221128101201.4144527-2-guoren@kernel.org> In-Reply-To: <20221128101201.4144527-2-guoren@kernel.org> From: Guo Ren Date: Mon, 28 Nov 2022 20:55:30 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/2] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] To: suagrfillet@gmail.com, guoren@kernel.org Cc: aou@eecs.berkeley.edu, bp@suse.de, jolsa@redhat.com, jpoimboe@kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, mark.rutland@arm.com, mhiramat@kernel.org, palmer@dabbelt.com, paul.walmsley@sifive.com, peterz@infradead.org, rostedt@goodmis.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221128_045548_317269_6BCBEEA2 X-CRM114-Status: GOOD ( 18.01 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Abandoned. On Mon, Nov 28, 2022 at 6:12 PM wrote: > > From: Song Shuai > > 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 > Co-developed-by: Guo Ren > Signed-off-by: Guo Ren > --- > Below is modified by Guo Ren: > > diff --git a/samples/ftrace/ftrace-direct-modify.c > b/samples/ftrace/ftrace-direct-modify.c > index 5582d000d803..d970b46ecc4e 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -29,6 +29,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " .globl my_tramp1\n" > " my_tramp1:\n" > " addi sp,sp,-16\n" > +" move t0,t1\n" > " sd t0,0(sp)\n" > " sd ra,8(sp)\n" > " call my_direct_func1\n" > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c > b/samples/ftrace/ftrace-direct-multi-modify.c > index 43e02d39c652..9534e18fa6ed 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -28,6 +28,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp1:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func1\n" > diff --git a/samples/ftrace/ftrace-direct-multi.c > b/samples/ftrace/ftrace-direct-multi.c > index df91339d3095..2111478b0463 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -23,6 +23,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func\n" > diff --git a/samples/ftrace/ftrace-direct-too.c > b/samples/ftrace/ftrace-direct-too.c > index fe3b8c4f3336..e80981d3dc0a 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -27,6 +27,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " sd a0,0(sp)\n" > " sd a1,8(sp)\n" > " sd a2,16(sp)\n" > +" move t0,t1\n" > " sd t0,24(sp)\n" > " sd ra,32(sp)\n" > " call my_direct_func\n" > diff --git a/samples/ftrace/ftrace-direct.c > b/samples/ftrace/ftrace-direct.c > index 0784024b6653..b6cae1b5cb66 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -22,6 +22,7 @@ asm (" .pushsection .text, \"ax\", > @progbits\n" > " my_tramp:\n" > " addi sp,sp,-24\n" > " sd a0,0(sp)\n" > +" move t0,t1\n" > " sd t0,8(sp)\n" > " sd ra,16(sp)\n" > " call my_direct_func\n" > --- > arch/riscv/Kconfig | 2 ++ > samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++ > samples/ftrace/ftrace-direct-multi-modify.c | 38 +++++++++++++++++++++ > samples/ftrace/ftrace-direct-multi.c | 23 +++++++++++++ > samples/ftrace/ftrace-direct-too.c | 27 +++++++++++++++ > samples/ftrace/ftrace-direct.c | 23 +++++++++++++ > 6 files changed, 147 insertions(+) > > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig > index 2828537abfcd..0a1da03e88c2 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,-fpatchable-function-entry=8) > 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..6a633ff4cf6d 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -22,6 +22,40 @@ extern void my_tramp2(void *); > > static unsigned long my_ip = (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" > +" move t0,t1\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 */ > + > #ifdef CONFIG_X86_64 > > #include > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > index 65aa94d96f4e..9534e18fa6ed 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -20,6 +20,44 @@ void my_direct_func2(unsigned long ip) > extern void my_tramp1(void *); > extern void my_tramp2(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > index 41ded7c615c7..2111478b0463 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -15,6 +15,29 @@ void my_direct_func(unsigned long ip) > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > index 6690468c5cc2..e80981d3dc0a 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -17,6 +17,33 @@ void my_direct_func(struct vm_area_struct *vma, > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > index e8f1e440b9b8..b6cae1b5cb66 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -14,6 +14,29 @@ void my_direct_func(struct task_struct *p) > > extern void my_tramp(void *); > > +#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" > +" move t0,t1\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 > > #include > -- > 2.36.1 > -- Best Regards Guo Ren _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv