Commit 84e53ff7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tip/perf/core-2' of... 

Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

 into perf/core

Pull tracing updates from Steven Rostedt.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ccf59d8d 7bcfaf54

Documentation/kernel-parameters.txt

+16 −0
Original line number Diff line number Diff line
@@ -2859,6 +2859,22 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			to facilitate early boot debugging.

			See also Documentation/trace/events.txt



	trace_options=[option-list]

			[FTRACE] Enable or disable tracer options at boot.

			The option-list is a comma delimited list of options

			that can be enabled or disabled just as if you were

			to echo the option name into



			    /sys/kernel/debug/tracing/trace_options



			For example, to enable stacktrace option (to dump the

			stack trace of each event), add to the command line:



			      trace_options=stacktrace



			See also Documentation/trace/ftrace.txt "trace options"

			section.



	transparent_hugepage=

			[KNL]

			Format: [always|madvise|never]

include/linux/ftrace_event.h

+7 −7
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ trace_current_buffer_lock_reserve(struct ring_buffer **current_buffer, 
void trace_current_buffer_unlock_commit(struct ring_buffer *buffer,

					struct ring_buffer_event *event,

					unsigned long flags, int pc);

void trace_nowake_buffer_unlock_commit(struct ring_buffer *buffer,

void trace_buffer_unlock_commit(struct ring_buffer *buffer,

				struct ring_buffer_event *event,

				unsigned long flags, int pc);

void trace_nowake_buffer_unlock_commit_regs(struct ring_buffer *buffer,

void trace_buffer_unlock_commit_regs(struct ring_buffer *buffer,

				     struct ring_buffer_event *event,

				     unsigned long flags, int pc,

				     struct pt_regs *regs);

include/linux/kernel.h

+2 −5
Original line number Diff line number Diff line
@@ -527,9 +527,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap); 


extern void ftrace_dump(enum ftrace_dump_mode oops_dump_mode);

#else

static inline __printf(1, 2)

int trace_printk(const char *fmt, ...);



static inline void tracing_start(void) { }

static inline void tracing_stop(void) { }

static inline void ftrace_off_permanent(void) { }
@@ -539,8 +536,8 @@ static inline void tracing_on(void) { } 
static inline void tracing_off(void) { }

static inline int tracing_is_on(void) { return 0; }



static inline int

trace_printk(const char *fmt, ...)

static inline __printf(1, 2)

int trace_printk(const char *fmt, ...)

{

	return 0;

}

include/linux/ring_buffer.h

+2 −1
Original line number Diff line number Diff line
@@ -159,13 +159,14 @@ int ring_buffer_record_is_on(struct ring_buffer *buffer); 
void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu);

void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu);



unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);

u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_entries(struct ring_buffer *buffer);

unsigned long ring_buffer_overruns(struct ring_buffer *buffer);

unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu);

unsigned long ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu);



u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu);

void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer,

include/trace/ftrace.h

+1 −2
Original line number Diff line number Diff line
@@ -545,8 +545,7 @@ ftrace_raw_event_##call(void *__data, proto) \ 
	{ assign; }							\

									\

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

		trace_nowake_buffer_unlock_commit(buffer,		\

						  event, irq_flags, pc); \

		trace_buffer_unlock_commit(buffer, event, irq_flags, pc); \

}

/*

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