Commit 688f7089 authored by Steven Rostedt (VMware)'s avatar Steven Rostedt (VMware)
Browse files

fgraph: Add new fgraph_ops structure to enable function graph hooks 



Currently the registering of function graph is to pass in a entry and return
function. We need to have a way to associate those functions together where
the entry can determine to run the return hook. Having a structure that
contains both functions will facilitate the process of converting the code
to be able to do such.

This is similar to the way function hooks are enabled (it passes in
ftrace_ops). Instead of passing in the functions to use, a single structure
is passed in to the registering function.

The unregister function is now passed in the fgraph_ops handle. When we
allow more than one callback to the function graph hooks, this will let the
system know which one to remove.

Reviewed-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 317e04ca

include/linux/ftrace.h

+11 −10
Original line number Diff line number Diff line
@@ -749,6 +749,11 @@ typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *); /* entry */ 


#ifdef CONFIG_FUNCTION_GRAPH_TRACER



struct fgraph_ops {

	trace_func_graph_ent_t		entryfunc;

	trace_func_graph_ret_t		retfunc;

};



/*

 * Stack of return addresses for functions

 * of a thread.
@@ -792,8 +797,9 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, 


#define FTRACE_RETFUNC_DEPTH 50

#define FTRACE_RETSTACK_ALLOC_SIZE 32

extern int register_ftrace_graph(trace_func_graph_ret_t retfunc,

				trace_func_graph_ent_t entryfunc);



extern int register_ftrace_graph(struct fgraph_ops *ops);

extern void unregister_ftrace_graph(struct fgraph_ops *ops);



extern bool ftrace_graph_is_dead(void);

extern void ftrace_graph_stop(void);
@@ -802,8 +808,6 @@ extern void ftrace_graph_stop(void); 
extern trace_func_graph_ret_t ftrace_graph_return;

extern trace_func_graph_ent_t ftrace_graph_entry;



extern void unregister_ftrace_graph(void);



extern void ftrace_graph_init_task(struct task_struct *t);

extern void ftrace_graph_exit_task(struct task_struct *t);

extern void ftrace_graph_init_idle_task(struct task_struct *t, int cpu);
@@ -825,12 +829,9 @@ static inline void ftrace_graph_init_task(struct task_struct *t) { } 
static inline void ftrace_graph_exit_task(struct task_struct *t) { }

static inline void ftrace_graph_init_idle_task(struct task_struct *t, int cpu) { }



static inline int register_ftrace_graph(trace_func_graph_ret_t retfunc,

			  trace_func_graph_ent_t entryfunc)

{

	return -1;

}

static inline void unregister_ftrace_graph(void) { }

/* Define as macros as fgraph_ops may not be defined */

#define register_ftrace_graph(ops) ({ -1; })

#define unregister_ftrace_graph(ops) do { } while (0)



static inline unsigned long

ftrace_graph_ret_addr(struct task_struct *task, int *idx, unsigned long ret,

kernel/trace/fgraph.c

+4 −5
Original line number Diff line number Diff line
@@ -490,8 +490,7 @@ static int start_graph_tracing(void) 
	return ret;

}



int register_ftrace_graph(trace_func_graph_ret_t retfunc,

			trace_func_graph_ent_t entryfunc)

int register_ftrace_graph(struct fgraph_ops *gops)

{

	int ret = 0;
@@ -512,7 +511,7 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, 
		goto out;

	}



	ftrace_graph_return = retfunc;

	ftrace_graph_return = gops->retfunc;



	/*

	 * Update the indirect function to the entryfunc, and the
@@ -520,7 +519,7 @@ int register_ftrace_graph(trace_func_graph_ret_t retfunc, 
	 * call the update fgraph entry function to determine if

	 * the entryfunc should be called directly or not.

	 */

	__ftrace_graph_entry = entryfunc;

	__ftrace_graph_entry = gops->entryfunc;

	ftrace_graph_entry = ftrace_graph_entry_test;

	update_function_graph_func();
@@ -530,7 +529,7 @@ out: 
	return ret;

}



void unregister_ftrace_graph(void)

void unregister_ftrace_graph(struct fgraph_ops *gops)

{

	mutex_lock(&ftrace_lock);

kernel/trace/ftrace.c

+7 −3
Original line number Diff line number Diff line
@@ -849,15 +849,19 @@ static void profile_graph_return(struct ftrace_graph_ret *trace) 
	local_irq_restore(flags);

}



static struct fgraph_ops fprofiler_ops = {

	.entryfunc = &profile_graph_entry,

	.retfunc = &profile_graph_return,

};



static int register_ftrace_profiler(void)

{

	return register_ftrace_graph(&profile_graph_return,

				     &profile_graph_entry);

	return register_ftrace_graph(&fprofiler_ops);

}



static void unregister_ftrace_profiler(void)

{

	unregister_ftrace_graph();

	unregister_ftrace_graph(&fprofiler_ops);

}

#else

static struct ftrace_ops ftrace_profile_ops __read_mostly = {

kernel/trace/trace_functions_graph.c

+16 −5
Original line number Diff line number Diff line
@@ -345,17 +345,25 @@ static void trace_graph_thresh_return(struct ftrace_graph_ret *trace) 
		trace_graph_return(trace);

}



static struct fgraph_ops funcgraph_thresh_ops = {

	.entryfunc = &trace_graph_entry,

	.retfunc = &trace_graph_thresh_return,

};



static struct fgraph_ops funcgraph_ops = {

	.entryfunc = &trace_graph_entry,

	.retfunc = &trace_graph_return,

};



static int graph_trace_init(struct trace_array *tr)

{

	int ret;



	set_graph_array(tr);

	if (tracing_thresh)

		ret = register_ftrace_graph(&trace_graph_thresh_return,

					    &trace_graph_entry);

		ret = register_ftrace_graph(&funcgraph_thresh_ops);

	else

		ret = register_ftrace_graph(&trace_graph_return,

					    &trace_graph_entry);

		ret = register_ftrace_graph(&funcgraph_ops);

	if (ret)

		return ret;

	tracing_start_cmdline_record();
@@ -366,7 +374,10 @@ static int graph_trace_init(struct trace_array *tr) 
static void graph_trace_reset(struct trace_array *tr)

{

	tracing_stop_cmdline_record();

	unregister_ftrace_graph();

	if (tracing_thresh)

		unregister_ftrace_graph(&funcgraph_thresh_ops);

	else

		unregister_ftrace_graph(&funcgraph_ops);

}



static int graph_trace_update_thresh(struct trace_array *tr)

kernel/trace/trace_irqsoff.c

+7 −11
Original line number Diff line number Diff line
@@ -218,6 +218,11 @@ static void irqsoff_graph_return(struct ftrace_graph_ret *trace) 
	atomic_dec(&data->disabled);

}



static struct fgraph_ops fgraph_ops = {

	.entryfunc		= &irqsoff_graph_entry,

	.retfunc		= &irqsoff_graph_return,

};



static void irqsoff_trace_open(struct trace_iterator *iter)

{

	if (is_graph(iter->tr))
@@ -272,13 +277,6 @@ __trace_function(struct trace_array *tr, 
#else

#define __trace_function trace_function



#ifdef CONFIG_FUNCTION_TRACER

static int irqsoff_graph_entry(struct ftrace_graph_ent *trace)

{

	return -1;

}

#endif



static enum print_line_t irqsoff_print_line(struct trace_iterator *iter)

{

	return TRACE_TYPE_UNHANDLED;
@@ -288,7 +286,6 @@ static void irqsoff_trace_open(struct trace_iterator *iter) { } 
static void irqsoff_trace_close(struct trace_iterator *iter) { }



#ifdef CONFIG_FUNCTION_TRACER

static void irqsoff_graph_return(struct ftrace_graph_ret *trace) { }

static void irqsoff_print_header(struct seq_file *s)

{

	trace_default_header(s);
@@ -468,8 +465,7 @@ static int register_irqsoff_function(struct trace_array *tr, int graph, int set) 
		return 0;



	if (graph)

		ret = register_ftrace_graph(&irqsoff_graph_return,

					    &irqsoff_graph_entry);

		ret = register_ftrace_graph(&fgraph_ops);

	else

		ret = register_ftrace_function(tr->ops);
@@ -485,7 +481,7 @@ static void unregister_irqsoff_function(struct trace_array *tr, int graph) 
		return;



	if (graph)

		unregister_ftrace_graph();

		unregister_ftrace_graph(&fgraph_ops);

	else

		unregister_ftrace_function(tr->ops);

CRA Git | Maintained and supported by SUSTech CRA and CCSE