system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-06 03:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/ftrace: Enable HAVE_FUNCTION_GRAPH_RET_ADDR_PTR

Browse source 
This associates entries in the ftrace_ret_stack with corresponding stack
frames, enabling more robust stack unwinding. Also update the only user
of ftrace_graph_ret_addr() to pass the stack pointer.

Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/0224f2d0971b069c678e2ff678cfc2cd1e114cfe.1567707399.git.naveen.n.rao@linux.vnet.ibm.com
This commit is contained in:
Naveen N. Rao 2019-09-05 23:50:29 +05:30 committed by Michael Ellerman
parent a3db31ff6c
commit 370011a270
7 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/include/asm/asm-prototypes.h
View file

@ -134,7 +134,8 @@ extern int __ucmpdi2(u64, u64);
/* tracing */ /* tracing */
void _mcount(void); void _mcount(void);
unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip); unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip,
unsigned long sp);
void pnv_power9_force_smt4_catch(void); void pnv_power9_force_smt4_catch(void);
void pnv_power9_force_smt4_release(void); void pnv_power9_force_smt4_release(void);

2
arch/powerpc/include/asm/ftrace.h
View file

@ -8,6 +8,8 @@
#define MCOUNT_ADDR ((unsigned long)(_mcount)) #define MCOUNT_ADDR ((unsigned long)(_mcount))
#define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */
#define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
/* Based off of objdump optput from glibc */ /* Based off of objdump optput from glibc */

2
arch/powerpc/kernel/stacktrace.c
View file

@ -182,7 +182,7 @@ static int __save_stack_trace_tsk_reliable(struct task_struct *tsk,
* FIXME: IMHO these tests do not belong in * FIXME: IMHO these tests do not belong in
* arch-dependent code, they are generic. * arch-dependent code, they are generic.
*/ */
ip = ftrace_graph_ret_addr(tsk, &graph_idx, ip, NULL); ip = ftrace_graph_ret_addr(tsk, &graph_idx, ip, stack);
#ifdef CONFIG_KPROBES #ifdef CONFIG_KPROBES
/* /*
* Mark stacktraces with kretprobed functions on them * Mark stacktraces with kretprobed functions on them

5
arch/powerpc/kernel/trace/ftrace.c
View file

@ -944,7 +944,8 @@ int ftrace_disable_ftrace_graph_caller(void)
* Hook the return address and push it in the stack of return addrs * 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. * 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 prepare_ftrace_return(unsigned long parent, unsigned long ip,
unsigned long sp)
{ {
unsigned long return_hooker; unsigned long return_hooker;
@ -956,7 +957,7 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip)
return_hooker = ppc_function_entry(return_to_handler); return_hooker = ppc_function_entry(return_to_handler);
if (!function_graph_enter(parent, ip, 0, NULL)) if (!function_graph_enter(parent, ip, 0, (unsigned long *)sp))
parent = return_hooker; parent = return_hooker;
out: out:
return parent; return parent;

1
arch/powerpc/kernel/trace/ftrace_32.S
View file

@ -50,6 +50,7 @@ _GLOBAL(ftrace_stub)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
_GLOBAL(ftrace_graph_caller) _GLOBAL(ftrace_graph_caller)
addi r5, r1, 48
/* load r4 with local address */ /* load r4 with local address */
lwz r4, 44(r1) lwz r4, 44(r1)
subi r4, r4, MCOUNT_INSN_SIZE subi r4, r4, MCOUNT_INSN_SIZE

1
arch/powerpc/kernel/trace/ftrace_64_mprofile.S
View file

@ -294,6 +294,7 @@ _GLOBAL(ftrace_graph_caller)
std r2, 24(r1) std r2, 24(r1)
ld r2, PACATOC(r13) /* get kernel TOC in r2 */ ld r2, PACATOC(r13) /* get kernel TOC in r2 */
addi r5, r1, 112
mfctr r4 /* ftrace_caller has moved local addr here */ mfctr r4 /* ftrace_caller has moved local addr here */
std r4, 40(r1) std r4, 40(r1)
mflr r3 /* ftrace_caller has restored LR from stack */ mflr r3 /* ftrace_caller has restored LR from stack */

1
arch/powerpc/kernel/trace/ftrace_64_pg.S
View file

@ -41,6 +41,7 @@ _GLOBAL(ftrace_stub)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
_GLOBAL(ftrace_graph_caller) _GLOBAL(ftrace_graph_caller)
addi r5, r1, 112
/* load r4 with local address */ /* load r4 with local address */
ld r4, 128(r1) ld r4, 128(r1)
subi r4, r4, MCOUNT_INSN_SIZE subi r4, r4, MCOUNT_INSN_SIZE