• Steven Rostedt (VMware)'s avatar
    ring-buffer: Force before_stamp and write_stamp to be different on discard · 6f6be606
    Steven Rostedt (VMware) authored
    Part of the logic of the new time stamp code depends on the before_stamp and
    the write_stamp to be different if the write_stamp does not match the last
    event on the buffer, as it will be used to calculate the delta of the next
    event written on the buffer.
    
    The discard logic depends on this, as the next event to come in needs to
    inject a full timestamp as it can not rely on the last event timestamp in
    the buffer because it is unknown due to events after it being discarded. But
    by changing the write_stamp back to the time before it, it forces the next
    event to use a full time stamp, instead of relying on it.
    
    The issue came when a full time stamp was used for the event, and
    rb_time_delta() returns zero in that case. The update to the write_stamp
    (which subtracts delta) made it not change. Then when the event is removed
    from the buffer, because the before_stamp and write_stamp still match, the
    next event written would calculate its delta from the write_stamp, but that
    would be wrong as the write_stamp is of the time of the event that was
    discarded.
    
    In the case that the delta change being made to write_stamp is zero, set the
    before_stamp to zero as well, and this will force the next event to inject a
    full timestamp and not use the current write_stamp.
    
    Cc: stable@vger.kernel.org
    Fixes: a389d86f ("ring-buffer: Have nested events still record running time stamp")
    Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
    6f6be606
ring_buffer.c 156 KB