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

Commit 315e8adb authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "coresight: enable stm logging for trace events, marker and printk" into msm-4.8

parents 33484556 43beb42e

include/linux/trace_events.h

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/hardirq.h>

#include <linux/perf_event.h>

#include <linux/tracepoint.h>

#include <linux/coresight-stm.h>



struct trace_array;

struct trace_buffer;
@@ -206,7 +207,8 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer, 
				  struct trace_event_file *trace_file,

				  unsigned long len);



void trace_event_buffer_commit(struct trace_event_buffer *fbuffer);

void trace_event_buffer_commit(struct trace_event_buffer *fbuffer,

			       unsigned long len);



enum {

	TRACE_EVENT_FL_FILTERED_BIT,

include/trace/trace_events.h

+2 −1
Original line number Diff line number Diff line
@@ -685,7 +685,8 @@ trace_event_raw_event_##call(void *__data, proto) \ 
									\

	{ assign; }							\

									\

	trace_event_buffer_commit(&fbuffer);				\

	trace_event_buffer_commit(&fbuffer,				\

				  sizeof(*entry) + __data_size);	\

}

/*

 * The ftrace_test_probe is compiled out, it is only here as a build time check

kernel/trace/trace.c

+6 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/nmi.h>

#include <linux/fs.h>

#include <linux/sched/rt.h>

#include <linux/coresight-stm.h>



#include "trace.h"

#include "trace_output.h"
@@ -2573,6 +2574,7 @@ __trace_array_vprintk(struct ring_buffer *buffer, 


	memcpy(&entry->buf, tbuffer, len + 1);

	if (!call_filter_check_discard(call, entry, buffer, event)) {

		stm_log(OST_ENTITY_TRACE_PRINTK, entry->buf, len + 1);

		__buffer_unlock_commit(buffer, event);

		ftrace_trace_stack(&global_trace, buffer, flags, 6, pc, NULL);

	}
@@ -5666,8 +5668,11 @@ tracing_mark_write(struct file *filp, const char __user *ubuf, 
	if (entry->buf[cnt - 1] != '\n') {

		entry->buf[cnt] = '\n';

		entry->buf[cnt + 1] = '\0';

	} else

		stm_log(OST_ENTITY_TRACE_MARKER, entry->buf, cnt + 2);

	} else {

		entry->buf[cnt] = '\0';

		stm_log(OST_ENTITY_TRACE_MARKER, entry->buf, cnt + 1);

	}



	__buffer_unlock_commit(buffer, event);

kernel/trace/trace.h

+8 −2
Original line number Diff line number Diff line
@@ -1176,6 +1176,7 @@ __event_trigger_test_discard(struct trace_event_file *file, 
 * @entry: The event itself

 * @irq_flags: The state of the interrupts at the start of the event

 * @pc: The state of the preempt count at the start of the event.

 * @len: The length of the payload data required for stm logging.

 *

 * This is a helper function to handle triggers that require data

 * from the event itself. It also tests the event against filters and
@@ -1185,12 +1186,17 @@ static inline void 
event_trigger_unlock_commit(struct trace_event_file *file,

			    struct ring_buffer *buffer,

			    struct ring_buffer_event *event,

			    void *entry, unsigned long irq_flags, int pc)

			    void *entry, unsigned long irq_flags, int pc,

			    unsigned long len)

{

	enum event_trigger_type tt = ETT_NONE;



	if (!__event_trigger_test_discard(file, buffer, event, entry, &tt))

	if (!__event_trigger_test_discard(file, buffer, event, entry, &tt)) {

		if (len)

			stm_log(OST_ENTITY_FTRACE_EVENTS, entry, len);



		trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);

	}



	if (tt)

		event_triggers_post_call(file, tt, entry);

kernel/trace/trace_events.c

+3 −2
Original line number Diff line number Diff line
@@ -312,14 +312,15 @@ static void output_printk(struct trace_event_buffer *fbuffer) 
	spin_unlock_irqrestore(&tracepoint_iter_lock, flags);

}



void trace_event_buffer_commit(struct trace_event_buffer *fbuffer)

void trace_event_buffer_commit(struct trace_event_buffer *fbuffer,

			       unsigned long len)

{

	if (tracepoint_printk)

		output_printk(fbuffer);



	event_trigger_unlock_commit(fbuffer->trace_file, fbuffer->buffer,

				    fbuffer->event, fbuffer->entry,

				    fbuffer->flags, fbuffer->pc);

				    fbuffer->flags, fbuffer->pc, len);

}

EXPORT_SYMBOL_GPL(trace_event_buffer_commit);