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

Commit 3e9a8aad authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Create a always_inlined __trace_buffer_lock_reserve() 

As Andi Kleen pointed out in the Link below, the trace events has quite a
bit of code execution. A lot of that happens to be calling functions, where
some of them should simply be inlined. One of these functions happens to be
trace_buffer_lock_reserve() which is also a global, but it is used
throughout the file it is defined in. Create a __trace_buffer_lock_reserve()
that is always inlined that the file can benefit from.

Link: http://lkml.kernel.org/r/20161121183700.GW26852@two.firstfloor.org



Reported-by: default avatarAndi Kleen <andi@firstfloor.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 7d436400

kernel/trace/trace.c

+48 −39
Original line number Diff line number Diff line
@@ -739,6 +739,31 @@ static inline void ftrace_trace_stack(struct trace_array *tr, 


#endif



static __always_inline void

trace_event_setup(struct ring_buffer_event *event,

		  int type, unsigned long flags, int pc)

{

	struct trace_entry *ent = ring_buffer_event_data(event);



	tracing_generic_entry_update(ent, flags, pc);

	ent->type = type;

}



static __always_inline struct ring_buffer_event *

__trace_buffer_lock_reserve(struct ring_buffer *buffer,

			  int type,

			  unsigned long len,

			  unsigned long flags, int pc)

{

	struct ring_buffer_event *event;



	event = ring_buffer_lock_reserve(buffer, len);

	if (event != NULL)

		trace_event_setup(event, type, flags, pc);



	return event;

}



static void tracer_tracing_on(struct trace_array *tr)

{

	if (tr->trace_buffer.buffer)
@@ -795,7 +820,7 @@ int __trace_puts(unsigned long ip, const char *str, int size) 


	local_save_flags(irq_flags);

	buffer = global_trace.trace_buffer.buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, alloc, 

	event = __trace_buffer_lock_reserve(buffer, TRACE_PRINT, alloc, 

					    irq_flags, pc);

	if (!event)

		return 0;
@@ -843,7 +868,7 @@ int __trace_bputs(unsigned long ip, const char *str) 


	local_save_flags(irq_flags);

	buffer = global_trace.trace_buffer.buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_BPUTS, size,

	event = __trace_buffer_lock_reserve(buffer, TRACE_BPUTS, size,

					    irq_flags, pc);

	if (!event)

		return 0;
@@ -1913,29 +1938,13 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, 
}

EXPORT_SYMBOL_GPL(tracing_generic_entry_update);



static __always_inline void

trace_event_setup(struct ring_buffer_event *event,

		  int type, unsigned long flags, int pc)

{

	struct trace_entry *ent = ring_buffer_event_data(event);



	tracing_generic_entry_update(ent, flags, pc);

	ent->type = type;

}



struct ring_buffer_event *

trace_buffer_lock_reserve(struct ring_buffer *buffer,

			  int type,

			  unsigned long len,

			  unsigned long flags, int pc)

{

	struct ring_buffer_event *event;



	event = ring_buffer_lock_reserve(buffer, len);

	if (event != NULL)

		trace_event_setup(event, type, flags, pc);



	return event;

	return __trace_buffer_lock_reserve(buffer, type, len, flags, pc);

}



DEFINE_PER_CPU(struct ring_buffer_event *, trace_buffered_event);
@@ -2090,7 +2099,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb, 
		this_cpu_dec(trace_buffered_event_cnt);

	}



	entry = trace_buffer_lock_reserve(*current_rb,

	entry = __trace_buffer_lock_reserve(*current_rb,

					    type, len, flags, pc);

	/*

	 * If tracing is off, but we have triggers enabled
@@ -2100,7 +2109,7 @@ trace_event_buffer_lock_reserve(struct ring_buffer **current_rb, 
	 */

	if (!entry && trace_file->flags & EVENT_FILE_FL_TRIGGER_COND) {

		*current_rb = temp_buffer;

		entry = trace_buffer_lock_reserve(*current_rb,

		entry = __trace_buffer_lock_reserve(*current_rb,

						    type, len, flags, pc);

	}

	return entry;
@@ -2262,7 +2271,7 @@ trace_function(struct trace_array *tr, 
	struct ring_buffer_event *event;

	struct ftrace_entry *entry;



	event = trace_buffer_lock_reserve(buffer, TRACE_FN, sizeof(*entry),

	event = __trace_buffer_lock_reserve(buffer, TRACE_FN, sizeof(*entry),

					    flags, pc);

	if (!event)

		return;
@@ -2342,7 +2351,7 @@ static void __ftrace_trace_stack(struct ring_buffer *buffer, 


	size *= sizeof(unsigned long);



	event = trace_buffer_lock_reserve(buffer, TRACE_STACK,

	event = __trace_buffer_lock_reserve(buffer, TRACE_STACK,

					    sizeof(*entry) + size, flags, pc);

	if (!event)

		goto out;
@@ -2444,7 +2453,7 @@ ftrace_trace_userstack(struct ring_buffer *buffer, unsigned long flags, int pc) 


	__this_cpu_inc(user_stack_count);



	event = trace_buffer_lock_reserve(buffer, TRACE_USER_STACK,

	event = __trace_buffer_lock_reserve(buffer, TRACE_USER_STACK,

					    sizeof(*entry), flags, pc);

	if (!event)

		goto out_drop_count;
@@ -2615,7 +2624,7 @@ int trace_vbprintk(unsigned long ip, const char *fmt, va_list args) 
	local_save_flags(flags);

	size = sizeof(*entry) + sizeof(u32) * len;

	buffer = tr->trace_buffer.buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_BPRINT, size,

	event = __trace_buffer_lock_reserve(buffer, TRACE_BPRINT, size,

					    flags, pc);

	if (!event)

		goto out;
@@ -2671,7 +2680,7 @@ __trace_array_vprintk(struct ring_buffer *buffer, 


	local_save_flags(flags);

	size = sizeof(*entry) + len + 1;

	event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,

	event = __trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,

					    flags, pc);

	if (!event)

		goto out;
@@ -5732,7 +5741,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 
	local_save_flags(irq_flags);

	size = sizeof(*entry) + cnt + 2; /* possible \n added */

	buffer = tr->trace_buffer.buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,

	event = __trace_buffer_lock_reserve(buffer, TRACE_PRINT, size,

					    irq_flags, preempt_count());

	if (!event) {

		/* Ring buffer disabled, return as if not open for write */
@@ -5810,7 +5819,7 @@ tracing_mark_raw_write(struct file *filp, const char __user *ubuf, 
	local_save_flags(irq_flags);

	size = sizeof(*entry) + cnt;

	buffer = tr->trace_buffer.buffer;

	event = trace_buffer_lock_reserve(buffer, TRACE_RAW_DATA, size,

	event = __trace_buffer_lock_reserve(buffer, TRACE_RAW_DATA, size,

					    irq_flags, preempt_count());

	if (!event) {

		/* Ring buffer disabled, return as if not open for write */