Commit 3fd49c9e authored Mar 30, 2018 by Chris Wilson Committed by Steven Rostedt (VMware) Apr 06, 2018

tracing: Default to using trace_global_clock if sched_clock is unstable

Across suspend, we may see a very large drift in timestamps if the sched
clock is unstable, prompting the global trace's ringbuffer code to warn
and suggest switching to the global clock. Preempt this request by
detecting when the sched clock is unstable (determined during
late_initcall) and automatically switching the default clock over to
trace_global_clock.

This should prevent requiring user interaction to resolve warnings such
as:

    Delta way too big! 18446743856563626466 ts=18446744054496180323 write stamp = 197932553857
    If you just came from a suspend/resume,
    please switch to the trace global clock:
    echo global > /sys/kernel/debug/tracing/trace_clock

Link: http://lkml.kernel.org/r/20180330150132.16903-1-chris@chris-wilson.co.uk



Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent a6fb6012

kernel/trace/trace.c

+19 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@
		#include <linux/nmi.h>
		#include <linux/fs.h>
		#include <linux/trace.h>
		#include <linux/sched/clock.h>
		#include <linux/sched/rt.h>

		#include "trace.h"
		@@ -8596,3 +8597,21 @@ __init static int clear_boot_tracer(void)

		fs_initcall(tracer_init_tracefs);
		late_initcall_sync(clear_boot_tracer);

		#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
		__init static int tracing_set_default_clock(void)
		{
		/* sched_clock_stable() is determined in late_initcall */
		if (trace_boot_clock \|\| sched_clock_stable()) {
		printk(KERN_WARNING
		"Unstable clock detected, switching default tracing clock to \"global\"\n"
		"If you want to keep using the local clock, then add:\n"
		" \"trace_clock=local\"\n"
		"on the kernel command line\n");
		tracing_set_clock(&global_trace, "global");
		}

		return 0;
		}
		late_initcall_sync(tracing_set_default_clock);
		#endif

Admin message