[PATCH v2] riscv/ftrace: select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY

[Guo Ren]

On Tue, Nov 29, 2022 at 8:05 PM Song Shuai <suagrfillet at gmail.com> wrote:
>
> Song Shuai <suagrfillet at gmail.com> 于2022年11月28日周一 15:45写道：
> >
> > From: Song Shuai <suagrfillet at gmail.com>
> >
> > In RISC-V, -fpatchable-function-entry option is used to support
> > dynamic ftrace in this commit afc76b8b8011 ("riscv: Using
> > PATCHABLE_FUNCTION_ENTRY instead of MCOUNT"). So recordmcount
> > don't have to be called to create the __mcount_loc section before
> > the vmlinux linking.
> >
> > Here selects FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY to tell
> > Makefile not to run recordmcount.
> >
> > Link: https://lore.kernel.org/linux-riscv/CAAYs2=j3Eak9vU6xbAw0zPuoh00rh8v5C2U3fePkokZFibWs2g@mail.gmail.com/T/#t
> > Signed-off-by: Song Shuai <suagrfillet at gmail.com>
> > Tested-by: Guo Ren <guoren at kernel.org>
> This patch has conflicts with the commit ("riscv: ftrace: Add
> DYNAMIC_FTRACE_WITH_DIRECT_CALLS
> support") and its next commit in this file.
>
> How about reposting this patch based on the above commits and folding
> it into the v5 version?
Okay, it's the proper reason to merge them. Thx!

>
> Here pastes the link for your convenience.
> https://lore.kernel.org/linux-riscv/20221129033230.255947-7-guoren@kernel.org/T/#u
>
> > ---
> >  arch/riscv/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> > index fa78595a6089..afc520a45ded 100644
> > --- a/arch/riscv/Kconfig
> > +++ b/arch/riscv/Kconfig
> > @@ -277,6 +277,7 @@ 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_FTRACE_MCOUNT_RECORD if !XIP_KERNEL
> > +       select FTRACE_MCOUNT_USE_PATCHABLE_FUNCTION_ENTRY if DYNAMIC_FTRACE
> >         select HAVE_FUNCTION_GRAPH_TRACER
> >         select HAVE_FUNCTION_TRACER if !XIP_KERNEL
> >         select SWIOTLB if MMU
> > --
> > 2.34.1
> >
>
>
> --
> Thanks,
> Song



-- 
Best Regards
 Guo Ren