Skip to contentSkip to conversation

ring-buffer: Fix reader page read offset for remote buffers

PATCH In review Vincent Donnefort 2 participants 2 messages Jul 29

Subsystems (2)
lore
Share & tools
lore

Vincent Donnefort

author maintainer
#0 lore raw

PATCH 1/1 ring-buffer: Fix reader page read offset for remote buffers

A page swapped in by __rb_get_reader_page_from_remote() retains its stale read offset, causing subsequent reads to skip events or read past valid data. Fix it.

Fixes fbd1743ecba1 ("ring-buffer: Add non-consuming read for ring-buffer remotes")
kernel/trace/ring_buffer.c +1 -0
index 804ccae694d2..78d3875a47a5 100644
@@ -5783,6 +5783,7 @@ __rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer)
 
 	cpu_buffer->head_page = new_head;
 	cpu_buffer->reader_page = new_reader;
+	cpu_buffer->reader_page->read = 0;
 	cpu_buffer->pages = &new_head->list;
 	cpu_buffer->read_stamp = new_reader->page->time_stamp;
 	cpu_buffer->lost_events = cpu_buffer->meta_page->reader.lost_events;

base-commit: f5098b6bae761e346ebcd9da7f95622c04733cff

Signature · 1 line
2.55.0.487.gaf234c4eb3-goog
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 6 lines · Vincent Donnefort

A page swapped in by __rb_get_reader_page_from_remote() retains its stale read offset, causing subsequent reads to skip events or read past valid data. Fix it.

Fixes fbd1743ecba1 ("ring-buffer: Add non-consuming read for ring-buffer remotes")
Quoted 17 lines
kernel/trace/ring_buffer.c +1 -0
index 804ccae694d2..78d3875a47a5 100644
@@ -5783,6 +5783,7 @@ __rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer)
 
 	cpu_buffer->head_page = new_head;
 	cpu_buffer->reader_page = new_reader;
+	cpu_buffer->reader_page->read = 0;
 	cpu_buffer->pages = &new_head->list;
 	cpu_buffer->read_stamp = new_reader->page->time_stamp;
 	cpu_buffer->lost_events = cpu_buffer->meta_page->reader.lost_events;

base-commit: f5098b6bae761e346ebcd9da7f95622c04733cff

Signature · 1 line
2.55.0.487.gaf234c4eb3-goog