Message ID | 20230107133549.4192639-8-guoren@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1307701wrt; Sat, 7 Jan 2023 05:51:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXt06uWhCBuPUlzB6ywPN9HJX/mm7Qid594RX1bUkkYJZ7qyH+Y9tPXXZwIYHGVf9thT5ydN X-Received: by 2002:aa7:cb4b:0:b0:491:3a5c:6e5 with SMTP id w11-20020aa7cb4b000000b004913a5c06e5mr12693061edt.1.1673099514318; Sat, 07 Jan 2023 05:51:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673099514; cv=none; d=google.com; s=arc-20160816; b=viBSJWjXh9V1gwNCaQjMSLgSMqyo7fD19upGGq1xOR/mCX8zO2yqpLlysBAYxt5uu+ 6Eh8zxdWM6Y95mlmzfbdVMxPHrpf48ZD/OIL1rLwG+bFLyrt5DCrCTYQQxyKNOddbLGO FLBRUL8M2uY2y+RfLXvUfIzwrtZ4lENggse1ABJrvpVs+gGLKcWNaG2Dnp5n+WzwzzfL D6OqHmBDJIPya61vnuvwXcn3zJQEmhd0mpX3oYKo+G2YjKRZ6MNaoJTMbowOMOx6kPj6 +G1XD1qRMfsoleK+SyVpBI1S4pAa0bTbv3ElnpUDOG9NC61Jhz7QCQZzzfuXaqnnmHyI LwFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jqSXOWZMUpN1+jdbI62ROEKaByJg3uiTOHq8yEnIy6I=; b=vn6TrUKpqGbZjzX/Rb8IT7wUE46wEmp/EH/lIUk/6jXIjqgEFoCaoX1xbEVxTyiVg1 hiLG9g1i0HNqRimcasEd89ilHYOtBrrFRgCkypt4Yutr8RU0eoJqAcJU7aKqytOb1cDA 05NG8csDhhM23xDh4gO2utG89Bi2RzEDboXEhPG94CC2bOUmbLmxULpKEethDiVsSSef veIH9P2O7OM2hK4VFjKd49cCOSgsb7uAgjhU179fq6n9NhVlYudDXnTaPxloQBEEST6d 60iCytVlUjXW5UISba400nQhK5QoDgodG9kp5vn3XkPhVoOvBol8WmNqYsDIgevc5yeQ 0V8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=j63l3BAr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j18-20020aa7c0d2000000b0046751bddcf0si3804081edp.425.2023.01.07.05.51.28; Sat, 07 Jan 2023 05:51:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=j63l3BAr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232842AbjAGNhL (ORCPT <rfc822;dolce.eric@gmail.com> + 99 others); Sat, 7 Jan 2023 08:37:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232355AbjAGNgq (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sat, 7 Jan 2023 08:36:46 -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 3D54C60864 for <linux-kernel@vger.kernel.org>; Sat, 7 Jan 2023 05:36:45 -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 EB072B81889 for <linux-kernel@vger.kernel.org>; Sat, 7 Jan 2023 13:36:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AB3F0C433D2; Sat, 7 Jan 2023 13:36:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673098602; bh=jDX3E2PQhQPvX0J2ilfProXVJEOysimTyjHtfoXAKrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j63l3BArGK5g8ChqTf14LMXRdmF5671x8Vb7EGQQnEr8mB0/2GByglAZzZ5d17ysj Bss41ySv9vRpEEQj8QdUNtaengom+/7Xi0ZT1uoygoynSlBFsKA4B1lA19waoiK150 ivEuFxLFDabT069OdQ+GivaaVwVpQD/ODWpuuG5hKBIfdLUF2wyBqNf/raHl+LILUa 7toDmakEWtVcAC5e96ImFnWYo0DaTkjGlUM4u/jm8n8XZLCJzVPT5ul5U2rTELShq7 ge4nFc28xr/vpsgwVBPWk9Me9nElj3bVR9CU2NmrTRvekICghtHJ+GlsIr2Vs6g+T0 ksXew7JwGPjuQ== From: guoren@kernel.org To: anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, conor.dooley@microchip.com, heiko@sntech.de, rostedt@goodmis.org, mhiramat@kernel.org, jolsa@redhat.com, bp@suse.de, jpoimboe@kernel.org, suagrfillet@gmail.com, andy.chiu@sifive.com, e.shatokhin@yadro.com, guoren@kernel.org Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH -next V6 7/7] samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] Date: Sat, 7 Jan 2023 08:35:49 -0500 Message-Id: <20230107133549.4192639-8-guoren@kernel.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20230107133549.4192639-1-guoren@kernel.org> References: <20230107133549.4192639-1-guoren@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754371995881834320?= X-GMAIL-MSGID: =?utf-8?q?1754371995881834320?= |
Series |
riscv: Optimize function trace
|
|
Commit Message
Guo Ren
Jan. 7, 2023, 1:35 p.m. UTC
From: Song Shuai <suagrfillet@gmail.com> 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 <suagrfillet@gmail.com> Tested-by: Guo Ren <guoren@kernel.org> Signed-off-by: Guo Ren <guoren@kernel.org> --- samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ 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 ++++++++++++ 5 files changed, 140 insertions(+)
Comments
On 07.01.2023 16:35, guoren@kernel.org wrote: > From: Song Shuai <suagrfillet@gmail.com> > > 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/. This patch does not actually change arch/riscv/Kconfig. Some part is missing, perhaps? > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > Tested-by: Guo Ren <guoren@kernel.org> > Signed-off-by: Guo Ren <guoren@kernel.org> > --- > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > 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 ++++++++++++ > 5 files changed, 140 insertions(+) > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > index de5a0f67f320..be7bf472c3c7 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -23,6 +23,39 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > index d52370cad0b6..10884bf418f7 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -21,6 +21,43 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > index ec1088922517..a35bf43bf6d7 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -16,6 +16,28 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > index e13fb59a2b47..3b62e33c2e6d 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -18,6 +18,32 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > index 1f769d0db20f..2cfe5a7d2d70 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -15,6 +15,28 @@ 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" > +" 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 <asm/ibt.h> > -- > 2.36.1 > > Regards, Evgenii
On 07.01.2023 16:35, guoren@kernel.org wrote: > From: Song Shuai <suagrfillet@gmail.com> > > 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/. The samples fail to build for RV64GC system, because asm/nospec-branch.h is not available for RISC-V. As of 6.2-rc3, it seems, the header is only present on x86 and s390. May be, place it under #ifdef, so that it is only used where available? nospec functionality is not yet implemented for RISC-V and is way out of scope of this patch series. > > Signed-off-by: Song Shuai <suagrfillet@gmail.com> > Tested-by: Guo Ren <guoren@kernel.org> > Signed-off-by: Guo Ren <guoren@kernel.org> > --- > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > 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 ++++++++++++ > 5 files changed, 140 insertions(+) > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > index de5a0f67f320..be7bf472c3c7 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -23,6 +23,39 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > index d52370cad0b6..10884bf418f7 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -21,6 +21,43 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > index ec1088922517..a35bf43bf6d7 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -16,6 +16,28 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > index e13fb59a2b47..3b62e33c2e6d 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -18,6 +18,32 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > index 1f769d0db20f..2cfe5a7d2d70 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -15,6 +15,28 @@ 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" > +" 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 <asm/ibt.h> > -- > 2.36.1 > > Regards, Evgenii
<guoren@kernel.org> 于2023年1月7日周六 13:36写道: > > From: Song Shuai <suagrfillet@gmail.com> > > 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 <suagrfillet@gmail.com> > Tested-by: Guo Ren <guoren@kernel.org> > Signed-off-by: Guo Ren <guoren@kernel.org> > --- Hi,Guo && Evgenii: As Evgenii comments, this patch has two problems to fix: 1. the modification of Kconfig is missing So we should add it back 2. the build error resulted by including of nospec-branch.h file This including is exclusive for x86 architecture, moving it under x86 #ifdef seems better to fix this error I fixed them in my GitHub repo, but I can't find a reasonable target branch in your repo to PR. So I paste the link of my branch here, you can pick the first 2 commits in the next series. - samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] - samples: ftrace: Include the nospec-branch.h only for x86 Link: https://github.com/sugarfillet/linux/commits/song_ftrace_fix_up_v6 > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > 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 ++++++++++++ > 5 files changed, 140 insertions(+) > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > index de5a0f67f320..be7bf472c3c7 100644 > --- a/samples/ftrace/ftrace-direct-modify.c > +++ b/samples/ftrace/ftrace-direct-modify.c > @@ -23,6 +23,39 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > index d52370cad0b6..10884bf418f7 100644 > --- a/samples/ftrace/ftrace-direct-multi-modify.c > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > @@ -21,6 +21,43 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > index ec1088922517..a35bf43bf6d7 100644 > --- a/samples/ftrace/ftrace-direct-multi.c > +++ b/samples/ftrace/ftrace-direct-multi.c > @@ -16,6 +16,28 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > index e13fb59a2b47..3b62e33c2e6d 100644 > --- a/samples/ftrace/ftrace-direct-too.c > +++ b/samples/ftrace/ftrace-direct-too.c > @@ -18,6 +18,32 @@ 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" > +" 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 <asm/ibt.h> > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > index 1f769d0db20f..2cfe5a7d2d70 100644 > --- a/samples/ftrace/ftrace-direct.c > +++ b/samples/ftrace/ftrace-direct.c > @@ -15,6 +15,28 @@ 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" > +" 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 <asm/ibt.h> > -- > 2.36.1 >
On Wed, Jan 11, 2023 at 5:51 PM Song Shuai <suagrfillet@gmail.com> wrote: > > <guoren@kernel.org> 于2023年1月7日周六 13:36写道: > > > > From: Song Shuai <suagrfillet@gmail.com> > > > > 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 <suagrfillet@gmail.com> > > Tested-by: Guo Ren <guoren@kernel.org> > > Signed-off-by: Guo Ren <guoren@kernel.org> > > --- > Hi,Guo && Evgenii: > > As Evgenii comments, this patch has two problems to fix: > > 1. the modification of Kconfig is missing > So we should add it back > > 2. the build error resulted by including of nospec-branch.h file > This including is exclusive for x86 architecture, moving it under > x86 #ifdef seems better to fix this error > > I fixed them in my GitHub repo, but I can't find a reasonable target > branch in your repo to PR. > So I paste the link of my branch here, you can pick the first 2 > commits in the next series. > > - samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] > - samples: ftrace: Include the nospec-branch.h only for x86 Great, thx. > > Link: https://github.com/sugarfillet/linux/commits/song_ftrace_fix_up_v6 > > > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > > 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 ++++++++++++ > > 5 files changed, 140 insertions(+) > > > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > > index de5a0f67f320..be7bf472c3c7 100644 > > --- a/samples/ftrace/ftrace-direct-modify.c > > +++ b/samples/ftrace/ftrace-direct-modify.c > > @@ -23,6 +23,39 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > > index d52370cad0b6..10884bf418f7 100644 > > --- a/samples/ftrace/ftrace-direct-multi-modify.c > > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > > @@ -21,6 +21,43 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > > index ec1088922517..a35bf43bf6d7 100644 > > --- a/samples/ftrace/ftrace-direct-multi.c > > +++ b/samples/ftrace/ftrace-direct-multi.c > > @@ -16,6 +16,28 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > > index e13fb59a2b47..3b62e33c2e6d 100644 > > --- a/samples/ftrace/ftrace-direct-too.c > > +++ b/samples/ftrace/ftrace-direct-too.c > > @@ -18,6 +18,32 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > > index 1f769d0db20f..2cfe5a7d2d70 100644 > > --- a/samples/ftrace/ftrace-direct.c > > +++ b/samples/ftrace/ftrace-direct.c > > @@ -15,6 +15,28 @@ 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" > > +" 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 <asm/ibt.h> > > -- > > 2.36.1 > > > > > -- > Thanks, > Song
Hi,Guo: Song Shuai <suagrfillet@gmail.com> 于2023年1月11日周三 09:50写道: > > <guoren@kernel.org> 于2023年1月7日周六 13:36写道: > > > > From: Song Shuai <suagrfillet@gmail.com> > > > > 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 <suagrfillet@gmail.com> > > Tested-by: Guo Ren <guoren@kernel.org> > > Signed-off-by: Guo Ren <guoren@kernel.org> > > --- > Hi,Guo && Evgenii: > > As Evgenii comments, this patch has two problems to fix: > > 1. the modification of Kconfig is missing > So we should add it back > > 2. the build error resulted by including of nospec-branch.h file > This including is exclusive for x86 architecture, moving it under > x86 #ifdef seems better to fix this error > > I fixed them in my GitHub repo, but I can't find a reasonable target > branch in your repo to PR. > So I paste the link of my branch here, you can pick the first 2 > commits in the next series. > > - samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] > - samples: ftrace: Include the nospec-branch.h only for x86 This patch for the 2nd problem mentioned above seems to be omitted in the V7 series. I paste the raw patch link here. Hope you can add it in the next. https://github.com/sugarfillet/linux/commit/9539a80dc6e7d1137ec7a96ebef2ab912a694bd7.patch > > Link: https://github.com/sugarfillet/linux/commits/song_ftrace_fix_up_v6 > > > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > > 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 ++++++++++++ > > 5 files changed, 140 insertions(+) > > > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > > index de5a0f67f320..be7bf472c3c7 100644 > > --- a/samples/ftrace/ftrace-direct-modify.c > > +++ b/samples/ftrace/ftrace-direct-modify.c > > @@ -23,6 +23,39 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > > index d52370cad0b6..10884bf418f7 100644 > > --- a/samples/ftrace/ftrace-direct-multi-modify.c > > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > > @@ -21,6 +21,43 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > > index ec1088922517..a35bf43bf6d7 100644 > > --- a/samples/ftrace/ftrace-direct-multi.c > > +++ b/samples/ftrace/ftrace-direct-multi.c > > @@ -16,6 +16,28 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > > index e13fb59a2b47..3b62e33c2e6d 100644 > > --- a/samples/ftrace/ftrace-direct-too.c > > +++ b/samples/ftrace/ftrace-direct-too.c > > @@ -18,6 +18,32 @@ 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" > > +" 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 <asm/ibt.h> > > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > > index 1f769d0db20f..2cfe5a7d2d70 100644 > > --- a/samples/ftrace/ftrace-direct.c > > +++ b/samples/ftrace/ftrace-direct.c > > @@ -15,6 +15,28 @@ 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" > > +" 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 <asm/ibt.h> > > -- > > 2.36.1 > > > > > -- > Thanks, > Song
On Fri, Jan 13, 2023 at 6:48 PM Song Shuai <suagrfillet@gmail.com> wrote: > > Hi,Guo: > > Song Shuai <suagrfillet@gmail.com> 于2023年1月11日周三 09:50写道: > > > > <guoren@kernel.org> 于2023年1月7日周六 13:36写道: > > > > > > From: Song Shuai <suagrfillet@gmail.com> > > > > > > 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 <suagrfillet@gmail.com> > > > Tested-by: Guo Ren <guoren@kernel.org> > > > Signed-off-by: Guo Ren <guoren@kernel.org> > > > --- > > Hi,Guo && Evgenii: > > > > As Evgenii comments, this patch has two problems to fix: > > > > 1. the modification of Kconfig is missing > > So we should add it back > > > > 2. the build error resulted by including of nospec-branch.h file > > This including is exclusive for x86 architecture, moving it under > > x86 #ifdef seems better to fix this error > > > > I fixed them in my GitHub repo, but I can't find a reasonable target > > branch in your repo to PR. > > So I paste the link of my branch here, you can pick the first 2 > > commits in the next series. > > > > - samples: ftrace: Add riscv support for SAMPLE_FTRACE_DIRECT[_MULTI] > > - samples: ftrace: Include the nospec-branch.h only for x86 > This patch for the 2nd problem mentioned above seems to be omitted in > the V7 series. > I paste the raw patch link here. Hope you can add it in the next. > > https://github.com/sugarfillet/linux/commit/9539a80dc6e7d1137ec7a96ebef2ab912a694bd7.patch Why do we need an x86 patchset in a riscv series? Without the patch, what's compile error in riscv? > > > > Link: https://github.com/sugarfillet/linux/commits/song_ftrace_fix_up_v6 > > > > > samples/ftrace/ftrace-direct-modify.c | 33 ++++++++++++++++++ > > > 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 ++++++++++++ > > > 5 files changed, 140 insertions(+) > > > > > > diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c > > > index de5a0f67f320..be7bf472c3c7 100644 > > > --- a/samples/ftrace/ftrace-direct-modify.c > > > +++ b/samples/ftrace/ftrace-direct-modify.c > > > @@ -23,6 +23,39 @@ 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" > > > +" 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 <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c > > > index d52370cad0b6..10884bf418f7 100644 > > > --- a/samples/ftrace/ftrace-direct-multi-modify.c > > > +++ b/samples/ftrace/ftrace-direct-multi-modify.c > > > @@ -21,6 +21,43 @@ 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" > > > +" 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 <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c > > > index ec1088922517..a35bf43bf6d7 100644 > > > --- a/samples/ftrace/ftrace-direct-multi.c > > > +++ b/samples/ftrace/ftrace-direct-multi.c > > > @@ -16,6 +16,28 @@ 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" > > > +" 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 <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c > > > index e13fb59a2b47..3b62e33c2e6d 100644 > > > --- a/samples/ftrace/ftrace-direct-too.c > > > +++ b/samples/ftrace/ftrace-direct-too.c > > > @@ -18,6 +18,32 @@ 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" > > > +" 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 <asm/ibt.h> > > > diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c > > > index 1f769d0db20f..2cfe5a7d2d70 100644 > > > --- a/samples/ftrace/ftrace-direct.c > > > +++ b/samples/ftrace/ftrace-direct.c > > > @@ -15,6 +15,28 @@ 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" > > > +" 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 <asm/ibt.h> > > > -- > > > 2.36.1 > > > > > > > > > -- > > Thanks, > > Song > > > > -- > Thanks, > Song
diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c index de5a0f67f320..be7bf472c3c7 100644 --- a/samples/ftrace/ftrace-direct-modify.c +++ b/samples/ftrace/ftrace-direct-modify.c @@ -23,6 +23,39 @@ 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" +" 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 <asm/ibt.h> diff --git a/samples/ftrace/ftrace-direct-multi-modify.c b/samples/ftrace/ftrace-direct-multi-modify.c index d52370cad0b6..10884bf418f7 100644 --- a/samples/ftrace/ftrace-direct-multi-modify.c +++ b/samples/ftrace/ftrace-direct-multi-modify.c @@ -21,6 +21,43 @@ 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" +" 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 <asm/ibt.h> diff --git a/samples/ftrace/ftrace-direct-multi.c b/samples/ftrace/ftrace-direct-multi.c index ec1088922517..a35bf43bf6d7 100644 --- a/samples/ftrace/ftrace-direct-multi.c +++ b/samples/ftrace/ftrace-direct-multi.c @@ -16,6 +16,28 @@ 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" +" 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 <asm/ibt.h> diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c index e13fb59a2b47..3b62e33c2e6d 100644 --- a/samples/ftrace/ftrace-direct-too.c +++ b/samples/ftrace/ftrace-direct-too.c @@ -18,6 +18,32 @@ 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" +" 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 <asm/ibt.h> diff --git a/samples/ftrace/ftrace-direct.c b/samples/ftrace/ftrace-direct.c index 1f769d0db20f..2cfe5a7d2d70 100644 --- a/samples/ftrace/ftrace-direct.c +++ b/samples/ftrace/ftrace-direct.c @@ -15,6 +15,28 @@ 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" +" 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 <asm/ibt.h>