Skip to content

Commit d28e96b

Browse files
bliu11-intelgregkh
authored andcommitted
tracing: Apply trace_clock changes to instance max buffer
commit 170b3b1050e28d1ba0700e262f0899ffa4fccc52 upstream. 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 Fixes: 277ba04 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 753154f commit d28e96b

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

kernel/trace/trace.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5237,7 +5237,7 @@ static int tracing_set_clock(struct trace_array *tr, const char *clockstr)
52375237
tracing_reset_online_cpus(&tr->trace_buffer);
52385238

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

0 commit comments

Comments
 (0)