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

Commit 8c1a49ae authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Pass trace_array to set_flag callback 



As options (flags) may affect instances instead of being global
the set_flag() callbacks need to receive the trace_array descriptor
of the instance they will be modifying.

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

kernel/trace/blktrace.c

+2 −1
Original line number Diff line number Diff line
@@ -1427,7 +1427,8 @@ static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter) 
	return print_one_line(iter, true);

}



static int blk_tracer_set_flag(u32 old_flags, u32 bit, int set)

static int

blk_tracer_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)

{

	/* don't output context-info for blk_classic output */

	if (bit == TRACE_BLK_OPT_CLASSIC) {

kernel/trace/trace.c

+10 −8
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static struct tracer_flags dummy_tracer_flags = { 
	.opts = dummy_tracer_opt

};



static int dummy_set_flag(u32 old_flags, u32 bit, int set)

static int

dummy_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)

{

	return 0;

}
@@ -3339,13 +3340,14 @@ static int tracing_trace_options_show(struct seq_file *m, void *v) 
	return 0;

}



static int __set_tracer_option(struct tracer *trace,

static int __set_tracer_option(struct trace_array *tr,

			       struct tracer_flags *tracer_flags,

			       struct tracer_opt *opts, int neg)

{

	struct tracer *trace = tr->current_trace;

	int ret;



	ret = trace->set_flag(tracer_flags->val, opts->bit, !neg);

	ret = trace->set_flag(tr, tracer_flags->val, opts->bit, !neg);

	if (ret)

		return ret;
@@ -3357,8 +3359,9 @@ static int __set_tracer_option(struct tracer *trace, 
}



/* Try to assign a tracer specific option */

static int set_tracer_option(struct tracer *trace, char *cmp, int neg)

static int set_tracer_option(struct trace_array *tr, char *cmp, int neg)

{

	struct tracer *trace = tr->current_trace;

	struct tracer_flags *tracer_flags = trace->flags;

	struct tracer_opt *opts = NULL;

	int i;
@@ -3367,8 +3370,7 @@ static int set_tracer_option(struct tracer *trace, char *cmp, int neg) 
		opts = &tracer_flags->opts[i];



		if (strcmp(cmp, opts->name) == 0)

			return __set_tracer_option(trace, trace->flags,

						   opts, neg);

			return __set_tracer_option(tr, trace->flags, opts, neg);

	}



	return -EINVAL;
@@ -3440,7 +3442,7 @@ static int trace_set_options(struct trace_array *tr, char *option) 


	/* If no option could be set, test the specific tracer options */

	if (!trace_options[i])

		ret = set_tracer_option(tr->current_trace, cmp, neg);

		ret = set_tracer_option(tr, cmp, neg);



	mutex_unlock(&trace_types_lock);
@@ -5689,7 +5691,7 @@ trace_options_write(struct file *filp, const char __user *ubuf, size_t cnt, 


	if (!!(topt->flags->val & topt->opt->bit) != val) {

		mutex_lock(&trace_types_lock);

		ret = __set_tracer_option(topt->tr->current_trace, topt->flags,

		ret = __set_tracer_option(topt->tr, topt->flags,

					  topt->opt, !val);

		mutex_unlock(&trace_types_lock);

		if (ret)

kernel/trace/trace.h

+2 −1
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ struct tracer { 
	void			(*print_header)(struct seq_file *m);

	enum print_line_t	(*print_line)(struct trace_iterator *iter);

	/* If you handled the flag setting, return 0 */

	int			(*set_flag)(u32 old_flags, u32 bit, int set);

	int			(*set_flag)(struct trace_array *tr,

					    u32 old_flags, u32 bit, int set);

	/* Return 0 if OK with change, else return non-zero */

	int			(*flag_changed)(struct tracer *tracer,

						u32 mask, int set);

kernel/trace/trace_functions.c

+2 −1
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static void tracing_stop_function_trace(void) 
		unregister_ftrace_function(&trace_ops);

}



static int func_set_flag(u32 old_flags, u32 bit, int set)

static int

func_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)

{

	switch (bit) {

	case TRACE_FUNC_OPT_STACK:

kernel/trace/trace_functions_graph.c

+2 −1
Original line number Diff line number Diff line
@@ -1476,7 +1476,8 @@ void graph_trace_close(struct trace_iterator *iter) 
	}

}



static int func_graph_set_flag(u32 old_flags, u32 bit, int set)

static int

func_graph_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)

{

	if (bit == TRACE_GRAPH_PRINT_IRQS)

		ftrace_graph_skip_irqs = !set;