Commit 170b3b10 authored Sep 05, 2017 by Baohong Liu Committed by Steven Rostedt (VMware) Sep 06, 2017

tracing: Apply trace_clock changes to instance max buffer

Currently trace_clock timestamps are applied to both regular and max
buffers only for global trace. For instance trace, trace_clock
timestamps are applied only to regular buffer. But, regular and max
buffers can be swapped, for example, following a snapshot. So, for
instance trace, bad timestamps can be seen following a snapshot.
Let's apply trace_clock timestamps to instance max buffer as well.

Link: http://lkml.kernel.org/r/ebdb168d0be042dcdf51f81e696b17fabe3609c1.1504642143.git.tom.zanussi@linux.intel.com

Cc: stable@vger.kernel.org
Fixes: 277ba044 ("tracing: Add interface to allow multiple trace buffers")
Signed-off-by: Baohong Liu <baohong.liu@intel.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent 7685ab6c

kernel/trace/trace.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -6229,7 +6229,7 @@ static int tracing_set_clock(struct trace_array tr, const char clockstr)
		tracing_reset_online_cpus(&tr->trace_buffer);

		#ifdef CONFIG_TRACER_MAX_TRACE
		if (tr->flags & TRACE_ARRAY_FL_GLOBAL && tr->max_buffer.buffer)
		if (tr->max_buffer.buffer)
		ring_buffer_set_clock(tr->max_buffer.buffer, trace_clocks[i].func);
		tracing_reset_online_cpus(&tr->max_buffer);
		#endif