diff mbox series

powerpc64/ftrace: Fix ftrace for clang builds

Message ID 20220809095907.418764-1-naveen.n.rao@linux.vnet.ibm.com (mailing list archive)
State Accepted
Headers show
Series powerpc64/ftrace: Fix ftrace for clang builds | expand

Checks

Context Check Description
snowpatch_ozlabs/github-powerpc_ppctests success Successfully ran 10 jobs.
snowpatch_ozlabs/github-powerpc_selftests success Successfully ran 10 jobs.
snowpatch_ozlabs/github-powerpc_sparse success Successfully ran 4 jobs.
snowpatch_ozlabs/github-powerpc_clang success Successfully ran 6 jobs.
snowpatch_ozlabs/github-powerpc_kernel_qemu success Successfully ran 23 jobs.

Commit Message

Naveen N. Rao Aug. 9, 2022, 9:59 a.m. UTC 
Clang doesn't support -mprofile-kernel ABI, so guard the checks against
CONFIG_DYNAMIC_FTRACE_WITH_REGS, rather than the elf ABI version.

Fixes: 23b44fc248f420 ("powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and PPC64")
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Reported-by: Ondrej Mosnacek <omosnacek@gmail.com>
Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
---
 arch/powerpc/kernel/trace/ftrace.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


base-commit: ff1ed171e05c971652a0ede3d716997de8ee41c9

Comments

Ondrej Mosnáček Aug. 9, 2022, 4:59 p.m. UTC | #1 
On Tue, Aug 9, 2022 at 11:59 AM Naveen N. Rao
<naveen.n.rao@linux.vnet.ibm.com> wrote:
> Clang doesn't support -mprofile-kernel ABI, so guard the checks against
> CONFIG_DYNAMIC_FTRACE_WITH_REGS, rather than the elf ABI version.
>
> Fixes: 23b44fc248f420 ("powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and PPC64")
> Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> Reported-by: Ondrej Mosnacek <omosnacek@gmail.com>
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> ---
>  arch/powerpc/kernel/trace/ftrace.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

With this patch my reproducer [1] is passing, thanks!

Tested-by: Ondrej Mosnacek <omosnacek@gmail.com>

[1] https://github.com/ClangBuiltLinux/linux/issues/1682#issue-1330483247
Nick Desaulniers Aug. 9, 2022, 5:10 p.m. UTC | #2 
On Tue, Aug 9, 2022 at 9:59 AM Ondrej Mosnáček <omosnacek@gmail.com> wrote:
>
> On Tue, Aug 9, 2022 at 11:59 AM Naveen N. Rao
> <naveen.n.rao@linux.vnet.ibm.com> wrote:
> > Clang doesn't support -mprofile-kernel ABI, so guard the checks against
> > CONFIG_DYNAMIC_FTRACE_WITH_REGS, rather than the elf ABI version.
> >
> > Fixes: 23b44fc248f420 ("powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and PPC64")
> > Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> > Reported-by: Ondrej Mosnacek <omosnacek@gmail.com>
> > Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> > ---
> >  arch/powerpc/kernel/trace/ftrace.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
>
> With this patch my reproducer [1] is passing, thanks!
>
> Tested-by: Ondrej Mosnacek <omosnacek@gmail.com>
>
> [1] https://github.com/ClangBuiltLinux/linux/issues/1682#issue-1330483247

Thanks for the report and fixup. I filed
https://github.com/llvm/llvm-project/issues/57031
as a feature request for -mprofile-kernel in clang.  If there are
other missing features for this target, let's get bugs filed for them.

Acked-by: Nick Desaulniers <ndesaulniers@google.com>
Link: https://github.com/llvm/llvm-project/issues/57031
Link: https://github.com/ClangBuiltLinux/linux/issues/1682

MPE: can you please ensure the above two links get added if/when applying?
Michael Ellerman Aug. 13, 2022, 10:38 p.m. UTC | #3 
On Tue, 9 Aug 2022 15:29:07 +0530, Naveen N. Rao wrote:
> Clang doesn't support -mprofile-kernel ABI, so guard the checks against
> CONFIG_DYNAMIC_FTRACE_WITH_REGS, rather than the elf ABI version.
> 
> 

Applied to powerpc/fixes.

[1/1] powerpc64/ftrace: Fix ftrace for clang builds
      https://git.kernel.org/powerpc/c/cb928ac192128c842f4c1cfc8b6780b95719d65f

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
index cb158c32b50b99..7b85c3b460a3c0 100644
--- a/arch/powerpc/kernel/trace/ftrace.c
+++ b/arch/powerpc/kernel/trace/ftrace.c
@@ -393,11 +393,11 @@  int ftrace_make_nop(struct module *mod,
  */
 static bool expected_nop_sequence(void *ip, ppc_inst_t op0, ppc_inst_t op1)
 {
-	if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V1))
+	if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS))
+		return ppc_inst_equal(op0, ppc_inst(PPC_RAW_NOP()));
+	else
 		return ppc_inst_equal(op0, ppc_inst(PPC_RAW_BRANCH(8))) &&
 		       ppc_inst_equal(op1, ppc_inst(PPC_INST_LD_TOC));
-	else
-		return ppc_inst_equal(op0, ppc_inst(PPC_RAW_NOP()));
 }
 
 static int
@@ -412,7 +412,7 @@  __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
 	if (copy_inst_from_kernel_nofault(op, ip))
 		return -EFAULT;
 
-	if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V1) &&
+	if (!IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS) &&
 	    copy_inst_from_kernel_nofault(op + 1, ip + 4))
 		return -EFAULT;