From: Mathieu Desnoyers Date: Fri, 9 Oct 2015 16:24:23 +0000 (-0400) Subject: Fix: lttng trace-clock needs to disable preemption X-Git-Tag: v2.6.5~4 X-Git-Url: https://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=d3a177c909622313ef3a314e0ce812b0aca9d5ad Fix: lttng trace-clock needs to disable preemption We use a per-cpu data structure, and some contexts (e.g. buffer create) call this function with preemption enabled. This is the case also for buffer flush operation. Signed-off-by: Mathieu Desnoyers --- diff --git a/wrapper/trace-clock.h b/wrapper/trace-clock.h index d7d18429..561094b3 100644 --- a/wrapper/trace-clock.h +++ b/wrapper/trace-clock.h @@ -90,7 +90,7 @@ static inline u64 trace_clock_fixup(u64 src_now, u64 last) #endif /* #else #if (BITS_PER_LONG == 32) */ /* - * Always called with preemption disabled. Can be interrupted. + * Sometimes called with preemption enabled. Can be interrupted. */ static inline u64 trace_clock_monotonic_wrapper(void) { @@ -99,6 +99,7 @@ static inline u64 trace_clock_monotonic_wrapper(void) local_t *last_tsc; /* Use fast nmi-safe monotonic clock provided by the Linux kernel. */ + preempt_disable(); last_tsc = lttng_this_cpu_ptr(<tng_last_tsc); last = local_read(last_tsc); /* @@ -112,6 +113,7 @@ static inline u64 trace_clock_monotonic_wrapper(void) if (((long) now - (long) last) < 0) now = trace_clock_fixup(now, last); result = local_cmpxchg(last_tsc, last, (unsigned long) now); + preempt_enable(); if (result == last) { /* Update done. */ return now;