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

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

tracing/filters: use ring_buffer_discard_commit for discarded events 



The ring_buffer_discard_commit makes better usage of the ring_buffer
when an event has been discarded. It tries to remove it completely if
possible.

This patch converts the trace event filtering to use
ring_buffer_discard_commit instead of the ring_buffer_event_discard.

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

kernel/trace/trace.c

+7 −2
Original line number Diff line number Diff line
@@ -884,13 +884,18 @@ trace_current_buffer_lock_reserve(unsigned char type, unsigned long len, 
void trace_current_buffer_unlock_commit(struct ring_buffer_event *event,

					unsigned long flags, int pc)

{

	return __trace_buffer_unlock_commit(&global_trace, event, flags, pc, 1);

	__trace_buffer_unlock_commit(&global_trace, event, flags, pc, 1);

}



void trace_nowake_buffer_unlock_commit(struct ring_buffer_event *event,

					unsigned long flags, int pc)

{

	return __trace_buffer_unlock_commit(&global_trace, event, flags, pc, 0);

	__trace_buffer_unlock_commit(&global_trace, event, flags, pc, 0);

}



void trace_current_buffer_discard_commit(struct ring_buffer_event *event)

{

	ring_buffer_discard_commit(global_trace.buffer, event);

}



void

kernel/trace/trace.h

+1 −0
Original line number Diff line number Diff line
@@ -497,6 +497,7 @@ void trace_current_buffer_unlock_commit(struct ring_buffer_event *event, 
					unsigned long flags, int pc);

void trace_nowake_buffer_unlock_commit(struct ring_buffer_event *event,

					unsigned long flags, int pc);

void trace_current_buffer_discard_commit(struct ring_buffer_event *event);



struct trace_entry *tracing_get_trace_entry(struct trace_array *tr,

						struct trace_array_cpu *data);

kernel/trace/trace_events_stage_3.h

+3 −3
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ static void ftrace_raw_event_##call(proto) \ 
	assign;								\

									\

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

		ring_buffer_event_discard(event);			\

									\

		trace_current_buffer_discard_commit(event);		\

	else								\

		trace_nowake_buffer_unlock_commit(event, irq_flags, pc); \

									\

}									\