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

Commit ccb469a1 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

tracing: Pass the ftrace_file to the buffer lock reserve code 



Pass the struct ftrace_event_file *ftrace_file to the
trace_event_buffer_lock_reserve() (new function that replaces the
trace_current_buffer_lock_reserver()).

The ftrace_file holds a pointer to the trace_array that is in use.
In the case of multiple buffers with different trace_arrays, this
allows different events to be recorded into different buffers.

Also fixed some of the stale comments in include/trace/ftrace.h

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

include/linux/ftrace_event.h

+7 −0
Original line number Original line Diff line number Diff line
@@ -128,6 +128,13 @@ enum print_line_t { 
void tracing_generic_entry_update(struct trace_entry *entry,

void tracing_generic_entry_update(struct trace_entry *entry,

				  unsigned long flags,

				  unsigned long flags,

				  int pc);

				  int pc);

struct ftrace_event_file;



struct ring_buffer_event *

trace_event_buffer_lock_reserve(struct ring_buffer **current_buffer,

				struct ftrace_event_file *ftrace_file,

				int type, unsigned long len,

				unsigned long flags, int pc);

struct ring_buffer_event *

struct ring_buffer_event *

trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer,

trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer,

				  int type, unsigned long len,

				  int type, unsigned long len,

include/trace/ftrace.h

+5 −4
Original line number Original line Diff line number Diff line
@@ -414,7 +414,8 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 *

 *

 * static void ftrace_raw_event_<call>(void *__data, proto)

 * static void ftrace_raw_event_<call>(void *__data, proto)

 * {

 * {

 *	struct ftrace_event_call *event_call = __data;

 *	struct ftrace_event_file *ftrace_file = __data;

 *	struct ftrace_event_call *event_call = ftrace_file->event_call;

 *	struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;

 *	struct ftrace_data_offsets_<call> __maybe_unused __data_offsets;

 *	struct ring_buffer_event *event;

 *	struct ring_buffer_event *event;

 *	struct ftrace_raw_<call> *entry; <-- defined in stage 1

 *	struct ftrace_raw_<call> *entry; <-- defined in stage 1
@@ -428,7 +429,7 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 *

 *

 *	__data_size = ftrace_get_offsets_<call>(&__data_offsets, args);

 *	__data_size = ftrace_get_offsets_<call>(&__data_offsets, args);

 *

 *

 *	event = trace_current_buffer_lock_reserve(&buffer,

 *	event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,

 *				  event_<call>->event.type,

 *				  event_<call>->event.type,

 *				  sizeof(*entry) + __data_size,

 *				  sizeof(*entry) + __data_size,

 *				  irq_flags, pc);

 *				  irq_flags, pc);
@@ -440,7 +441,7 @@ static inline notrace int ftrace_get_offsets_##call( \ 
 *			   __array macros.

 *			   __array macros.

 *

 *

 *	if (!filter_current_check_discard(buffer, event_call, entry, event))

 *	if (!filter_current_check_discard(buffer, event_call, entry, event))

 *		trace_current_buffer_unlock_commit(buffer,

 *		trace_nowake_buffer_unlock_commit(buffer,

 *						   event, irq_flags, pc);

 *						   event, irq_flags, pc);

 * }

 * }

 *

 *
@@ -533,7 +534,7 @@ ftrace_raw_event_##call(void *__data, proto) \ 
									\

									\

	__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

	__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \

									\

									\

	event = trace_current_buffer_lock_reserve(&buffer,		\

	event = trace_event_buffer_lock_reserve(&buffer, ftrace_file,	\

				 event_call->event.type,		\

				 event_call->event.type,		\

				 sizeof(*entry) + __data_size,		\

				 sizeof(*entry) + __data_size,		\

				 irq_flags, pc);			\

				 irq_flags, pc);			\

kernel/trace/trace.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -1293,6 +1293,18 @@ void trace_buffer_unlock_commit(struct ring_buffer *buffer, 
}

}

EXPORT_SYMBOL_GPL(trace_buffer_unlock_commit);

EXPORT_SYMBOL_GPL(trace_buffer_unlock_commit);





struct ring_buffer_event *

trace_event_buffer_lock_reserve(struct ring_buffer **current_rb,

			  struct ftrace_event_file *ftrace_file,

			  int type, unsigned long len,

			  unsigned long flags, int pc)

{

	*current_rb = ftrace_file->tr->buffer;

	return trace_buffer_lock_reserve(*current_rb,

					 type, len, flags, pc);

}

EXPORT_SYMBOL_GPL(trace_event_buffer_lock_reserve);



struct ring_buffer_event *

struct ring_buffer_event *

trace_current_buffer_lock_reserve(struct ring_buffer **current_rb,

trace_current_buffer_lock_reserve(struct ring_buffer **current_rb,

				  int type, unsigned long len,

				  int type, unsigned long len,