powerpc: ftrace optimisation and cleanup and more [v2]
Subsystems (6)
v2 cover powerpc: ftrace optimisation and cleanup and more [v2]
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.
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 | 23 +- 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, 262 insertions(+), 416 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 1/25 powerpc/ftrace: Refactor prepare_ftrace_return()
When we have CONFIG_DYNAMIC_FTRACE_WITH_ARGS, prepare_ftrace_return() is called by ftrace_graph_func() otherwise prepare_ftrace_return() is called from assembly.
Refactor prepare_ftrace_return() into a static __prepare_ftrace_return() that will be called by both prepare_ftrace_return() and ftrace_graph_func().
It will allow GCC to fold __prepare_ftrace_return() inside ftrace_graph_func().
--- arch/powerpc/kernel/trace/ftrace.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +9 -3
@@ -939,8 +939,8 @@ int ftrace_disable_ftrace_graph_caller(void)* Hook the return address and push it in the stack of return addrs * in current thread info. Return the address we want to divert to. */ -unsigned long prepare_ftrace_return (unsigned long parent,unsigned long ip, -unsigned long sp) +static unsigned long +__prepare_ftrace_return (unsigned long parent,unsigned long ip,unsigned long sp) {unsigned long return_hooker;int bit;
@@ -969,7 +969,13 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,void ftrace_graph_func (unsigned long ip,unsigned long parent_ip,struct ftrace_ops *op,struct ftrace_regs *fregs) { - fregs->regs.link =prepare_ftrace_return (parent_ip, ip, fregs->regs.gpr[1 ]); + fregs->regs.link =__prepare_ftrace_return (parent_ip, ip, fregs->regs.gpr[1 ]); +} +#else +unsigned long prepare_ftrace_return (unsigned long parent,unsigned long ip, +unsigned long sp) +{ +return __prepare_ftrace_return (parent, ip, sp); }#endif #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
Signature · 1 line
2.35.1
PATCH v2 2/25 powerpc/ftrace: Remove redundant create_branch() calls
In reply to Christophe LeroySince commit d5937db114e4 ("powerpc/code-patching: Fix patch_branch() return on out-of-range failure") patch_branch() fails with -ERANGE when trying to branch out of range.
No need to perform the test twice. Remove redundant create_branch() calls.
--- arch/powerpc/kernel/trace/ftrace.c | 20 -------------------- 1 file changed, 20 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +0 -20
@@ -301,7 +301,6 @@ static int setup_mcount_compiler_tramp(unsigned long tramp)int i;ppc_inst_t op;unsigned long ptr; -ppc_inst_t instr;static unsigned long ftrace_plt_tramps[NUM_FTRACE_TRAMPS ];/* Is this a known long jump tramp? */
@@ -344,12 +343,6 @@ static int setup_mcount_compiler_tramp(unsigned long tramp)#else ptr =ppc_global_function_entry ((void *)ftrace_caller);#endif -if (create_branch (&instr, (void *)tramp, ptr,0 )) { -pr_debug ("%ps is not reachable from existing mcount tramp\n" , - (void *)ptr); -return -1 ; - } -if (patch_branch ((u32 *)tramp, ptr,0 )) {pr_debug ("REL24 out of range!\n" );return -1 ;
@@ -490,7 +483,6 @@ static int __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) {ppc_inst_t op[2 ]; -ppc_inst_t instr;void *ip = (void *)rec->ip;unsigned long entry, ptr, tramp;struct module *mod = rec->arch.mod;
@@ -539,12 +531,6 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)return -EINVAL ; } -/* Ensure branch is within 24 bits */ -if (create_branch (&instr, ip, tramp,BRANCH_SET_LINK )) { -pr_err ("Branch out of range\n" ); -return -EINVAL ; - } -if (patch_branch (ip, tramp,BRANCH_SET_LINK )) {pr_err ("REL24 out of range!\n" );return -EINVAL ;
@@ -770,12 +756,6 @@ __ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,return -EINVAL ; } -/* Ensure branch is within 24 bits */ -if (create_branch (&op, (u32 *)ip, tramp,BRANCH_SET_LINK )) { -pr_err ("Branch out of range\n" ); -return -EINVAL ; - } -if (patch_branch ((u32 *)ip, tramp,BRANCH_SET_LINK )) {pr_err ("REL24 out of range!\n" );return -EINVAL ;
Signature · 1 line
2.35.1
PATCH v2 3/25 powerpc/code-patching: Inline is_offset_in_{cond}_branch_range()
In reply to Christophe LeroyTest in is_offset_in_branch_range() and is_offset_in_cond_branch_range() are simple tests that are worth inlining.
--- arch/powerpc/include/asm/code-patching.h | 29 ++++++++++++++++++++++-- arch/powerpc/lib/code-patching.c | 27 ---------------------- 2 files changed, 27 insertions(+), 29 deletions(-)
arch/powerpc/include/asm/code-patching.h +27 -2
@@ -22,8 +22,33 @@#define BRANCH_SET_LINK 0x1#define BRANCH_ABSOLUTE 0x2 -bool is_offset_in_branch_range (long offset); -bool is_offset_in_cond_branch_range (long offset); +/* +* Powerpc branch instruction is : +* +* 0 6 30 31 +* +---------+----------------+---+---+ +* | opcode | LI |AA |LK | +* +---------+----------------+---+---+ +* Where AA = 0 and LK = 0 +* +* LI is a signed 24 bits integer. The real branch offset is computed +* by: imm32 = SignExtend(LI:'0b00', 32); +* +* So the maximum forward branch should be: +* (0x007fffff << 2) = 0x01fffffc = 0x1fffffc +* The maximum backward branch should be: +* (0xff800000 << 2) = 0xfe000000 = -0x2000000 +*/ +static inline bool is_offset_in_branch_range (long offset) +{ +return (offset >=-0x2000000 && offset <=0x1fffffc && !(offset &0x3 )); +} + +static inline bool is_offset_in_cond_branch_range (long offset) +{ +return offset >=-0x8000 && offset <=0x7fff && !(offset &0x3 ); +} +int create_branch (ppc_inst_t *instr,const u32 *addr,unsigned long target,int flags); int create_cond_branch(ppc_inst_t *instr, const u32 *addr,
arch/powerpc/lib/code-patching.c +0 -27
@@ -208,33 +208,6 @@ int patch_branch(u32 *addr, unsigned long target, int flags)return patch_instruction (addr, instr); } -bool is_offset_in_branch_range (long offset) -{ -/* -* Powerpc branch instruction is : -* -* 0 6 30 31 -* +---------+----------------+---+---+ -* | opcode | LI |AA |LK | -* +---------+----------------+---+---+ -* Where AA = 0 and LK = 0 -* -* LI is a signed 24 bits integer. The real branch offset is computed -* by: imm32 = SignExtend(LI:'0b00', 32); -* -* So the maximum forward branch should be: -* (0x007fffff << 2) = 0x01fffffc = 0x1fffffc -* The maximum backward branch should be: -* (0xff800000 << 2) = 0xfe000000 = -0x2000000 -*/ -return (offset >=-0x2000000 && offset <=0x1fffffc && !(offset &0x3 )); -} - -bool is_offset_in_cond_branch_range (long offset) -{ -return offset >=-0x8000 && offset <=0x7fff && !(offset &0x3 ); -} -/* * Helper to check if a given instruction is a conditional branch * Derived from the conditional checks in analyse_instr()
Signature · 1 line
2.35.1
PATCH v2 4/25 powerpc/ftrace: Use is_offset_in_branch_range()
In reply to Christophe LeroyUse is_offset_in_branch_range() instead of create_branch() to check if a target is within branch range.
This patch together with the previous one improves ftrace activation time by 7%
--- arch/powerpc/kernel/trace/ftrace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +2 -6
@@ -89,11 +89,9 @@ ftrace_modify_code(unsigned long ip, ppc_inst_t old, ppc_inst_t new)*/ static int test_24bit_addr (unsigned long ip,unsigned long addr) { -ppc_inst_t op; addr =ppc_function_entry ((void *)addr); -/* use the create_branch to verify that this offset can be branched */ -return create_branch (&op, (u32 *)ip, addr,0 ) ==0 ; +return is_offset_in_branch_range (addr - ip); }static int is_bl_op (ppc_inst_t op)
@@ -261,7 +259,6 @@ __ftrace_make_nop(struct module *mod,static unsigned long find_ftrace_tramp (unsigned long ip) {int i; -ppc_inst_t instr;/* * We have the compiler generated long_branch tramps at the end
@@ -270,8 +267,7 @@ static unsigned long find_ftrace_tramp(unsigned long ip)for (i =NUM_FTRACE_TRAMPS -1 ; i >=0 ; i--)if (!ftrace_tramps[i])continue ; -else if (create_branch (&instr, (void *)ip, - ftrace_tramps[i],0 ) ==0 ) +else if (is_offset_in_branch_range (ftrace_tramps[i] - ip))return ftrace_tramps[i];return 0 ;
Signature · 1 line
2.35.1
PATCH v2 5/25 powerpc/code-patching: Inline create_branch()
In reply to Christophe Leroycreate_branch() is a good candidate for inlining because:
- Flags can be folded in.
- Range tests are likely to be already done.
Hence reducing the create_branch() to only a set of instructions.
So inline it.
It improves ftrace activation by 10%.
--- arch/powerpc/include/asm/code-patching.h | 22 ++++++++++++++++++++-- arch/powerpc/lib/code-patching.c | 20 -------------------- 2 files changed, 20 insertions(+), 22 deletions(-)
arch/powerpc/include/asm/code-patching.h +20 -2
@@ -49,8 +49,26 @@ static inline bool is_offset_in_cond_branch_range(long offset)return offset >=-0x8000 && offset <=0x7fff && !(offset &0x3 ); } -int create_branch (ppc_inst_t *instr,const u32 *addr, -unsigned long target,int flags); +static inline int create_branch (ppc_inst_t *instr,const u32 *addr, +unsigned long target,int flags) +{ +long offset; + + *instr =ppc_inst (0 ); + offset = target; +if (! (flags &BRANCH_ABSOLUTE )) + offset = offset - (unsigned long )addr; + +/* Check we can represent the target in the instruction format */ +if (!is_offset_in_branch_range (offset)) +return 1 ; + +/* Mask out the flags and target, so they don't step on each other. */ + *instr =ppc_inst (0x48000000 | (flags &0x3 ) | (offset &0x03FFFFFC )); + +return 0 ; +} +int create_cond_branch (ppc_inst_t *instr,const u32 *addr,unsigned long target,int flags);int patch_branch (u32 *addr,unsigned long target,int flags);
arch/powerpc/lib/code-patching.c +0 -20
@@ -230,26 +230,6 @@ bool is_conditional_branch(ppc_inst_t instr) }NOKPROBE_SYMBOL (is_conditional_branch); -int create_branch (ppc_inst_t *instr,const u32 *addr, -unsigned long target,int flags) -{ -long offset; - - *instr =ppc_inst (0 ); - offset = target; -if (! (flags &BRANCH_ABSOLUTE )) - offset = offset - (unsigned long )addr; - -/* Check we can represent the target in the instruction format */ -if (!is_offset_in_branch_range (offset)) -return 1 ; - -/* Mask out the flags and target, so they don't step on each other. */ - *instr =ppc_inst (0x48000000 | (flags &0x3 ) | (offset &0x03FFFFFC )); - -return 0 ; -} -int create_cond_branch (ppc_inst_t *instr,const u32 *addr,unsigned long target,int flags) {
Signature · 1 line
2.35.1
PATCH v2 6/25 powerpc/ftrace: Inline ftrace_modify_code()
In reply to Christophe LeroyInlining ftrace_modify_code(), it increases a bit the size of ftrace code but brings 5% improvment on ftrace activation.
Usually in C files we let gcc decide what to do but here it really help to 'help' gcc to decide to inline, thought we don't want to force it with an __always_inline that would be too much for CONFIG_CC_OPTIMIZE_FOR_SIZE.
---
v2: More explanation in commit message
--- arch/powerpc/kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/trace/ftrace.c +1 -1
@@ -53,7 +53,7 @@ ftrace_call_replace(unsigned long ip, unsigned long addr, int link)return op; } -static int +static inline int ftrace_modify_code (unsigned long ip,ppc_inst_t old,ppc_inst_t new) {ppc_inst_t replaced;
Signature · 1 line
2.35.1
PATCH v2 7/25 powerpc/ftrace: Use patch_instruction() return directly
In reply to Christophe LeroyInstead of returning -EPERM when patch_instruction() fails, just return what patch_instruction returns.
That simplifies ftrace_modify_code():
0: 94 21 ff c0 stwu r1,-64(r1) 4: 93 e1 00 3c stw r31,60(r1) 8: 7c 7f 1b 79 mr. r31,r3 c: 40 80 00 30 bge 3c <ftrace_modify_code+0x3c> 10: 93 c1 00 38 stw r30,56(r1) 14: 7c 9e 23 78 mr r30,r4 18: 7c a4 2b 78 mr r4,r5 1c: 80 bf 00 00 lwz r5,0(r31) 20: 7c 1e 28 40 cmplw r30,r5 24: 40 82 00 34 bne 58 <ftrace_modify_code+0x58> 28: 83 c1 00 38 lwz r30,56(r1) 2c: 7f e3 fb 78 mr r3,r31 30: 83 e1 00 3c lwz r31,60(r1) 34: 38 21 00 40 addi r1,r1,64 38: 48 00 00 00 b 38 <ftrace_modify_code+0x38> 38: R_PPC_REL24 patch_instruction
Before:
0: 94 21 ff c0 stwu r1,-64(r1) 4: 93 e1 00 3c stw r31,60(r1) 8: 7c 7f 1b 79 mr. r31,r3 c: 40 80 00 4c bge 58 <ftrace_modify_code+0x58> 10: 93 c1 00 38 stw r30,56(r1) 14: 7c 9e 23 78 mr r30,r4 18: 7c a4 2b 78 mr r4,r5 1c: 80 bf 00 00 lwz r5,0(r31) 20: 7c 08 02 a6 mflr r0 24: 90 01 00 44 stw r0,68(r1) 28: 7c 1e 28 40 cmplw r30,r5 2c: 40 82 00 48 bne 74 <ftrace_modify_code+0x74> 30: 7f e3 fb 78 mr r3,r31 34: 48 00 00 01 bl 34 <ftrace_modify_code+0x34> 34: R_PPC_REL24 patch_instruction 38: 80 01 00 44 lwz r0,68(r1) 3c: 20 63 00 00 subfic r3,r3,0 40: 83 c1 00 38 lwz r30,56(r1) 44: 7c 63 19 10 subfe r3,r3,r3 48: 7c 08 03 a6 mtlr r0 4c: 83 e1 00 3c lwz r31,60(r1) 50: 38 21 00 40 addi r1,r1,64 54: 4e 80 00 20 blr
It improves ftrace activation/deactivation duration by about 3%.
Modify patch_instruction() return on failure to -EPERM in order to match with ftrace expectations. Other users of patch_instruction() do not care about the exact error value returned.
---
v2: Make patch_instruction() return -EPERM in case of failure
--- arch/powerpc/kernel/trace/ftrace.c | 5 +---- arch/powerpc/lib/code-patching.c | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +1 -4
@@ -78,10 +78,7 @@ ftrace_modify_code(unsigned long ip, ppc_inst_t old, ppc_inst_t new) }/* replace the text with the new text */ -if (patch_instruction ((u32 *)ip, new)) -return -EPERM ; - -return 0 ; +return patch_instruction ((u32 *)ip, new); }/*
arch/powerpc/lib/code-patching.c +1 -1
@@ -32,7 +32,7 @@ static int __patch_instruction(u32 *exec_addr, ppc_inst_t instr, u32 *patch_addrreturn 0 ; failed: -return -EFAULT ; +return -EPERM ; }int raw_patch_instruction (u32 *addr,ppc_inst_t instr)
Signature · 1 line
2.35.1
PATCH v2 8/25 powerpc: Add CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2
In reply to Christophe LeroyAt the time being, we use CONFIG_CPU_LITTLE_ENDIAN and CONFIG_CPU_BIG_ENDIAN to pass -mabi=elfv1 or elfv2 to compiler, then define a PPC64_ELF_ABI_v1 or PPC64_ELF_ABI_v2 macro in asm/types.h based on _CALL_ELF define set by the compiler.
Make it more straight forward with a CONFIG option that is directly usable.
--- arch/powerpc/Makefile | 10 +++++----- arch/powerpc/boot/Makefile | 2 ++ arch/powerpc/platforms/Kconfig.cputype | 6 ++++++ 3 files changed, 13 insertions(+), 5 deletions(-)
arch/powerpc/Makefile +5 -5
@@ -89,10 +89,10 @@ endif ifdef CONFIG_PPC64 ifndef CONFIG_CC_IS_CLANG -cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) -cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mcall-aixdesc) -aflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) -aflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mabi=elfv2 +cflags-$(CONFIG_PPC64_ELF_ABI_V1) += $(call cc-option,-mabi=elfv1) +cflags-$(CONFIG_PPC64_ELF_ABI_V1) += $(call cc-option,-mcall-aixdesc) +aflags-$(CONFIG_PPC64_ELF_ABI_V1) += $(call cc-option,-mabi=elfv1) +aflags-$(CONFIG_PPC64_ELF_ABI_V2) += -mabi=elfv2 endif endif
@@ -141,7 +141,7 @@ endif CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) ifndef CONFIG_CC_IS_CLANG -ifdef CONFIG_CPU_LITTLE_ENDIAN +ifdef CONFIG_PPC64_ELF_ABI_V2 CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2) else
arch/powerpc/boot/Makefile +2 -0
@@ -49,6 +49,8 @@ ifdef CONFIG_CPU_BIG_ENDIAN BOOTCFLAGS += -mbig-endian else BOOTCFLAGS += -mlittle-endian +endif +ifdef CONFIG_PPC64_ELF_ABI_V2 BOOTCFLAGS += $(call cc-option,-mabi=elfv2) endif
arch/powerpc/platforms/Kconfig.cputype +6 -0
@@ -556,6 +556,12 @@ config CPU_LITTLE_ENDIAN endchoice +config PPC64_ELF_ABI_V1 + def_bool PPC64 && CPU_BIG_ENDIAN + +config PPC64_ELF_ABI_V2 + def_bool PPC64 && CPU_LITTLE_ENDIAN + config PPC64_BOOT_WRAPPER def_bool n depends on CPU_LITTLE_ENDIAN
Signature · 1 line
2.35.1
PATCH v2 9/25 powerpc: Replace PPC64_ELF_ABI_v{1/2} by CONFIG_PPC64_ELF_ABI_V{1/2}
In reply to Christophe LeroyReplace all uses of PPC64_ELF_ABI_v1 and PPC64_ELF_ABI_v2 by resp CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2.
--- arch/powerpc/include/asm/code-patching.h | 12 ++++++------ arch/powerpc/include/asm/ftrace.h | 4 ++-- arch/powerpc/include/asm/linkage.h | 2 +- arch/powerpc/include/asm/ppc_asm.h | 4 ++-- arch/powerpc/include/asm/ptrace.h | 2 +- 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_64.c | 4 ++-- arch/powerpc/kernel/ptrace/ptrace.c | 2 +- arch/powerpc/kernel/trace/ftrace.c | 4 ++-- arch/powerpc/kvm/book3s_interrupts.S | 2 +- arch/powerpc/kvm/book3s_rmhandlers.S | 2 +- arch/powerpc/net/bpf_jit.h | 2 +- arch/powerpc/net/bpf_jit_comp.c | 2 +- arch/powerpc/net/bpf_jit_comp64.c | 4 ++-- 18 files changed, 31 insertions(+), 31 deletions(-)
arch/powerpc/include/asm/code-patching.h +6 -6
@@ -130,7 +130,7 @@ bool is_conditional_branch(ppc_inst_t instr);static inline unsigned long ppc_function_entry (void *func) { -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 u32 *insn = func;/*
@@ -155,7 +155,7 @@ static inline unsigned long ppc_function_entry(void *func)return (unsigned long )(insn +2 ); else return (unsigned long)func; -#elif defined(PPC64_ELF_ABI_v1) +#elif defined(CONFIG_PPC64_ELF_ABI_V1 )/* * On PPC64 ABIv1 the function pointer actually points to the * function's descriptor. The first entry in the descriptor is the
@@ -169,7 +169,7 @@ static inline unsigned long ppc_function_entry(void *func)static inline unsigned long ppc_global_function_entry (void *func) { -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 /* PPC64 ABIv2 the global entry point is at the address */ return (unsigned long )func;#else
@@ -186,7 +186,7 @@ static inline unsigned long ppc_global_function_entry(void *func)static inline unsigned long ppc_kallsyms_lookup_name (const char *name) {unsigned long addr; -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 /* check for dot variant */ char dot_name[1 +KSYM_NAME_LEN ];bool dot_appended = false;
@@ -207,7 +207,7 @@ static inline unsigned long ppc_kallsyms_lookup_name(const char *name)if (!addr && dot_appended)/* Let's try the original non-dot symbol lookup */ addr =kallsyms_lookup_name (name); -#elif defined(PPC64_ELF_ABI_v2) +#elif defined(CONFIG_PPC64_ELF_ABI_V2 ) addr =kallsyms_lookup_name (name);if (addr) addr =ppc_function_entry ((void *)addr);
@@ -224,7 +224,7 @@ static inline unsigned long ppc_kallsyms_lookup_name(const char *name)*/ /* This must match the definition of STK_GOT in <asm/ppc_asm.h> */ -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define R2_STACK_OFFSET 24#else #define R2_STACK_OFFSET 40
arch/powerpc/include/asm/ftrace.h +2 -2
@@ -64,7 +64,7 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,* those. */ #define ARCH_HAS_SYSCALL_MATCH_SYM_NAME -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 static inline bool arch_syscall_match_sym_name (const char *sym,const char *name) {/* We need to skip past the initial dot, and the __se_sys alias */
@@ -83,7 +83,7 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name (!strncmp (sym,"ppc32_" ,6 ) && !strcmp (sym +6 , name +4 )) || (!strncmp (sym,"ppc64_" ,6 ) && !strcmp (sym +6 , name +4 )); } -#endif /* PPC64_ELF_ABI_v1 */ +#endif /* CONFIG_PPC64_ELF_ABI_V1 */ #endif /* CONFIG_FTRACE_SYSCALLS */ #ifdef CONFIG_PPC64
arch/powerpc/include/asm/linkage.h +1 -1
@@ -4,7 +4,7 @@#include <asm/types.h> -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 #define cond_syscall (x) \ asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n" \ "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
arch/powerpc/include/asm/ppc_asm.h +2 -2
@@ -149,7 +149,7 @@#define __STK_REG (i) (112 + ((i)-14)*8)#define STK_REG (i) __STK_REG(__REG_##i) -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define STK_GOT 24#define __STK_PARAM (i) (32 + ((i)-3)*8)#else
@@ -158,7 +158,7 @@#endif #define STK_PARAM (i) __STK_PARAM(__REG_##i) -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define _GLOBAL (name) \ .align 2 ; \
arch/powerpc/include/asm/ptrace.h +1 -1
@@ -120,7 +120,7 @@ struct pt_regs STACK_FRAME_OVERHEAD + KERNEL_REDZONE_SIZE)#define STACK_FRAME_MARKER 12 -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define STACK_FRAME_MIN_SIZE 32#else #define STACK_FRAME_MIN_SIZE STACK_FRAME_OVERHEAD
arch/powerpc/kernel/head_64.S +1 -1
@@ -435,7 +435,7 @@ generic_secondary_common_init: ld r12,CPU_SPEC_RESTORE(r23) cmpdi 0,r12,0 beq 3f -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 ld r12,0(r12) #endif mtctr r12
arch/powerpc/kernel/interrupt_64.S +1 -1
@@ -721,7 +721,7 @@ _GLOBAL(ret_from_kernel_thread) REST_NVGPRS(r1) mtctr r14 mr r3,r15 -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 mr r12,r14 #endif bctrl
arch/powerpc/kernel/kprobes.c +3 -3
@@ -45,7 +45,7 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset) {kprobe_opcode_t *addr =NULL ; -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 /* PPC64 ABIv2 needs local entry point */ addr = (kprobe_opcode_t *)kallsyms_lookup_name (name);if (addr && !offset) {
@@ -63,7 +63,7 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset)#endif addr = (kprobe_opcode_t *)ppc_function_entry (addr); } -#elif defined(PPC64_ELF_ABI_v1) +#elif defined(CONFIG_PPC64_ELF_ABI_V1)/* * 64bit powerpc ABIv1 uses function descriptors: * - Check for the dot variant of the symbol first.
@@ -107,7 +107,7 @@ kprobe_opcode_t *kprobe_lookup_name(const char *name, unsigned int offset)static bool arch_kprobe_on_func_entry (unsigned long offset) { -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #ifdef CONFIG_KPROBES_ON_FTRACE return offset <=16 ;#else
arch/powerpc/kernel/misc_64.S +1 -1
@@ -454,7 +454,7 @@ _GLOBAL(kexec_sequence) beq 1f /* clear out hardware hash page table and tlb */ -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 ld r12,0(r27) /* deref function descriptor */ #else mr r12,r27
arch/powerpc/kernel/module.c +2 -2
@@ -64,13 +64,13 @@ int module_finalize(const Elf_Ehdr *hdr, (void *)sect->sh_addr + sect->sh_size);#endif /* CONFIG_PPC64 */ -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 sect =find_section (hdr, sechdrs,".opd" );if (sect !=NULL ) { me->arch.start_opd = sect->sh_addr; me->arch.end_opd = sect->sh_addr + sect->sh_size; } -#endif /* PPC64_ELF_ABI_v1 */ +#endif /* CONFIG_PPC64_ELF_ABI_V1 */ #ifdef CONFIG_PPC_BARRIER_NOSPEC sect =find_section (hdr, sechdrs,"__spec_barrier_fixup" );
arch/powerpc/kernel/module_64.c +2 -2
@@ -31,7 +31,7 @@this, and makes other things simpler. Anton? --RR. */ -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 static func_desc_t func_desc (unsigned long addr) {
@@ -122,7 +122,7 @@ static u32 ppc64_stub_insns[] = {/* Save current r2 value in magic place on the stack. */ PPC_RAW_STD (_R2, _R1,R2_STACK_OFFSET ),PPC_RAW_LD (_R12, _R11,32 ), -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1/* Set up new r2 from function descriptor */ PPC_RAW_LD(_R2, _R11, 40), #endif
arch/powerpc/kernel/ptrace/ptrace.c +1 -1
@@ -445,7 +445,7 @@ void __init pt_regs_check(void)*/ BUILD_BUG_ON (PT_DSCR <sizeof (struct user_pt_regs ) /sizeof (unsigned long )); -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 BUILD_BUG_ON (!IS_ENABLED (CONFIG_HAVE_FUNCTION_DESCRIPTORS ));#else BUILD_BUG_ON (IS_ENABLED (CONFIG_HAVE_FUNCTION_DESCRIPTORS ));
arch/powerpc/kernel/trace/ftrace.c +2 -2
@@ -953,7 +953,7 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,#endif #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 char *arch_ftrace_match_adjust (char *str,const char *search) {if (str[0 ] =='.' && search[0 ] !='.' )
@@ -961,4 +961,4 @@ char *arch_ftrace_match_adjust(char *str, const char *search) else return str; } -#endif /* PPC64_ELF_ABI_v1 */ +#endif /* CONFIG_PPC64_ELF_ABI_V1 */
arch/powerpc/kvm/book3s_interrupts.S +1 -1
@@ -15,7 +15,7 @@ #include <asm/asm-compat.h> #if defined(CONFIG_PPC_BOOK3S_64) -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define FUNC(name) name #else #define FUNC(name) GLUE(.,name)
arch/powerpc/kvm/book3s_rmhandlers.S +1 -1
@@ -26,7 +26,7 @@ #if defined(CONFIG_PPC_BOOK3S_64) -#ifdef PPC64_ELF_ABI_v2 +#ifdef CONFIG_PPC64_ELF_ABI_V2 #define FUNC(name) name #else #define FUNC(name) GLUE(.,name)
arch/powerpc/net/bpf_jit.h +1 -1
@@ -13,7 +13,7 @@#include <asm/types.h> #include <asm/ppc-opcode.h> -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 #define FUNCTION_DESCR_SIZE 24#else #define FUNCTION_DESCR_SIZE 0
arch/powerpc/net/bpf_jit_comp.c +1 -1
@@ -276,7 +276,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *fp)*/ bpf_jit_dump (flen, proglen, pass, code_base); -#ifdef PPC64_ELF_ABI_v1 +#ifdef CONFIG_PPC64_ELF_ABI_V1 /* Function descriptor nastiness: Address + TOC */ ((u64 *)image)[0 ] = (u64 )code_base; ((u64 *)image)[1 ] = local_paca->kernel_toc;
arch/powerpc/net/bpf_jit_comp64.c +2 -2
@@ -126,7 +126,7 @@ void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx) {int i; -if (__is_defined (PPC64_ELF_ABI_v2)) +if (__is_defined (CONFIG_PPC64_ELF_ABI_V2 ))EMIT (PPC_RAW_LD (_R2, _R13, offsetof(struct paca_struct , kernel_toc)));/*
@@ -266,7 +266,7 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 oint b2p_index =bpf_to_ppc (BPF_REG_3 );int bpf_tailcall_prologue_size =8 ; -if (__is_defined (PPC64_ELF_ABI_v2)) +if (__is_defined (CONFIG_PPC64_ELF_ABI_V2 )) bpf_tailcall_prologue_size +=4 ;/* skip past the toc load */ /*
Signature · 1 line
2.35.1
PATCH v2 10/25 powerpc: Finalise cleanup around ABI use
In reply to Christophe LeroyNow that we have CONFIG_PPC64_ELF_ABI_V1 and CONFIG_PPC64_ELF_ABI_V2, get rid of all indirect detection of ABI version.
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/Makefile | 2 +- arch/powerpc/include/asm/types.h | 8 -------- arch/powerpc/kernel/fadump.c | 13 ++++++++----- arch/powerpc/kernel/ptrace/ptrace.c | 6 ------ arch/powerpc/net/bpf_jit_comp64.c | 4 ++-- 6 files changed, 12 insertions(+), 23 deletions(-)
arch/powerpc/Kconfig +1 -1
@@ -208,7 +208,7 @@ config PPC select HAVE_EFFICIENT_UNALIGNED_ACCESS if !(CPU_LITTLE_ENDIAN && POWER7_CPU) select HAVE_FAST_GUP select HAVE_FTRACE_MCOUNT_RECORD - select HAVE_FUNCTION_DESCRIPTORS if PPC64 && !CPU_LITTLE_ENDIAN + select HAVE_FUNCTION_DESCRIPTORS if PPC64_ELF_ABI_V1 select HAVE_FUNCTION_ERROR_INJECTION select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER
arch/powerpc/Makefile +1 -1
@@ -213,7 +213,7 @@ CHECKFLAGS += -m$(BITS) -D__powerpc__ -D__powerpc$(BITS)__ ifdef CONFIG_CPU_BIG_ENDIAN CHECKFLAGS += -D__BIG_ENDIAN__ else -CHECKFLAGS += -D__LITTLE_ENDIAN__ -D_CALL_ELF=2 +CHECKFLAGS += -D__LITTLE_ENDIAN__ endif ifdef CONFIG_476FPE_ERR46
arch/powerpc/include/asm/types.h +0 -8
@@ -11,14 +11,6 @@#include <uapi/asm/types.h> -#ifdef __powerpc64__ -#if defined(_CALL_ELF) && _CALL_ELF ==2 -#define PPC64_ELF_ABI_v2 1 -#else -#define PPC64_ELF_ABI_v1 1 -#endif -#endif /* __powerpc64__ */ -#ifndef __ASSEMBLY__typedef __vector128 vector128 ;
arch/powerpc/kernel/fadump.c +8 -5
@@ -968,11 +968,14 @@ static int fadump_init_elfcore_header(char *bufp) elf->e_entry =0 ; elf->e_phoff =sizeof (struct elfhdr ); elf->e_shoff =0 ; -#if defined(_CALL_ELF) - elf->e_flags = _CALL_ELF; -#else - elf->e_flags =0 ; -#endif + +if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V2 )) + elf->e_flags =2 ; +else if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V1 )) + elf->e_flags =1 ; +else + elf->e_flags =0 ; + elf->e_ehsize =sizeof (struct elfhdr ); elf->e_phentsize =sizeof (struct elf_phdr ); elf->e_phnum =0 ;
arch/powerpc/kernel/ptrace/ptrace.c +0 -6
@@ -444,10 +444,4 @@ void __init pt_regs_check(void)* real registers. */ BUILD_BUG_ON (PT_DSCR <sizeof (struct user_pt_regs ) /sizeof (unsigned long )); - -#ifdef CONFIG_PPC64_ELF_ABI_V1 -BUILD_BUG_ON (!IS_ENABLED (CONFIG_HAVE_FUNCTION_DESCRIPTORS )); -#else -BUILD_BUG_ON (IS_ENABLED (CONFIG_HAVE_FUNCTION_DESCRIPTORS )); -#endif }
arch/powerpc/net/bpf_jit_comp64.c +2 -2
@@ -126,7 +126,7 @@ void bpf_jit_build_prologue(u32 *image, struct codegen_context *ctx) {int i; -if (__is_defined (CONFIG_PPC64_ELF_ABI_V2 )) +if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V2 ))EMIT (PPC_RAW_LD (_R2, _R13, offsetof(struct paca_struct , kernel_toc)));/*
@@ -266,7 +266,7 @@ static int bpf_jit_emit_tail_call(u32 *image, struct codegen_context *ctx, u32 oint b2p_index =bpf_to_ppc (BPF_REG_3 );int bpf_tailcall_prologue_size =8 ; -if (__is_defined (CONFIG_PPC64_ELF_ABI_V2 )) +if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V2 )) bpf_tailcall_prologue_size +=4 ;/* skip past the toc load */ /*
Signature · 1 line
2.35.1
PATCH v2 11/25 powerpc/ftrace: Make __ftrace_make_{nop/call}() common to PPC32 and PPC64
In reply to Christophe LeroySince c93d4f6ecf4b ("powerpc/ftrace: Add module_trampoline_target() for PPC32"), __ftrace_make_nop() for PPC32 is very similar to the one for PPC64.
Same for __ftrace_make_call().
Make them common.
---
v2:
- Fixed comment to -mprofile-kernel versus -mkernel_profile
- Replaced a couple of #ifdef with CONFIG_PPC64_ELF_ABI_V1 as suggested by Naveen.
--- arch/powerpc/kernel/trace/ftrace.c | 108 +++-------------------------- 1 file changed, 8 insertions(+), 100 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +8 -100
@@ -114,7 +114,6 @@ static unsigned long find_bl_target(unsigned long ip, ppc_inst_t op) }#ifdef CONFIG_MODULES -#ifdef CONFIG_PPC64 static int __ftrace_make_nop (struct module *mod,struct dyn_ftrace *rec,unsigned long addr)
@@ -154,10 +153,11 @@ __ftrace_make_nop(struct module *mod,return -EINVAL ; } -#ifdef CONFIG_MPROFILE_KERNEL -/* When using -mkernel_profile there is no load to jump over */ +/* When using -mprofile-kernel or PPC32 there is no load to jump over */ pop =ppc_inst (PPC_RAW_NOP ()); +#ifdef CONFIG_PPC64 +#ifdef CONFIG_MPROFILE_KERNEL if (copy_inst_from_kernel_nofault(&op, (void *)(ip - 4))) { pr_err("Fetching instruction at %lx failed.\n", ip - 4); return -EFAULT;
@@ -201,6 +201,7 @@ __ftrace_make_nop(struct module *mod,return -EINVAL ; }#endif /* CONFIG_MPROFILE_KERNEL */ +#endif /* PPC64 */ if (patch_instruction ((u32 *)ip, pop)) {pr_err ("Patching NOP failed.\n" );
@@ -209,48 +210,6 @@ __ftrace_make_nop(struct module *mod, return 0; } - -#else /* !PPC64 */ -static int -__ftrace_make_nop (struct module *mod, -struct dyn_ftrace *rec,unsigned long addr) -{ -ppc_inst_t op; -unsigned long ip = rec->ip; -unsigned long tramp, ptr; - -if (copy_from_kernel_nofault (&op, (void *)ip,MCOUNT_INSN_SIZE )) -return -EFAULT ; - -/* Make sure that that this is still a 24bit jump */ -if (!is_bl_op (op)) { -pr_err ("Not expected bl: opcode is %s\n" ,ppc_inst_as_str (op)); -return -EINVAL ; - } - -/* lets find where the pointer goes */ - tramp =find_bl_target (ip, op); - -/* Find where the trampoline jumps to */ -if (module_trampoline_target (mod, tramp, &ptr)) { -pr_err ("Failed to get trampoline target\n" ); -return -EFAULT ; - } - -if (ptr != addr) { -pr_err ("Trampoline location %08lx does not match addr\n" , - tramp); -return -EINVAL ; - } - - op =ppc_inst (PPC_RAW_NOP ()); - -if (patch_instruction ((u32 *)ip, op)) -return -EPERM ; - -return 0 ; -} -#endif /* PPC64 */ #endif /* CONFIG_MODULES */ static unsigned long find_ftrace_tramp (unsigned long ip)
@@ -437,13 +396,12 @@ int ftrace_make_nop(struct module *mod, } #ifdef CONFIG_MODULES -#ifdef CONFIG_PPC64 /* * Examine the existing instructions for __ftrace_make_call. * They should effectively be a NOP, and follow formal constraints, * depending on the ABI. Return false if they don't. */ -#ifndef CONFIG_MPROFILE_KERNEL +#ifdef CONFIG_PPC64_ELF_ABI_V1 static int expected_nop_sequence(void *ip, ppc_inst_t op0, ppc_inst_t op1) {
@@ -465,7 +423,7 @@ expected_nop_sequence(void *ip, ppc_inst_t op0, ppc_inst_t op1)static int expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) { -/* look for patched "NOP" on ppc64 with -mprofile-kernel */ +/* look for patched "NOP" on ppc64 with -mprofile-kernel or ppc32 */ if (!ppc_inst_equal (op0,ppc_inst (PPC_RAW_NOP ())))return 0 ;return 1 ;
@@ -484,8 +442,10 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)if (copy_inst_from_kernel_nofault (op, ip))return -EFAULT ; +#ifdef CONFIG_PPC64_ELF_ABI_V1 if (copy_inst_from_kernel_nofault (op +1 , ip +4 ))return -EFAULT ; +#endif if (!expected_nop_sequence (ip, op[0 ], op[1 ])) { pr_err("Unexpected call sequence at %p: %s %s\n",
@@ -531,58 +491,6 @@ __ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) return 0; } - -#else /* !CONFIG_PPC64: */ -static int -__ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) -{ - int err; - ppc_inst_t op; - u32 *ip = (u32 *)rec->ip; - struct module *mod = rec->arch.mod; - unsigned long tramp; - - /* read where this goes */ - if (copy_inst_from_kernel_nofault(&op, ip)) - return -EFAULT; - - /* It should be pointing to a nop */ - if (!ppc_inst_equal(op, ppc_inst(PPC_RAW_NOP()))) { - pr_err("Expected NOP but have %s\n", ppc_inst_as_str(op)); - return -EINVAL; - } - - /* If we never set up a trampoline to ftrace_caller, then bail */ -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS - if (!mod->arch.tramp || !mod->arch.tramp_regs) { -#else - if (!mod->arch.tramp) { -#endif - pr_err("No ftrace trampoline\n"); - return -EINVAL; - } - -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS - if (rec->flags & FTRACE_FL_REGS) - tramp = mod->arch.tramp_regs; - else -#endif - tramp = mod->arch.tramp; - /* create the branch to the trampoline */ - err = create_branch(&op, ip, tramp, BRANCH_SET_LINK); - if (err) { - pr_err("REL24 out of range!\n"); - return -EINVAL; - } - - pr_devel("write to %lx\n", rec->ip); - - if (patch_instruction(ip, op)) - return -EPERM; - - return 0; -} -#endif /* CONFIG_PPC64 */#endif /* CONFIG_MODULES */ static int __ftrace_make_call_kernel (struct dyn_ftrace *rec,unsigned long addr)
Signature · 1 line
2.35.1
PATCH v2 12/25 powerpc/ftrace: Don't include ftrace.o for CONFIG_FTRACE_SYSCALLS
In reply to Christophe LeroySince commit 7bea7ac0ca01 ("powerpc/syscalls: Fix syscall tracing") ftrace.o is not needed anymore for CONFIG_FTRACE_SYSCALLS.
--- arch/powerpc/kernel/trace/Makefile | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/kernel/trace/Makefile +0 -1
@@ -17,7 +17,6 @@ endif obj-$(CONFIG_FUNCTION_TRACER) += ftrace_low.o obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o -obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o obj-$(CONFIG_TRACING) += trace_clock.o obj-$(CONFIG_PPC64) += $(obj64-y)
Signature · 1 line
2.35.1
PATCH v2 13/25 powerpc/ftrace: Use CONFIG_FUNCTION_TRACER instead of CONFIG_DYNAMIC_FTRACE
In reply to Christophe LeroySince commit 0c0c52306f47 ("powerpc: Only support DYNAMIC_FTRACE not static"), CONFIG_DYNAMIC_FTRACE is always selected when CONFIG_FUNCTION_TRACER is selected.
To avoid confusion and have the reader wonder what's happen when CONFIG_FUNCTION_TRACER is selected and CONFIG_DYNAMIC_FTRACE is not, use CONFIG_FUNCTION_TRACER in ifdefs instead of CONFIG_DYNAMIC_FTRACE.
As CONFIG_FUNCTION_GRAPH_TRACER depends on CONFIG_FUNCTION_TRACER, ftrace.o doesn't need to appear for both symbols in Makefile.
Then as ftrace.o is built only when CONFIG_FUNCTION_TRACER is selected ifdef CONFIG_FUNCTION_TRACER is not needed in ftrace.c, and since it implies CONFIG_DYNAMIC_FTRACE, CONFIG_DYNAMIC_FTRACE is not needed in ftrace.c
---
v2: Limit the change to the content of arch/powerpc/kernel/trace as suggested by Naveen.
--- arch/powerpc/kernel/trace/Makefile | 4 +--- arch/powerpc/kernel/trace/ftrace.c | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-)
arch/powerpc/kernel/trace/Makefile +1 -3
@@ -14,9 +14,7 @@ obj64-$(CONFIG_FUNCTION_TRACER) += ftrace_mprofile.o else obj64-$(CONFIG_FUNCTION_TRACER) += ftrace_64_pg.o endif -obj-$(CONFIG_FUNCTION_TRACER) += ftrace_low.o -obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o -obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FUNCTION_TRACER) += ftrace_low.o ftrace.o obj-$(CONFIG_TRACING) += trace_clock.o obj-$(CONFIG_PPC64) += $(obj64-y)
arch/powerpc/kernel/trace/ftrace.c +0 -4
@@ -28,9 +28,6 @@#include <asm/syscall.h> #include <asm/inst.h> - -#ifdef CONFIG_DYNAMIC_FTRACE -/* * We generally only have a single long_branch tramp and at most 2 or 3 plt * tramps generated. But, we don't use the plt tramps currently. We also allot
@@ -783,7 +780,6 @@ int __init ftrace_dyn_arch_init(void) return 0; }#endif -#endif /* CONFIG_DYNAMIC_FTRACE */ #ifdef CONFIG_FUNCTION_GRAPH_TRACER
Signature · 1 line
2.35.1
PATCH v2 14/25 powerpc/ftrace: Remove ftrace_plt_tramps[]
In reply to Christophe Leroyftrace_plt_tramps table is never filled so it is useless.
Remove it.
--- arch/powerpc/kernel/trace/ftrace.c | 8 -------- 1 file changed, 8 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +0 -8
@@ -250,7 +250,6 @@ static int setup_mcount_compiler_tramp(unsigned long tramp)int i;ppc_inst_t op;unsigned long ptr; -static unsigned long ftrace_plt_tramps[NUM_FTRACE_TRAMPS ];/* Is this a known long jump tramp? */ for (i =0 ; i <NUM_FTRACE_TRAMPS ; i++)
@@ -259,13 +258,6 @@ static int setup_mcount_compiler_tramp(unsigned long tramp)else if (ftrace_tramps[i] == tramp)return 0 ; -/* Is this a known plt tramp? */ -for (i =0 ; i <NUM_FTRACE_TRAMPS ; i++) -if (!ftrace_plt_tramps[i]) -break ; -else if (ftrace_plt_tramps[i] == tramp) -return -1 ; -/* New trampoline -- read where this goes */ if (copy_inst_from_kernel_nofault (&op, (void *)tramp)) {pr_debug ("Fetching opcode failed.\n" );
Signature · 1 line
2.35.1
PATCH v2 15/25 powerpc/ftrace: Use BRANCH_SET_LINK instead of value 1
In reply to Christophe LeroyTo make it explicit, use BRANCH_SET_LINK instead of value 1 when calling create_branch().
--- arch/powerpc/kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/trace/ftrace.c +1 -1
@@ -45,7 +45,7 @@ ftrace_call_replace(unsigned long ip, unsigned long addr, int link) addr =ppc_function_entry ((void *)addr);/* if (link) set op to 'bl' else 'b' */ -create_branch (&op, (u32 *)ip, addr, link ?1 :0 ); +create_branch (&op, (u32 *)ip, addr, link ?BRANCH_SET_LINK :0 );return op; }
Signature · 1 line
2.35.1
PATCH v2 16/25 powerpc/ftrace: Use PPC_RAW_xxx() macros instead of opencoding.
In reply to Christophe LeroyPPC_RAW_xxx() macros are self explanatory and less error prone than open coding.
Use them in ftrace.c
---
v2:
- Replaced PPC_INST_OFFSET24_MASK by PPC_LI_MASK and added PPC_LI().
- Fix ADDI instead of ADDIS
--- arch/powerpc/include/asm/ppc-opcode.h | 5 +++++ arch/powerpc/kernel/trace/ftrace.c | 32 +++++++++------------------ 2 files changed, 16 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +5 -0
@@ -352,6 +352,10 @@#define PPC_HIGHER (v) (((v) >> 32) & 0xffff)#define PPC_HIGHEST (v) (((v) >> 48) & 0xffff) +/* LI Field */ +#define PPC_LI_MASK 0x03fffffc +#define PPC_LI (v) ((v) & PPC_LI_MASK) +/* * Only use the larx hint bit on 64bit CPUs. e500v1/v2 based CPUs will treat a * larx with EH set as an illegal instruction.
@@ -572,6 +576,7 @@#define PPC_RAW_EIEIO () (0x7c0006ac)#define PPC_RAW_BRANCH (addr) (PPC_INST_BRANCH | ((addr) & 0x03fffffc)) +#define PPC_RAW_BL (offset) (0x48000001 | PPC_LI(offset))/* Deal with instructions that older assemblers aren't aware of */ #define PPC_BCCTR_FLUSH stringify_in_c(.long PPC_INST_BCCTR_FLUSH)
arch/powerpc/kernel/trace/ftrace.c +11 -21
@@ -90,19 +90,19 @@ static int test_24bit_addr(unsigned long ip, unsigned long addr)static int is_bl_op (ppc_inst_t op) { -return (ppc_inst_val (op) &0xfc000003 ) ==0x48000001 ; +return (ppc_inst_val (op) & ~PPC_LI_MASK ) ==PPC_RAW_BL (0 ); }static int is_b_op (ppc_inst_t op) { -return (ppc_inst_val (op) &0xfc000003 ) ==0x48000000 ; +return (ppc_inst_val (op) & ~PPC_LI_MASK ) ==PPC_RAW_BRANCH (0 ); }static unsigned long find_bl_target (unsigned long ip,ppc_inst_t op) {int offset; - offset = (ppc_inst_val (op) &0x03fffffc ); + offset =PPC_LI (ppc_inst_val (op));/* make it signed */ if (offset &0x02000000 ) offset |=0xfe000000 ;
@@ -182,7 +182,7 @@ __ftrace_make_nop(struct module *mod,* Use a b +8 to jump over the load. */ - pop =ppc_inst (PPC_INST_BRANCH |8 );/* b +8 */ + pop =ppc_inst (PPC_RAW_BRANCH (8 ));/* b +8 */ /* * Check what is in the next instruction. We can see ld r2,40(r1), but
@@ -394,17 +394,8 @@ int ftrace_make_nop(struct module *mod,static int expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) { -/* -* We expect to see: -* -* b +8 -* ld r2,XX(r1) -* -* The load offset is different depending on the ABI. For simplicity -* just mask it out when doing the compare. -*/ -if (!ppc_inst_equal (op0,ppc_inst (0x48000008 )) || - (ppc_inst_val (op1) &0xffff0000 ) !=0xe8410000 ) +if (!ppc_inst_equal (op0,ppc_inst (PPC_RAW_BRANCH (8 ))) || + !ppc_inst_equal (op1,ppc_inst (PPC_INST_LD_TOC )))return 0 ;return 1 ; }
@@ -412,7 +403,6 @@ expected_nop_sequence(void *ip, ppc_inst_t op0, ppc_inst_t op1)static int expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) { -/* look for patched "NOP" on ppc64 with -mprofile-kernel or ppc32 */ if (!ppc_inst_equal (op0,ppc_inst (PPC_RAW_NOP ())))return 0 ;return 1 ;
@@ -738,11 +728,11 @@ int __init ftrace_dyn_arch_init(void)int i;unsigned int *tramp[] = { ftrace_tramp_text, ftrace_tramp_init };u32 stub_insns[] = { -0xe98d0000 |PACATOC ,/* ld r12,PACATOC(r13) */ -0x3d8c0000 ,/* addis r12,r12,<high> */ -0x398c0000 ,/* addi r12,r12,<low> */ -0x7d8903a6 ,/* mtctr r12 */ -0x4e800420 ,/* bctr */ +PPC_RAW_LD (_R12, _R13,PACATOC ), +PPC_RAW_ADDIS (_R12, _R12,0 ), +PPC_RAW_ADDI (_R12, _R12,0 ), +PPC_RAW_MTCTR (_R12), +PPC_RAW_BCTR () };#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS unsigned long addr =ppc_global_function_entry ((void *)ftrace_regs_caller);
Signature · 1 line
2.35.1
PATCH v2 17/25 powerpc/ftrace: Use size macro instead of opencoding
In reply to Christophe Leroy0x80000000 is SZ_2G. Use it.
--- arch/powerpc/kernel/trace/ftrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/trace/ftrace.c +1 -1
@@ -741,7 +741,7 @@ int __init ftrace_dyn_arch_init(void)#endif long reladdr = addr -kernel_toc_addr (); -if (reladdr >0x7FFFFFFF || reladdr < -(0x80000000L )) { +if (reladdr >=SZ_2G || reladdr < -SZ_2G ) {pr_err ("Address of %ps out of range of kernel_toc.\n" , (void *)addr);return -1 ;
Signature · 1 line
2.35.1
PATCH v2 18/25 powerpc/ftrace: Simplify expected_nop_sequence()
In reply to Christophe LeroyAvoid ifdefs around expected_nop_sequence().
While at it make it a bool.
--- arch/powerpc/kernel/trace/ftrace.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
arch/powerpc/kernel/trace/ftrace.c +6 -16
@@ -390,24 +390,14 @@ int ftrace_make_nop(struct module *mod,* They should effectively be a NOP, and follow formal constraints, * depending on the ABI. Return false if they don't. */ -#ifdef CONFIG_PPC64_ELF_ABI_V1 -static int -expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) -{ -if (!ppc_inst_equal (op0,ppc_inst (PPC_RAW_BRANCH (8 ))) || - !ppc_inst_equal (op1,ppc_inst (PPC_INST_LD_TOC ))) -return 0 ; -return 1 ; -} -#else -static int -expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) +static bool expected_nop_sequence (void *ip,ppc_inst_t op0,ppc_inst_t op1) { -if (!ppc_inst_equal (op0,ppc_inst (PPC_RAW_NOP ()))) -return 0 ; -return 1 ; +if (IS_ENABLED (CONFIG_PPC64_ELF_ABI_V1 )) +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 ())); } -#endif static int __ftrace_make_call (struct dyn_ftrace *rec,unsigned long addr)
Signature · 1 line
2.35.1
PATCH v2 19/25 powerpc/ftrace: Minimise number of #ifdefs
In reply to Christophe LeroyA lot of #ifdefs can be replaced by IS_ENABLED()
Do so.
This requires to have kernel_toc_addr() defined at all time as well as PPC_INST_LD_TOC and PPC_INST_STD_LR.
---
v2: Moved the setup of pop outside of the big if()/else() in __ftrace_make_nop()
--- arch/powerpc/include/asm/code-patching.h | 2 - arch/powerpc/include/asm/module.h | 2 - arch/powerpc/include/asm/sections.h | 24 +-- arch/powerpc/kernel/trace/ftrace.c | 182 +++++++++++------------ 4 files changed, 103 insertions(+), 107 deletions(-)
arch/powerpc/include/asm/code-patching.h +0 -2
@@ -217,7 +217,6 @@ static inline unsigned long ppc_kallsyms_lookup_name(const char *name)return addr; } -#ifdef CONFIG_PPC64 /* * Some instruction encodings commonly used in dynamic ftracing * and function live patching.
@@ -234,6 +233,5 @@ static inline unsigned long ppc_kallsyms_lookup_name(const char *name)/* usually preceded by a mflr r0 */ #define PPC_INST_STD_LR PPC_RAW_STD(_R0, _R1, PPC_LR_STKOFF) -#endif /* CONFIG_PPC64 */ #endif /* _ASM_POWERPC_CODE_PATCHING_H */
arch/powerpc/include/asm/module.h +0 -2
@@ -41,9 +41,7 @@ struct mod_arch_specific {#ifdef CONFIG_DYNAMIC_FTRACE unsigned long tramp; -#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS unsigned long tramp_regs; -#endif #endif /* List of BUG addresses, source line numbers and filenames */
arch/powerpc/include/asm/sections.h +12 -12
@@ -29,18 +29,6 @@ extern char start_virt_trampolines[];extern char end_virt_trampolines[];#endif -/* -* This assumes the kernel is never compiled -mcmodel=small or -* the total .toc is always less than 64k. -*/ -static inline unsigned long kernel_toc_addr (void ) -{ -unsigned long toc_ptr; - - asmvolatile ("mr %0, 2" :"=r" (toc_ptr)); -return toc_ptr; -} -static inline int overlaps_interrupt_vector_text (unsigned long start,unsigned long end) {
@@ -60,5 +48,17 @@ static inline int overlaps_kernel_text(unsigned long start, unsigned long end)#endif +/* +* This assumes the kernel is never compiled -mcmodel=small or +* the total .toc is always less than 64k. +*/ +static inline unsigned long kernel_toc_addr (void ) +{ +unsigned long toc_ptr; + + asmvolatile ("mr %0, 2" :"=r" (toc_ptr)); +return toc_ptr; +} +#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_SECTIONS_H */
arch/powerpc/kernel/trace/ftrace.c +91 -91
320 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v2 20/25 powerpc/inst: Add __copy_inst_from_kernel_nofault()
In reply to Christophe LeroyOn the same model as get_user() versus __get_user(), introduce __copy_inst_from_kernel_nofault() which doesn't check address.
To be used by callers that have already checked that the adress is a kernel address.
--- arch/powerpc/include/asm/inst.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
arch/powerpc/include/asm/inst.h +9 -4
@@ -158,13 +158,10 @@ static inline char *__ppc_inst_as_str(char str[PPC_INST_STR_LEN], ppc_inst_t x) __str; \ }) -static inline int copy_inst_from_kernel_nofault (ppc_inst_t *inst,u32 *src) +static inline int __copy_inst_from_kernel_nofault (ppc_inst_t *inst,u32 *src) {unsigned int val, suffix; -if (unlikely (!is_kernel_addr ((unsigned long )src))) -return -ERANGE ; -/* See https://github.com/ClangBuiltLinux/linux/issues/1521 */ #if defined(CONFIG_CC_IS_CLANG ) &&CONFIG_CLANG_VERSION <140000 val = suffix =0 ;
@@ -181,4 +178,12 @@ static inline int copy_inst_from_kernel_nofault(ppc_inst_t *inst, u32 *src) return -EFAULT; } +static inline int copy_inst_from_kernel_nofault (ppc_inst_t *inst,u32 *src) +{ +if (unlikely (!is_kernel_addr ((unsigned long )src))) +return -ERANGE ; + +return __copy_inst_from_kernel_nofault (inst, src); +} +#endif /* _ASM_POWERPC_INST_H */
Signature · 1 line
2.35.1
PATCH v2 21/25 powerpc/ftrace: Don't use copy_from_kernel_nofault() in module_trampoline_target()
In reply to Christophe Leroymodule_trampoline_target() is quite a hot path used when activating/deactivating function tracer.
Avoid the heavy copy_from_kernel_nofault() by doing four calls to copy_inst_from_kernel_nofault().
Use __copy_inst_from_kernel_nofault() for the 3 last calls. First call is done to copy_from_kernel_nofault() to check address is within kernel space. No risk to wrap out the top of kernel space because the last page is never mapped so if address is in last page the first copy will fails and the other ones will never be performed.
And also make it notrace just like all functions that call it.
--- arch/powerpc/kernel/module_32.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
arch/powerpc/kernel/module_32.c +9 -3
@@ -289,13 +289,19 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, }#ifdef CONFIG_DYNAMIC_FTRACE -int module_trampoline_target (struct module *mod,unsigned long addr, -unsigned long *target) +notrace int module_trampoline_target(struct module *mod, unsigned long addr, +unsigned long *target) {unsigned int jmp[4 ];/* Find where the trampoline jumps to */ -if (copy_from_kernel_nofault (jmp, (void *)addr,sizeof (jmp))) +if (copy_inst_from_kernel_nofault (jmp, (void *)addr)) +return -EFAULT ; +if (__copy_inst_from_kernel_nofault (jmp +1 , (void *)addr +4 )) +return -EFAULT ; +if (__copy_inst_from_kernel_nofault (jmp +2 , (void *)addr +8 )) +return -EFAULT ; +if (__copy_inst_from_kernel_nofault (jmp +3 , (void *)addr +12 ))return -EFAULT ;/* verify that this is what we expect it to be */
Signature · 1 line
2.35.1
kernel test robot
build botRe: [PATCH v2 21/25] powerpc/ftrace: Don't use copy_from_kernel_nofault() in module_trampoline_target()
I love your patch! Perhaps something to improve:
Hi Christophe,
I love your patch! Perhaps something to improve:
[auto build test WARNING on powerpc/next]
[also build test WARNING on powerpc/topic/ppc-kvm v5.18-rc5 next-20220506] [cannot apply to rostedt-trace/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/intel-lab-lkp/linux/commits/Christophe-Leroy/powerpc-ftrace-optimisation-and-cleanup-and-more-v2/20220507-145034 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next config: powerpc-randconfig-s031-20220506 (https://download.01.org/0day-ci/archive/20220507/[email protected]/config) compiler: powerpc-linux-gcc (GCC) 11.3.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# apt-get install sparse
# sparse version: v0.6.4-dirty
# https://github.com/intel-lab-lkp/linux/commit/1c6a385ed330a6ed959cad02f89306fb84e4334c
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Christophe-Leroy/powerpc-ftrace-optimisation-and-cleanup-and-more-v2/20220507-145034
git checkout 1c6a385ed330a6ed959cad02f89306fb84e4334c
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' O=build_dir ARCH=powerpc SHELL=/bin/bash arch/powerpc/kernel/
If you fix the issue, kindly add following tag as appropriate
sparse warnings: (new ones prefixed by >>)
>> arch/powerpc/kernel/module_32.c:298:43: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected struct ppc_inst_t [usertype] *inst @@ got unsigned int * @@
arch/powerpc/kernel/module_32.c:298:43: sparse: expected struct ppc_inst_t [usertype] *inst
arch/powerpc/kernel/module_32.c:298:43: sparse: got unsigned int *
arch/powerpc/kernel/module_32.c:300:49: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected struct ppc_inst_t [usertype] *inst @@ got unsigned int * @@
arch/powerpc/kernel/module_32.c:300:49: sparse: expected struct ppc_inst_t [usertype] *inst
arch/powerpc/kernel/module_32.c:300:49: sparse: got unsigned int *
arch/powerpc/kernel/module_32.c:302:49: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected struct ppc_inst_t [usertype] *inst @@ got unsigned int * @@
arch/powerpc/kernel/module_32.c:302:49: sparse: expected struct ppc_inst_t [usertype] *inst
arch/powerpc/kernel/module_32.c:302:49: sparse: got unsigned int *
arch/powerpc/kernel/module_32.c:304:49: sparse: sparse: incorrect type in argument 1 (different base types) @@ expected struct ppc_inst_t [usertype] *inst @@ got unsigned int * @@
arch/powerpc/kernel/module_32.c:304:49: sparse: expected struct ppc_inst_t [usertype] *inst
arch/powerpc/kernel/module_32.c:304:49: sparse: got unsigned int *
vim +298 arch/powerpc/kernel/module_32.c
290
291 #ifdef CONFIG_DYNAMIC_FTRACE
292 notrace int module_trampoline_target(struct module *mod, unsigned long addr,
293 unsigned long *target)
294 {
295 unsigned int jmp[4];
296
297 /* Find where the trampoline jumps to */
> 298 if (copy_inst_from_kernel_nofault(jmp, (void *)addr)) 299 return -EFAULT; 300 if (__copy_inst_from_kernel_nofault(jmp + 1, (void *)addr + 4)) 301 return -EFAULT; 302 if (__copy_inst_from_kernel_nofault(jmp + 2, (void *)addr + 8)) 303 return -EFAULT; 304 if (__copy_inst_from_kernel_nofault(jmp + 3, (void *)addr + 12)) 305 return -EFAULT; 306 307 /* verify that this is what we expect it to be */ 308 if ((jmp[0] & 0xffff0000) != PPC_RAW_LIS(_R12, 0) || 309 (jmp[1] & 0xffff0000) != PPC_RAW_ADDI(_R12, _R12, 0) || 310 jmp[2] != PPC_RAW_MTCTR(_R12) || 311 jmp[3] != PPC_RAW_BCTR())
312 return -EINVAL;
313
314 addr = (jmp[1] & 0xffff) | ((jmp[0] & 0xffff) << 16);
315 if (addr & 0x8000)
316 addr -= 0x10000;
317
318 *target = addr;
319
320 return 0;
321 }
322
Signature · 2 lines
0-DAY CI Kernel Test Service https://01.org/lkp
PATCH v2 22/25 powerpc/inst: Remove PPC_INST_BRANCH
In reply to Christophe LeroyConvert last users of PPC_INST_BRANCH to PPC_RAW_BRANCH()
And remove PPC_INST_BRANCH.
--- arch/powerpc/include/asm/ppc-opcode.h | 3 +-- arch/powerpc/lib/feature-fixups.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +1 -2
@@ -290,7 +290,6 @@#define PPC_INST_ADDIS 0x3c000000#define PPC_INST_ADD 0x7c000214#define PPC_INST_DIVD 0x7c0003d2 -#define PPC_INST_BRANCH 0x48000000#define PPC_INST_BL 0x48000001#define PPC_INST_BRANCH_COND 0x40800000
@@ -575,7 +574,7 @@#define PPC_RAW_MTSPR (spr, d) (0x7c0003a6 | ___PPC_RS(d) | __PPC_SPR(spr))#define PPC_RAW_EIEIO () (0x7c0006ac) -#define PPC_RAW_BRANCH (addr) (PPC_INST_BRANCH | ((addr) & 0x03fffffc)) +#define PPC_RAW_BRANCH (offset) (0x48000000 | PPC_LI(offset))#define PPC_RAW_BL (offset) (0x48000001 | PPC_LI(offset))/* Deal with instructions that older assemblers aren't aware of */
arch/powerpc/lib/feature-fixups.c +1 -1
@@ -451,7 +451,7 @@ static int __do_rfi_flush_fixups(void *data)if (types &L1D_FLUSH_FALLBACK )/* b .+16 to fallback flush */ - instrs[0 ] =PPC_INST_BRANCH |16 ; + instrs[0 ] =PPC_RAW_BRANCH (16 ); i =0 ;if (types &L1D_FLUSH_ORI ) {
Signature · 1 line
2.35.1
PATCH v2 23/25 powerpc/modules: Use PPC_LI macros instead of opencoding
In reply to Christophe LeroyUse PPC_LI_MASK and PPC_LI() instead of opencoding.
---
v2: Utilisation de PPC_LI() et PPC_LI_MASK
--- arch/powerpc/kernel/module_32.c | 11 ++++------- arch/powerpc/kernel/module_64.c | 3 +-- 2 files changed, 5 insertions(+), 9 deletions(-)
arch/powerpc/kernel/module_32.c +4 -7
@@ -256,9 +256,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, value, (uint32_t)location);pr_debug ("Location before: %08X.\n" , *(uint32_t *)location); - value = (*(uint32_t *)location & ~0x03fffffc ) - | ((value - (uint32_t )location) - &0x03fffffc ); + value = (*(uint32_t *)location & ~PPC_LI_MASK ) | +PPC_LI (value - (uint32_t )location);if (patch_instruction (location,ppc_inst (value)))return -EFAULT ;
@@ -266,10 +265,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,pr_debug ("Location after: %08X.\n" , *(uint32_t *)location);pr_debug ("ie. jump to %08X+%08X = %08X\n" , - *(uint32_t *)location &0x03fffffc , - (uint32_t )location, - (*(uint32_t *)location &0x03fffffc ) - + (uint32_t )location); + *(uint32_t *)PPC_LI ((uint32_t )location), (uint32_t )location, + (*(uint32_t *)PPC_LI ((uint32_t )location)) + (uint32_t )location);break ;case R_PPC_REL32 :
arch/powerpc/kernel/module_64.c +1 -2
@@ -653,8 +653,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs, }/* Only replace bits 2 through 26 */ - value = (*(uint32_t *)location & ~0x03fffffc ) - | (value &0x03fffffc ); + value = (*(uint32_t *)location & ~PPC_LI_MASK ) |PPC_LI (value);if (patch_instruction ((u32 *)location,ppc_inst (value)))return -EFAULT ;
Signature · 1 line
2.35.1
PATCH v2 24/25 powerpc/inst: Remove PPC_INST_BL
In reply to Christophe LeroyConvert last users of PPC_INST_BL to PPC_RAW_BL()
And remove PPC_INST_BL.
--- arch/powerpc/include/asm/ppc-opcode.h | 1 - arch/powerpc/net/bpf_jit.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +0 -1
@@ -290,7 +290,6 @@#define PPC_INST_ADDIS 0x3c000000#define PPC_INST_ADD 0x7c000214#define PPC_INST_DIVD 0x7c0003d2 -#define PPC_INST_BL 0x48000001#define PPC_INST_BRANCH_COND 0x40800000/* Prefixes */
arch/powerpc/net/bpf_jit.h +1 -1
@@ -35,7 +35,7 @@ }while (0 ) /* bl (unconditional 'branch' with link) */ -#define PPC_BL (dest) EMIT(PPC_INST_BL | (((dest) - (unsigned long)(image + ctx->idx)) & 0x03fffffc)) +#define PPC_BL (dest) EMIT(PPC_RAW_BL((dest) - (unsigned long)(image + ctx->idx)))/* "cond" here covers BO:BI fields. */ #define PPC_BCC_SHORT (cond, dest) \
Signature · 1 line
2.35.1
PATCH v2 25/25 powerpc/opcodes: Remove unused PPC_INST_XXX macros
In reply to Christophe LeroyThe following PPC_INST_XXX macros are not used anymore outside ppc-opcode.h:
- PPC_INST_LD
- PPC_INST_STD
- PPC_INST_ADDIS
- PPC_INST_ADD
- PPC_INST_DIVD
Remove them.
--- arch/powerpc/include/asm/ppc-opcode.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/ppc-opcode.h +4 -9
@@ -285,11 +285,6 @@#define PPC_INST_TRECHKPT 0x7c0007dd#define PPC_INST_TRECLAIM 0x7c00075d#define PPC_INST_TSR 0x7c0005dd -#define PPC_INST_LD 0xe8000000 -#define PPC_INST_STD 0xf8000000 -#define PPC_INST_ADDIS 0x3c000000 -#define PPC_INST_ADD 0x7c000214 -#define PPC_INST_DIVD 0x7c0003d2#define PPC_INST_BRANCH_COND 0x40800000/* Prefixes */
@@ -462,10 +457,10 @@ (0x100000c7 | ___PPC_RT(vrt) | ___PPC_RA(vra) | ___PPC_RB(vrb) | __PPC_RC21)#define PPC_RAW_VCMPEQUB_RC (vrt, vra, vrb) \ (0x10000006 | ___PPC_RT(vrt) | ___PPC_RA(vra) | ___PPC_RB(vrb) | __PPC_RC21) -#define PPC_RAW_LD (r, base, i) (PPC_INST_LD | ___PPC_RT(r) | ___PPC_RA(base) | IMM_DS(i)) +#define PPC_RAW_LD (r, base, i) (0xe8000000 | ___PPC_RT(r) | ___PPC_RA(base) | IMM_DS(i))#define PPC_RAW_LWZ (r, base, i) (0x80000000 | ___PPC_RT(r) | ___PPC_RA(base) | IMM_L(i))#define PPC_RAW_LWZX (t, a, b) (0x7c00002e | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b)) -#define PPC_RAW_STD (r, base, i) (PPC_INST_STD | ___PPC_RS(r) | ___PPC_RA(base) | IMM_DS(i)) +#define PPC_RAW_STD (r, base, i) (0xf8000000 | ___PPC_RS(r) | ___PPC_RA(base) | IMM_DS(i))#define PPC_RAW_STDCX (s, a, b) (0x7c0001ad | ___PPC_RS(s) | ___PPC_RA(a) | ___PPC_RB(b))#define PPC_RAW_LFSX (t, a, b) (0x7c00042e | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b))#define PPC_RAW_STFSX (s, a, b) (0x7c00052e | ___PPC_RS(s) | ___PPC_RA(a) | ___PPC_RB(b))
@@ -476,8 +471,8 @@#define PPC_RAW_ADDE (t, a, b) (0x7c000114 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b))#define PPC_RAW_ADDZE (t, a) (0x7c000194 | ___PPC_RT(t) | ___PPC_RA(a))#define PPC_RAW_ADDME (t, a) (0x7c0001d4 | ___PPC_RT(t) | ___PPC_RA(a)) -#define PPC_RAW_ADD (t, a, b) (PPC_INST_ADD | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b)) -#define PPC_RAW_ADD_DOT (t, a, b) (PPC_INST_ADD | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | 0x1) +#define PPC_RAW_ADD (t, a, b) (0x7c000214 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b)) +#define PPC_RAW_ADD_DOT (t, a, b) (0x7c000214 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | 0x1)#define PPC_RAW_ADDC (t, a, b) (0x7c000014 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b))#define PPC_RAW_ADDC_DOT (t, a, b) (0x7c000014 | ___PPC_RT(t) | ___PPC_RA(a) | ___PPC_RB(b) | 0x1)#define PPC_RAW_NOP () PPC_RAW_ORI(0, 0, 0)
Signature · 1 line
2.35.1