Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb52607a authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

tracing/function-return-tracer: change the name into function-graph-tracer 



Impact: cleanup

This patch changes the name of the "return function tracer" into
function-graph-tracer which is a more suitable name for a tracing
which makes one able to retrieve the ordered call stack during
the code flow.

Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 509dceef

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ config X86 
	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_RET_TRACER if X86_32

	select HAVE_FUNCTION_GRAPH_TRACER if X86_32

	select HAVE_FUNCTION_TRACE_MCOUNT_TEST

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB if !X86_VOYAGER

arch/x86/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct dyn_arch_ftrace { 
#endif /* __ASSEMBLY__ */

#endif /* CONFIG_FUNCTION_TRACER */



#ifdef CONFIG_FUNCTION_RET_TRACER

#ifdef CONFIG_FUNCTION_GRAPH_TRACER



#ifndef __ASSEMBLY__
@@ -51,6 +51,6 @@ struct ftrace_ret_stack { 
extern void return_to_handler(void);



#endif /* __ASSEMBLY__ */

#endif /* CONFIG_FUNCTION_RET_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */



#endif /* _ASM_X86_FTRACE_H */

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ CFLAGS_REMOVE_paravirt-spinlocks.o = -pg 
CFLAGS_REMOVE_ftrace.o = -pg

endif



ifdef CONFIG_FUNCTION_RET_TRACER

ifdef CONFIG_FUNCTION_GRAPH_TRACER

# Don't trace __switch_to() but let it for function tracer

CFLAGS_REMOVE_process_32.o = -pg

endif
@@ -70,7 +70,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o 
obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o

obj-$(CONFIG_X86_REBOOTFIXUPS)	+= reboot_fixups_32.o

obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o

obj-$(CONFIG_FUNCTION_RET_TRACER)	+= ftrace.o

obj-$(CONFIG_FUNCTION_GRAPH_TRACER)	+= ftrace.o

obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

arch/x86/kernel/entry_32.S

+6 −6
Original line number Diff line number Diff line
@@ -1188,9 +1188,9 @@ ENTRY(mcount) 


	cmpl $ftrace_stub, ftrace_trace_function

	jnz trace

#ifdef CONFIG_FUNCTION_RET_TRACER

	cmpl $ftrace_stub, ftrace_function_return

	jnz ftrace_return_caller

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	cmpl $ftrace_stub, ftrace_graph_function

	jnz ftrace_graph_caller

#endif

.globl ftrace_stub

ftrace_stub:
@@ -1215,8 +1215,8 @@ END(mcount) 
#endif /* CONFIG_DYNAMIC_FTRACE */

#endif /* CONFIG_FUNCTION_TRACER */



#ifdef CONFIG_FUNCTION_RET_TRACER

ENTRY(ftrace_return_caller)

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

ENTRY(ftrace_graph_caller)

	cmpl $0, function_trace_stop

	jne ftrace_stub
@@ -1230,7 +1230,7 @@ ENTRY(ftrace_return_caller) 
	popl %ecx

	popl %eax

	ret

END(ftrace_return_caller)

END(ftrace_graph_caller)



.globl return_to_handler

return_to_handler:

arch/x86/kernel/ftrace.c

+6 −6
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ int __init ftrace_dyn_arch_init(void *data) 
}

#endif



#ifdef CONFIG_FUNCTION_RET_TRACER

#ifdef CONFIG_FUNCTION_GRAPH_TRACER



#ifndef CONFIG_DYNAMIC_FTRACE
@@ -389,11 +389,11 @@ static void pop_return_trace(unsigned long *ret, unsigned long long *time, 
 */

unsigned long ftrace_return_to_handler(void)

{

	struct ftrace_retfunc trace;

	struct ftrace_graph_ret trace;

	pop_return_trace(&trace.ret, &trace.calltime, &trace.func,

			&trace.overrun);

	trace.rettime = cpu_clock(raw_smp_processor_id());

	ftrace_function_return(&trace);

	ftrace_graph_function(&trace);



	return trace.ret;

}
@@ -440,12 +440,12 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
	);



	if (WARN_ON(faulted)) {

		unregister_ftrace_return();

		unregister_ftrace_graph();

		return;

	}



	if (WARN_ON(!__kernel_text_address(old))) {

		unregister_ftrace_return();

		unregister_ftrace_graph();

		*parent = old;

		return;

	}
@@ -456,4 +456,4 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr) 
		*parent = old;

}



#endif /* CONFIG_FUNCTION_RET_TRACER */
 
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */