Skip to content

Commit 9e45e39

Browse files
committed
ring-buffer: Do not update before stamp when switching sub-buffers
The ring buffer timestamps are synchronized by two timestamp placeholders. One is the "before_stamp" and the other is the "write_stamp" (sometimes referred to as the "after stamp" but only in the comments. These two stamps are key to knowing how to handle nested events coming in with a lockless system. When moving across sub-buffers, the before stamp is updated but the write stamp is not. There's an effort to put back the before stamp to something that seems logical in case there's nested events. But as the current event is about to cross sub-buffers, and so will any new nested event that happens, updating the before stamp is useless, and could even introduce new race conditions. The first event on a sub-buffer simply uses the sub-buffer's timestamp and keeps a "delta" of zero. The "before_stamp" and "write_stamp" are not used in the algorithm in this case. There's no reason to try to fix the before_stamp when this happens. As a bonus, it removes a cmpxchg() when crossing sub-buffers! Link: https://lore.kernel.org/linux-trace-kernel/[email protected] Cc: [email protected] Cc: Mark Rutland <[email protected]> Cc: Mathieu Desnoyers <[email protected]> Fixes: a389d86 ("ring-buffer: Have nested events still record running time stamp") Reviewed-by: Masami Hiramatsu (Google) <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent d06aff1 commit 9e45e39

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

kernel/trace/ring_buffer.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3607,14 +3607,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
36073607

36083608
/* See if we shot pass the end of this buffer page */
36093609
if (unlikely(write > BUF_PAGE_SIZE)) {
3610-
/* before and after may now different, fix it up*/
3611-
b_ok = rb_time_read(&cpu_buffer->before_stamp, &info->before);
3612-
a_ok = rb_time_read(&cpu_buffer->write_stamp, &info->after);
3613-
if (a_ok && b_ok && info->before != info->after)
3614-
(void)rb_time_cmpxchg(&cpu_buffer->before_stamp,
3615-
info->before, info->after);
3616-
if (a_ok && b_ok)
3617-
check_buffer(cpu_buffer, info, CHECK_FULL_PAGE);
3610+
check_buffer(cpu_buffer, info, CHECK_FULL_PAGE);
36183611
return rb_move_tail(cpu_buffer, tail, info);
36193612
}
36203613

0 commit comments

Comments
 (0)