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

Commit bb3c3c95 authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

ftrace: move function tracer functions out of trace.c 



Impact: clean up of trace.c

The function tracer functions were put in trace.c because it needed
to share static variables that were in trace.c.  Since then, those
variables have become global for various reasons. This patch moves
the function tracer functions into trace_function.c where they belong.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 53614991

kernel/trace/trace.c

+0 −84
Original line number Original line Diff line number Diff line
@@ -1046,65 +1046,6 @@ ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3) 
	local_irq_restore(flags);

	local_irq_restore(flags);

}

}





#ifdef CONFIG_FUNCTION_TRACER

static void

function_trace_call_preempt_only(unsigned long ip, unsigned long parent_ip)

{

	struct trace_array *tr = &global_trace;

	struct trace_array_cpu *data;

	unsigned long flags;

	long disabled;

	int cpu, resched;

	int pc;



	if (unlikely(!ftrace_function_enabled))

		return;



	pc = preempt_count();

	resched = ftrace_preempt_disable();

	local_save_flags(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	disabled = atomic_inc_return(&data->disabled);



	if (likely(disabled == 1))

		trace_function(tr, data, ip, parent_ip, flags, pc);



	atomic_dec(&data->disabled);

	ftrace_preempt_enable(resched);

}



static void

function_trace_call(unsigned long ip, unsigned long parent_ip)

{

	struct trace_array *tr = &global_trace;

	struct trace_array_cpu *data;

	unsigned long flags;

	long disabled;

	int cpu;

	int pc;



	if (unlikely(!ftrace_function_enabled))

		return;



	/*

	 * Need to use raw, since this must be called before the

	 * recursive protection is performed.

	 */

	local_irq_save(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	disabled = atomic_inc_return(&data->disabled);



	if (likely(disabled == 1)) {

		pc = preempt_count();

		trace_function(tr, data, ip, parent_ip, flags, pc);

	}



	atomic_dec(&data->disabled);

	local_irq_restore(flags);

}



#ifdef CONFIG_FUNCTION_GRAPH_TRACER

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

int trace_graph_entry(struct ftrace_graph_ent *trace)

int trace_graph_entry(struct ftrace_graph_ent *trace)

{

{
@@ -1162,31 +1103,6 @@ void trace_graph_return(struct ftrace_graph_ret *trace) 
}

}

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */

#endif /* CONFIG_FUNCTION_GRAPH_TRACER */





static struct ftrace_ops trace_ops __read_mostly =

{

	.func = function_trace_call,

};



void tracing_start_function_trace(void)

{

	ftrace_function_enabled = 0;



	if (trace_flags & TRACE_ITER_PREEMPTONLY)

		trace_ops.func = function_trace_call_preempt_only;

	else

		trace_ops.func = function_trace_call;



	register_ftrace_function(&trace_ops);

	ftrace_function_enabled = 1;

}



void tracing_stop_function_trace(void)

{

	ftrace_function_enabled = 0;

	unregister_ftrace_function(&trace_ops);

}

#endif



enum trace_file_type {

enum trace_file_type {

	TRACE_FILE_LAT_FMT	= 1,

	TRACE_FILE_LAT_FMT	= 1,

	TRACE_FILE_ANNOTATE	= 2,

	TRACE_FILE_ANNOTATE	= 2,

kernel/trace/trace_functions.c

+83 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ static struct trace_array *func_trace; 




static void start_function_trace(struct trace_array *tr)

static void start_function_trace(struct trace_array *tr)

{

{

	func_trace = tr;

	tr->cpu = get_cpu();

	tr->cpu = get_cpu();

	tracing_reset_online_cpus(tr);

	tracing_reset_online_cpus(tr);

	put_cpu();

	put_cpu();
@@ -36,7 +37,6 @@ static void stop_function_trace(struct trace_array *tr) 




static int function_trace_init(struct trace_array *tr)

static int function_trace_init(struct trace_array *tr)

{

{

	func_trace = tr;

	start_function_trace(tr);

	start_function_trace(tr);

	return 0;

	return 0;

}

}
@@ -51,6 +51,64 @@ static void function_trace_start(struct trace_array *tr) 
	tracing_reset_online_cpus(tr);

	tracing_reset_online_cpus(tr);

}

}





static void

function_trace_call_preempt_only(unsigned long ip, unsigned long parent_ip)

{

	struct trace_array *tr = func_trace;

	struct trace_array_cpu *data;

	unsigned long flags;

	long disabled;

	int cpu, resched;

	int pc;



	if (unlikely(!ftrace_function_enabled))

		return;



	pc = preempt_count();

	resched = ftrace_preempt_disable();

	local_save_flags(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	disabled = atomic_inc_return(&data->disabled);



	if (likely(disabled == 1))

		trace_function(tr, data, ip, parent_ip, flags, pc);



	atomic_dec(&data->disabled);

	ftrace_preempt_enable(resched);

}



static void

function_trace_call(unsigned long ip, unsigned long parent_ip)

{

	struct trace_array *tr = func_trace;

	struct trace_array_cpu *data;

	unsigned long flags;

	long disabled;

	int cpu;

	int pc;



	if (unlikely(!ftrace_function_enabled))

		return;



	/*

	 * Need to use raw, since this must be called before the

	 * recursive protection is performed.

	 */

	local_irq_save(flags);

	cpu = raw_smp_processor_id();

	data = tr->data[cpu];

	disabled = atomic_inc_return(&data->disabled);



	if (likely(disabled == 1)) {

		pc = preempt_count();

		trace_function(tr, data, ip, parent_ip, flags, pc);

	}



	atomic_dec(&data->disabled);

	local_irq_restore(flags);

}



static void

static void

function_stack_trace_call(unsigned long ip, unsigned long parent_ip)

function_stack_trace_call(unsigned long ip, unsigned long parent_ip)

{

{
@@ -90,6 +148,30 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip) 
	local_irq_restore(flags);

	local_irq_restore(flags);

}

}







static struct ftrace_ops trace_ops __read_mostly =

{

	.func = function_trace_call,

};



void tracing_start_function_trace(void)

{

	ftrace_function_enabled = 0;



	if (trace_flags & TRACE_ITER_PREEMPTONLY)

		trace_ops.func = function_trace_call_preempt_only;

	else

		trace_ops.func = function_trace_call;



	register_ftrace_function(&trace_ops);

	ftrace_function_enabled = 1;

}



void tracing_stop_function_trace(void)

{

	ftrace_function_enabled = 0;

	unregister_ftrace_function(&trace_ops);

}

static struct ftrace_ops trace_stack_ops __read_mostly =

static struct ftrace_ops trace_stack_ops __read_mostly =

{

{

	.func = function_stack_trace_call,

	.func = function_stack_trace_call,