The ring_buffer_per_cpu::cnt member tracks modifications to the ring buffer links. It was introduced for rb_check_pages() to avoid locking the ring buffer for the entire duration of the check. The reader page swap function for remote ring buffers does not update it. If a concurrent rb_check_pages() recorded a page as head before dropping the reader lock, it misses the list update and loops indefinitely. Add the missing increment. Fixes: fbd1743ecba1 ("ring-buffer: Add non-consuming read for ring-buffer remotes") Reported-by: Sashiko Cc: stable@vger.kernel.org Signed-off-by: Vincent Donnefort --- kernel/trace/ring_buffer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 1fd28a72e6ee..d386da1414ed 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -5878,6 +5878,7 @@ __rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer) 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; + cpu_buffer->cnt++; return rb_page_size(cpu_buffer->reader_page) ? cpu_buffer->reader_page : NULL; } base-commit: 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 -- 2.56.1.703.gf848ed807c-goog