Skip to content

Commit 8785f51

Browse files
Andrea Righirostedt
authored andcommitted
ring-buffer: Set the right timestamp in the slow path of __rb_reserve_next()
In the slow path of __rb_reserve_next() a nested event(s) can happen between evaluating the timestamp delta of the current event and updating write_stamp via local_cmpxchg(); in this case the delta is not valid anymore and it should be set to 0 (same timestamp as the interrupting event), since the event that we are currently processing is not the last event in the buffer. Link: https://lkml.kernel.org/r/X8IVJcp1gRE+FJCJ@xps-13-7390 Cc: Ingo Molnar <mingo@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: stable@vger.kernel.org Link: https://lwn.net/Articles/831207 Fixes: a389d86 ("ring-buffer: Have nested events still record running time stamp") Signed-off-by: Andrea Righi <andrea.righi@canonical.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
1 parent 55ea4cf commit 8785f51

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

kernel/trace/ring_buffer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3287,11 +3287,11 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
32873287
ts = rb_time_stamp(cpu_buffer->buffer);
32883288
barrier();
32893289
/*E*/ if (write == (local_read(&tail_page->write) & RB_WRITE_MASK) &&
3290-
info->after < ts) {
3290+
info->after < ts &&
3291+
rb_time_cmpxchg(&cpu_buffer->write_stamp,
3292+
info->after, ts)) {
32913293
/* Nothing came after this event between C and E */
32923294
info->delta = ts - info->after;
3293-
(void)rb_time_cmpxchg(&cpu_buffer->write_stamp,
3294-
info->after, ts);
32953295
info->ts = ts;
32963296
} else {
32973297
/*

0 commit comments

Comments
 (0)