Skip to contentSkip to conversation

tracing: Apply trace_clock changes to instance max buffer

PATCH New Steven Rostedt 1 participant 1 message Sep 7, 2017 Tracing

lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

PATCH 1/1 tracing: Apply trace_clock changes to instance max buffer

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
for-next

Head SHA1: 170b3b1050e28d1ba0700e262f0899ffa4fccc52

Baohong Liu (1):
tracing: Apply trace_clock changes to instance max buffer

----

 kernel/trace/trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 170b3b1050e28d1ba0700e262f0899ffa4fccc52
Author: Baohong Liu <[email protected]>
Date:   Tue Sep 5 16:57:19 2017 -0500

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.

Fixes 277ba0446 ("tracing: Add interface to allow multiple trace buffers")
kernel/trace/trace.c +1 -1
index 78842557eea0..5360b7aec57a 100644
@@ -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