Commit e4f5d544 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

ftrace/x86: Have x86 ftrace use the ftrace_modify_all_code() 



To remove duplicate code, have the ftrace arch_ftrace_update_code()
use the generic ftrace_modify_all_code(). This requires that the
default ftrace_replace_code() becomes a weak function so that an
arch may override it.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 8ed3e2cf

arch/x86/kernel/ftrace.c

+2 −13
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void run_sync(void) 
		local_irq_disable();

}



static void ftrace_replace_code(int enable)

void ftrace_replace_code(int enable)

{

	struct ftrace_rec_iter *iter;

	struct dyn_ftrace *rec;
@@ -493,18 +493,7 @@ void arch_ftrace_update_code(int command) 
{

	modifying_ftrace_code++;



	if (command & FTRACE_UPDATE_CALLS)

		ftrace_replace_code(1);

	else if (command & FTRACE_DISABLE_CALLS)

		ftrace_replace_code(0);



	if (command & FTRACE_UPDATE_TRACE_FUNC)

		ftrace_update_ftrace_func(ftrace_trace_function);



	if (command & FTRACE_START_FUNC_RET)

		ftrace_enable_ftrace_graph_caller();

	else if (command & FTRACE_STOP_FUNC_RET)

		ftrace_disable_ftrace_graph_caller();

	ftrace_modify_all_code(command);



	modifying_ftrace_code--;

}

include/linux/ftrace.h

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable); 
/* defined in arch */

extern int ftrace_ip_converted(unsigned long ip);

extern int ftrace_dyn_arch_init(void *data);

extern void ftrace_replace_code(int enable);

extern int ftrace_update_ftrace_func(ftrace_func_t func);

extern void ftrace_caller(void);

extern void ftrace_call(void);

kernel/trace/ftrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1683,7 +1683,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable) 
	return -1; /* unknow ftrace bug */

}



static void ftrace_replace_code(int update)

void __weak ftrace_replace_code(int enable)

{

	struct dyn_ftrace *rec;

	struct ftrace_page *pg;
@@ -1693,7 +1693,7 @@ static void ftrace_replace_code(int update) 
		return;



	do_for_each_ftrace_rec(pg, rec) {

		failed = __ftrace_replace_code(rec, update);

		failed = __ftrace_replace_code(rec, enable);

		if (failed) {

			ftrace_bug(failed, rec->ip);

			/* Stop processing */