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

Commit eb02ce01 authored by Tom Zanussi's avatar Tom Zanussi Committed by Ingo Molnar
Browse files

tracing/filters: use ring_buffer_discard_commit() in filter_check_discard() 



This patch changes filter_check_discard() to make use of the new
ring_buffer_discard_commit() function and modifies the current users to
call the old commit function in the non-discard case.

It also introduces a version of filter_check_discard() that uses the
global trace buffer (filter_current_check_discard()) for those cases.

v2 changes:

- fix compile error noticed by Ingo Molnar

Signed-off-by: default avatarTom Zanussi <tzanussi@gmail.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: fweisbec@gmail.com
LKML-Reference: <1239178554.10295.36.camel@tropicana>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5f77a88b

kernel/trace/kmemtrace.c

+4 −6
Original line number Diff line number Diff line
@@ -63,8 +63,7 @@ static inline void kmemtrace_alloc(enum kmemtrace_type_id type_id, 
	entry->gfp_flags	= gfp_flags;

	entry->node		= node;



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);



	trace_wake_up();
@@ -90,8 +89,7 @@ static inline void kmemtrace_free(enum kmemtrace_type_id type_id, 
	entry->call_site	= call_site;

	entry->ptr		= ptr;



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);



	trace_wake_up();

kernel/trace/trace.c

+24 −21
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ static struct trace_array global_trace; 


static DEFINE_PER_CPU(struct trace_array_cpu, global_trace_cpu);



int filter_current_check_discard(struct ftrace_event_call *call, void *rec,

				 struct ring_buffer_event *event)

{

	return filter_check_discard(call, rec, global_trace.buffer, event);

}



cycle_t ftrace_now(int cpu)

{

	u64 ts;
@@ -919,8 +925,7 @@ trace_function(struct trace_array *tr, 
	entry->ip			= ip;

	entry->parent_ip		= parent_ip;



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);

}
@@ -943,7 +948,7 @@ static int __trace_graph_entry(struct trace_array *tr, 
		return 0;

	entry	= ring_buffer_event_data(event);

	entry->graph_ent			= *trace;

	filter_check_discard(call, entry, event);

	if (!filter_current_check_discard(call, entry, event))

		ring_buffer_unlock_commit(global_trace.buffer, event);



	return 1;
@@ -967,7 +972,7 @@ static void __trace_graph_return(struct trace_array *tr, 
		return;

	entry	= ring_buffer_event_data(event);

	entry->ret				= *trace;

	filter_check_discard(call, entry, event);

	if (!filter_current_check_discard(call, entry, event))

		ring_buffer_unlock_commit(global_trace.buffer, event);

}

#endif
@@ -1004,7 +1009,7 @@ static void __ftrace_trace_stack(struct trace_array *tr, 
	trace.entries		= entry->caller;



	save_stack_trace(&trace);

	filter_check_discard(call, entry, event);

	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);

#endif

}
@@ -1052,7 +1057,7 @@ static void ftrace_trace_userstack(struct trace_array *tr, 
	trace.entries		= entry->caller;



	save_stack_trace_user(&trace);

	filter_check_discard(call, entry, event);

	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);

#endif

}
@@ -1114,8 +1119,7 @@ tracing_sched_switch_trace(struct trace_array *tr, 
	entry->next_state		= next->state;

	entry->next_cpu	= task_cpu(next);



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		trace_buffer_unlock_commit(tr, event, flags, pc);

}
@@ -1142,8 +1146,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr, 
	entry->next_state		= wakee->state;

	entry->next_cpu			= task_cpu(wakee);



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);

	ftrace_trace_stack(tr, flags, 6, pc);

	ftrace_trace_userstack(tr, flags, pc);
@@ -1285,7 +1288,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) 
	entry->fmt			= fmt;



	memcpy(entry->buf, trace_buf, sizeof(u32) * len);

	filter_check_discard(call, entry, event);

	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);



out_unlock:
@@ -1341,7 +1344,7 @@ int trace_vprintk(unsigned long ip, const char *fmt, va_list args) 


	memcpy(&entry->buf, trace_buf, len);

	entry->buf[len] = 0;

	filter_check_discard(call, entry, event);

	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);



 out_unlock:

kernel/trace/trace.h

+11 −3
Original line number Diff line number Diff line
@@ -866,13 +866,21 @@ extern int filter_match_preds(struct ftrace_event_call *call, void *rec); 
extern void filter_free_subsystem_preds(struct event_subsystem *system);

extern int filter_add_subsystem_pred(struct event_subsystem *system,

				     struct filter_pred *pred);

extern int filter_current_check_discard(struct ftrace_event_call *call,

					void *rec,

					struct ring_buffer_event *event);



static inline void

static inline int

filter_check_discard(struct ftrace_event_call *call, void *rec,

		     struct ring_buffer *buffer,

		     struct ring_buffer_event *event)

{

	if (unlikely(call->preds) && !filter_match_preds(call, rec))

		ring_buffer_event_discard(event);

	if (unlikely(call->preds) && !filter_match_preds(call, rec)) {

		ring_buffer_discard_commit(buffer, event);

		return 1;

	}



	return 0;

}



#define __common_field(type, item)					\

kernel/trace/trace_branch.c

+2 −3
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ probe_likely_condition(struct ftrace_branch_data *f, int val, int expect) 
	entry->line = f->line;

	entry->correct = val == expect;



	filter_check_discard(call, entry, event);



	if (!filter_check_discard(call, entry, tr->buffer, event))

		ring_buffer_unlock_commit(tr->buffer, event);



 out:

kernel/trace/trace_events_stage_3.h

+1 −4
Original line number Diff line number Diff line
@@ -222,11 +222,8 @@ static void ftrace_raw_event_##call(proto) \ 
									\

	assign;								\

									\

	if (call->preds && !filter_match_preds(call, entry))		\

		trace_current_buffer_discard_commit(event);		\

	else								\

	if (!filter_current_check_discard(call, entry, event))		\

		trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \

									\

}									\

									\

static int ftrace_raw_reg_event_##call(void)				\