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

Commit 06aeaaea authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt
Browse files

ftrace: Move ARCH_SUPPORTS_FTRACE_SAVE_REGS in Kconfig 

Move SAVE_REGS support flag into Kconfig and rename
it to CONFIG_DYNAMIC_FTRACE_WITH_REGS. This also introduces
CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS which indicates
the architecture depending part of ftrace has a code
that saves full registers.
On the other hand, CONFIG_DYNAMIC_FTRACE_WITH_REGS indicates
the code is enabled.

Link: http://lkml.kernel.org/r/20120928081516.3560.72534.stgit@ltc138.sdl.hitachi.co.jp



Cc: Ingo Molnar <mingo@elte.hu>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 8741db53

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ config X86 
	select HAVE_FENTRY if X86_64

	select HAVE_C_RECORDMCOUNT

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_GRAPH_FP_TEST

arch/x86/include/asm/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 


#ifdef CONFIG_DYNAMIC_FTRACE

#define ARCH_SUPPORTS_FTRACE_OPS 1

#define ARCH_SUPPORTS_FTRACE_SAVE_REGS

#endif



#ifndef __ASSEMBLY__

include/linux/ftrace.h

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip, 
 * SAVE_REGS - The ftrace_ops wants regs saved at each function called

 *            and passed to the callback. If this flag is set, but the

 *            architecture does not support passing regs

 *            (ARCH_SUPPORTS_FTRACE_SAVE_REGS is not defined), then the

 *            (CONFIG_DYNAMIC_FTRACE_WITH_REGS is not defined), then the

 *            ftrace_ops will fail to register, unless the next flag

 *            is set.

 * SAVE_REGS_IF_SUPPORTED - This is the same as SAVE_REGS, but if the
@@ -418,7 +418,7 @@ void ftrace_modify_all_code(int command); 
#endif



#ifndef FTRACE_REGS_ADDR

#ifdef ARCH_SUPPORTS_FTRACE_SAVE_REGS

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS

# define FTRACE_REGS_ADDR ((unsigned long)ftrace_regs_caller)

#else

# define FTRACE_REGS_ADDR FTRACE_ADDR
@@ -480,7 +480,7 @@ extern int ftrace_make_nop(struct module *mod, 
 */

extern int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr);



#ifdef ARCH_SUPPORTS_FTRACE_SAVE_REGS

#ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS

/**

 * ftrace_modify_call - convert from one addr to another (no nop)

 * @rec: the mcount call site record

kernel/trace/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ config HAVE_DYNAMIC_FTRACE 
	help

	  See Documentation/trace/ftrace-design.txt



config HAVE_DYNAMIC_FTRACE_WITH_REGS

	bool



config HAVE_FTRACE_MCOUNT_RECORD

	bool

	help
@@ -434,6 +437,11 @@ config DYNAMIC_FTRACE 
	  were made. If so, it runs stop_machine (stops all CPUS)

	  and modifies the code to jump over the call to ftrace.



config DYNAMIC_FTRACE_WITH_REGS

	def_bool y

	depends on DYNAMIC_FTRACE

	depends on HAVE_DYNAMIC_FTRACE_WITH_REGS



config FUNCTION_PROFILER

	bool "Kernel function profiler"

	depends on FUNCTION_TRACER

kernel/trace/ftrace.c

+3 −3
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int __register_ftrace_function(struct ftrace_ops *ops) 
	if ((ops->flags & FL_GLOBAL_CONTROL_MASK) == FL_GLOBAL_CONTROL_MASK)

		return -EINVAL;



#ifndef ARCH_SUPPORTS_FTRACE_SAVE_REGS

#ifndef CONFIG_DYNAMIC_FTRACE_WITH_REGS

	/*

	 * If the ftrace_ops specifies SAVE_REGS, then it only can be used

	 * if the arch supports it, or SAVE_REGS_IF_SUPPORTED is also set.
@@ -4143,8 +4143,8 @@ __ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip, 
 * Archs are to support both the regs and ftrace_ops at the same time.

 * If they support ftrace_ops, it is assumed they support regs.

 * If call backs want to use regs, they must either check for regs

 * being NULL, or ARCH_SUPPORTS_FTRACE_SAVE_REGS.

 * Note, ARCH_SUPPORT_SAVE_REGS expects a full regs to be saved.

 * being NULL, or CONFIG_DYNAMIC_FTRACE_WITH_REGS.

 * Note, CONFIG_DYNAMIC_FTRACE_WITH_REGS expects a full regs to be saved.

 * An architecture can pass partial regs with ftrace_ops and still

 * set the ARCH_SUPPORT_FTARCE_OPS.

 */