mirror of
https://github.com/torvalds/linux.git
synced 2026-07-27 17:47:41 +02:00
ring-buffer: Fix ring_buffer_read_page() copying only one event per page
Commit8928e4a3be("ring-buffer: Show persistent buffer dropped events in trace_pipe file") split the "commit" variable in ring_buffer_read_page() into "commit" (raw) and "size" (masked page size), but the inner copy loop's terminator was changed to compare rpos against "event_size" instead of "size". rpos is the cumulative read offset within the page; event_size is the length of the single event just copied. The loop thus breaks after the first event, so only one event is copied per call. This regresses the per-event memcpy path (partial reads, the active commit page, and mapped/remote buffers) used by splice/trace_pipe_raw and mmap consumers into a one-event-at-a-time read. Compare rpos against the page size as the original code did. Link: https://patch.msgid.link/20260616175538.111628-1-devnexen@gmail.com Fixes:8928e4a3be("ring-buffer: Show persistent buffer dropped events in trace_pipe file") Signed-off-by: David Carlier <devnexen@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
a20b08de86
commit
af05b4e062
|
|
@ -7175,7 +7175,7 @@ int ring_buffer_read_page(struct trace_buffer *buffer,
|
|||
rpos = reader->read;
|
||||
pos += event_size;
|
||||
|
||||
if (rpos >= event_size)
|
||||
if (rpos >= size)
|
||||
break;
|
||||
|
||||
event = rb_reader_event(cpu_buffer);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user