Skip to content

powerpc: ftrace optimisation and cleanup and more [v3]

Christophe Leroy linuxppc-dev lkml llvm 3 versions – Applied

Status from this message: Applied to powerpc/next.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest25 patches 10 repliesApplied
  2. v225 patches 0 repliesSuperseded
  3. v122 patches 16 repliesSuperseded

Changes in v3 from the cover letter

- The only change in v3 is in patch 21, to fix sparse problems reported by the Robot.

Patches in v3 Applied

#Subject and filesSizeRepliesApplied
1/25powerpc/ftrace: Refactor prepare_ftrace_return()arch/powerpc/kernel/trace/ftrace.c+9 -30 replies
2/25powerpc/ftrace: Remove redundant create_branch() callsarch/powerpc/kernel/trace/ftrace.c+0 -200 replies
3/25powerpc/code-patching: Inline is_offset_in_{cond}_branch_range()arch/powerpc/include/asm/code-patching.h arch/powerpc/lib/code-patching.c+27 -290 replies
4/25powerpc/ftrace: Use is_offset_in_branch_range()arch/powerpc/kernel/trace/ftrace.c+2 -60 replies
5/25powerpc/code-patching: Inline create_branch()arch/powerpc/include/asm/code-patching.h arch/powerpc/lib/code-patching.c+20 -220 replies
6/25powerpc/ftrace: Inline ftrace_modify_code()arch/powerpc/kernel/trace/ftrace.c+1 -10 replies
7/25powerpc/ftrace: Use patch_instruction() return directlyarch/powerpc/kernel/trace/ftrace.c arch/powerpc/lib/code-patching.c+2 -50 replies
8/25powerpc: Add CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2arch/powerpc/Makefile arch/powerpc/boot/Makefile arch/powerpc/platforms/Kconfig.cputype+13 -50 replies
9/25powerpc: Replace PPC64_ELF_ABI_v{1/2} by CONFIG_PPC64_ELF_ABI_V{1/2}arch/powerpc/include/asm/code-patching.h arch/powerpc/include/asm/ftrace.h arch/powerpc/include/asm/linkage.h +15 more+31 -310 replies
10/25powerpc: Finalise cleanup around ABI usearch/powerpc/Kconfig arch/powerpc/Makefile arch/powerpc/include/asm/types.h +3 more+12 -230 replies
11/25powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and PPC64arch/powerpc/kernel/trace/ftrace.c+8 -1002 replies
12/25powerpc/ftrace: Don't include ftrace.o for CONFIG_FTRACE_SYSCALLSarch/powerpc/kernel/trace/Makefile+0 -10 replies
13/25powerpc/ftrace: Use CONFIG_FUNCTION_TRACER instead of CONFIG_DYNAMIC_FTRACEarch/powerpc/kernel/trace/Makefile arch/powerpc/kernel/trace/ftrace.c+1 -70 replies
14/25powerpc/ftrace: Remove ftrace_plt_tramps[]arch/powerpc/kernel/trace/ftrace.c+0 -80 replies
15/25powerpc/ftrace: Use BRANCH_SET_LINK instead of value 1arch/powerpc/kernel/trace/ftrace.c+1 -10 replies
16/25powerpc/ftrace: Use PPC_RAW_xxx() macros instead of opencoding.arch/powerpc/include/asm/ppc-opcode.h arch/powerpc/kernel/trace/ftrace.c+16 -210 replies
17/25powerpc/ftrace: Use size macro instead of opencodingarch/powerpc/kernel/trace/ftrace.c+1 -10 replies
18/25powerpc/ftrace: Simplify expected_nop_sequence()arch/powerpc/kernel/trace/ftrace.c+6 -160 replies
19/25powerpc/ftrace: Minimise number of #ifdefsarch/powerpc/include/asm/code-patching.h arch/powerpc/include/asm/module.h arch/powerpc/include/asm/sections.h +1 more+103 -1077 replies
20/25powerpc/inst: Add __copy_inst_from_kernel_nofault()arch/powerpc/include/asm/inst.h+9 -40 replies
21/25powerpc/ftrace: Don't use copy_from_kernel_nofault() in module_trampoline_target()arch/powerpc/kernel/module_32.c+18 -90 replies
22/25powerpc/inst: Remove PPC_INST_BRANCHarch/powerpc/include/asm/ppc-opcode.h arch/powerpc/lib/feature-fixups.c+2 -30 replies
23/25powerpc/modules: Use PPC_LI macros instead of opencodingarch/powerpc/kernel/module_32.c arch/powerpc/kernel/module_64.c+5 -90 replies
24/25powerpc/inst: Remove PPC_INST_BLarch/powerpc/include/asm/ppc-opcode.h arch/powerpc/net/bpf_jit.h+1 -20 replies
25/25powerpc/opcodes: Remove unused PPC_INST_XXX macrosarch/powerpc/include/asm/ppc-opcode.h+4 -90 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 00/25] powerpc: ftrace optimisation and cleanup and more [v3]

This series provides optimisation and cleanup of ftrace on powerpc.

With this series ftrace activation is about 20% faster on an 8xx.

At the end of the series come additional cleanups around ppc-opcode, that would likely conflict with this series if posted separately.

Change since v2:
- The only change in v3 is in patch 21, to fix sparse problems reported by the Robot.

Main changes since v1 (details in after each individual patch description):
- Added 3 patches (8, 9, 10) that convert PPC64_ELF_ABI_v{1/2} macros by CONFIG_PPC64_ELF_ABI_V{1/2}
- Taken comments from Naveen

Christophe Leroy (25):
powerpc/ftrace: Refactor prepare_ftrace_return() powerpc/ftrace: Remove redundant create_branch() calls powerpc/code-patching: Inline is_offset_in_{cond}_branch_range() powerpc/ftrace: Use is_offset_in_branch_range() powerpc/code-patching: Inline create_branch() powerpc/ftrace: Inline ftrace_modify_code() powerpc/ftrace: Use patch_instruction() return directly
powerpc: Add CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2
powerpc: Replace PPC64_ELF_ABI_v{1/2} by CONFIG_PPC64_ELF_ABI_V{1/2}
powerpc: Finalise cleanup around ABI use
powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and

    PPC64

powerpc/ftrace: Don't include ftrace.o for CONFIG_FTRACE_SYSCALLS powerpc/ftrace: Use CONFIG_FUNCTION_TRACER instead of
CONFIG_DYNAMIC_FTRACE
powerpc/ftrace: Remove ftrace_plt_tramps[] powerpc/ftrace: Use BRANCH_SET_LINK instead of value 1 powerpc/ftrace: Use PPC_RAW_xxx() macros instead of opencoding. powerpc/ftrace: Use size macro instead of opencoding powerpc/ftrace: Simplify expected_nop_sequence() powerpc/ftrace: Minimise number of #ifdefs powerpc/inst: Add __copy_inst_from_kernel_nofault() powerpc/ftrace: Don't use copy_from_kernel_nofault() in
module_trampoline_target()
powerpc/inst: Remove PPC_INST_BRANCH
powerpc/modules: Use PPC_LI macros instead of opencoding powerpc/inst: Remove PPC_INST_BL
powerpc/opcodes: Remove unused PPC_INST_XXX macros

 arch/powerpc/Kconfig                     |   2 +-
 arch/powerpc/Makefile                    |  12 +-
 arch/powerpc/boot/Makefile               |   2 +
 arch/powerpc/include/asm/code-patching.h |  65 +++-
 arch/powerpc/include/asm/ftrace.h        |   4 +-
 arch/powerpc/include/asm/inst.h          |  13 +-
 arch/powerpc/include/asm/linkage.h       |   2 +-
 arch/powerpc/include/asm/module.h        |   2 -
 arch/powerpc/include/asm/ppc-opcode.h    |  22 +-
 arch/powerpc/include/asm/ppc_asm.h       |   4 +-
 arch/powerpc/include/asm/ptrace.h        |   2 +-
 arch/powerpc/include/asm/sections.h      |  24 +-
 arch/powerpc/include/asm/types.h         |   8 -
 arch/powerpc/kernel/fadump.c             |  13 +-
 arch/powerpc/kernel/head_64.S            |   2 +-
 arch/powerpc/kernel/interrupt_64.S       |   2 +-
 arch/powerpc/kernel/kprobes.c            |   6 +-
 arch/powerpc/kernel/misc_64.S            |   2 +-
 arch/powerpc/kernel/module.c             |   4 +-
 arch/powerpc/kernel/module_32.c          |  38 ++-
 arch/powerpc/kernel/module_64.c          |   7 +-
 arch/powerpc/kernel/ptrace/ptrace.c      |   6 -
 arch/powerpc/kernel/trace/Makefile       |   5 +-
 arch/powerpc/kernel/trace/ftrace.c       | 375 +++++++----------------
 arch/powerpc/kvm/book3s_interrupts.S     |   2 +-
 arch/powerpc/kvm/book3s_rmhandlers.S     |   2 +-
 arch/powerpc/lib/code-patching.c         |  49 +--
 arch/powerpc/lib/feature-fixups.c        |   2 +-
 arch/powerpc/net/bpf_jit.h               |   4 +-
 arch/powerpc/net/bpf_jit_comp.c          |   2 +-
 arch/powerpc/net/bpf_jit_comp64.c        |   4 +-
 arch/powerpc/platforms/Kconfig.cputype   |   6 +
 32 files changed, 271 insertions(+), 422 deletions(-)
Signature · 1 line
2.35.1