Commit b6f11df2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

trace: Call tracing_reset_online_cpus before tracer->init() 



Impact: cleanup

To make it easy for ftrace plugin writers, as this was open coded in
the existing plugins

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarFrédéric Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 51a763dd

block/blktrace.c

+0 −2
Original line number Diff line number Diff line
@@ -1086,8 +1086,6 @@ static void blk_tracer_print_header(struct seq_file *m) 


static void blk_tracer_start(struct trace_array *tr)

{

	tracing_reset_online_cpus(tr);



	mutex_lock(&blk_probe_mutex);

	if (atomic_add_return(1, &blk_probes_ref) == 1)

		if (blk_register_tracepoints())

kernel/trace/trace.c

+7 −1
Original line number Diff line number Diff line
@@ -2171,6 +2171,12 @@ tracing_set_trace_read(struct file *filp, char __user *ubuf, 
	return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);

}



int tracer_init(struct tracer *t, struct trace_array *tr)

{

	tracing_reset_online_cpus(tr);

	return t->init(tr);

}



static int tracing_set_tracer(const char *buf)

{

	struct trace_array *tr = &global_trace;
@@ -2195,7 +2201,7 @@ static int tracing_set_tracer(const char *buf) 


	current_trace = t;

	if (t->init) {

		ret = t->init(tr);

		ret = tracer_init(t, tr);

		if (ret)

			goto out;

	}

kernel/trace/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ struct trace_iterator { 
	cpumask_var_t		started;

};



int tracer_init(struct tracer *t, struct trace_array *tr);

int tracing_is_enabled(void);

void trace_wake_up(void);

void tracing_reset(struct trace_array *tr, int cpu);

kernel/trace/trace_branch.c

+0 −1
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ static void stop_branch_trace(struct trace_array *tr) 


static int branch_trace_init(struct trace_array *tr)

{

	tracing_reset_online_cpus(tr);

	start_branch_trace(tr);

	return 0;

}

kernel/trace/trace_functions.c

+3 −14
Original line number Diff line number Diff line
@@ -24,32 +24,21 @@ static struct trace_array *func_trace; 
static void tracing_start_function_trace(void);

static void tracing_stop_function_trace(void);



static void start_function_trace(struct trace_array *tr)

static int function_trace_init(struct trace_array *tr)

{

	func_trace = tr;

	tr->cpu = get_cpu();

	tracing_reset_online_cpus(tr);

	put_cpu();



	tracing_start_cmdline_record();

	tracing_start_function_trace();

}



static void stop_function_trace(struct trace_array *tr)

{

	tracing_stop_function_trace();

	tracing_stop_cmdline_record();

}



static int function_trace_init(struct trace_array *tr)

{

	start_function_trace(tr);

	return 0;

}



static void function_trace_reset(struct trace_array *tr)

{

	stop_function_trace(tr);

	tracing_stop_function_trace();

	tracing_stop_cmdline_record();

}



static void function_trace_start(struct trace_array *tr)