ring-buffer: Updates for 6.14
Subsystems (2)
Steven Rostedt
maintainercover ring-buffer: Updates for 6.14
git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ring-buffer/for-next
Head SHA1: 6e31b759b076eebb4184117234f0c4eb9e4bc460
Jeongjun Park (1):
ring-buffer: Make reading page consistent with the code logic
Vincent Donnefort (1):
ring-buffer: Check for empty ring-buffer with rb_num_of_entries()
----
kernel/trace/ring_buffer.c | 63 +++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 46 deletions(-)
Steven Rostedt
maintainerPATCH 1/2 ring-buffer: Check for empty ring-buffer with rb_num_of_entries()
From: Vincent Donnefort <[email protected]>
Currently there are two ways of identifying an empty ring-buffer. One relying on the current status of the commit / reader page (rb_per_cpu_empty()) and the other on the write and read counters (rb_num_of_entries() used in rb_get_reader_page()).
with rb_num_of_entries(). This intends to ease later introduction of ring-buffer writers which are out of the kernel control and with whom, the only information available is through the meta-page counters.
--- kernel/trace/ring_buffer.c | 59 +++++++++----------------------------- 1 file changed, 14 insertions(+), 45 deletions(-)
kernel/trace/ring_buffer.c +14 -45
@@ -4682,40 +4682,22 @@ int ring_buffer_write(struct trace_buffer *buffer, }EXPORT_SYMBOL_GPL (ring_buffer_write); -static bool rb_per_cpu_empty (struct ring_buffer_per_cpu *cpu_buffer) +/* +* The total entries in the ring buffer is the running counter +* of entries entered into the ring buffer, minus the sum of +* the entries read from the ring buffer and the number of +* entries that were overwritten. +*/ +static inline unsigned long +rb_num_of_entries (struct ring_buffer_per_cpu *cpu_buffer) { -struct buffer_page *reader = cpu_buffer->reader_page; -struct buffer_page *head =rb_set_head_page (cpu_buffer); -struct buffer_page *commit = cpu_buffer->commit_page; - -/* In case of error, head will be NULL */ -if (unlikely (!head)) -return true; - -/* Reader should exhaust content in reader page */ -if (reader->read !=rb_page_size (reader)) -return false; - -/* -* If writers are committing on the reader page, knowing all -* committed content has been read, the ring buffer is empty. -*/ -if (commit == reader) -return true; - -/* -* If writers are committing on a page other than reader page -* and head page, there should always be content to read. -*/ -if (commit != head) -return false; +return local_read (&cpu_buffer->entries) - + (local_read (&cpu_buffer->overrun) + cpu_buffer->read); +} -/* -* Writers are committing on the head page, we just need -* to care about there're committed data, and the reader will -* swap reader page with head page when it is to read data. -*/ -return rb_page_commit (commit) ==0 ; +static bool rb_per_cpu_empty (struct ring_buffer_per_cpu *cpu_buffer) +{ +return !rb_num_of_entries (cpu_buffer); }/**
@@ -4861,19 +4843,6 @@ void ring_buffer_record_enable_cpu(struct trace_buffer *buffer, int cpu) }EXPORT_SYMBOL_GPL (ring_buffer_record_enable_cpu); -/* -* The total entries in the ring buffer is the running counter -* of entries entered into the ring buffer, minus the sum of -* the entries read from the ring buffer and the number of -* entries that were overwritten. -*/ -static inline unsigned long -rb_num_of_entries (struct ring_buffer_per_cpu *cpu_buffer) -{ -return local_read (&cpu_buffer->entries) - - (local_read (&cpu_buffer->overrun) + cpu_buffer->read); -} -/** * ring_buffer_oldest_event_ts - get the oldest event timestamp from the buffer * @buffer: The ring buffer
Signature · 1 line
2.45.2
Steven Rostedt
maintainerPATCH 2/2 ring-buffer: Make reading page consistent with the code logic
In reply to Steven RostedtFrom: Jeongjun Park <[email protected]>
In the loop of __rb_map_vma(), the 's' variable is calculated from the same logic that nr_pages is and they both come from nr_subbufs. But the relationship is not obvious and there's a WARN_ON_ONCE() around the 's' variable to make sure it never becomes equal to nr_subbufs within the loop. If that happens, then the code is buggy and needs to be fixed.
The 'page' variable is calculated from cpu_buffer->subbuf_ids[s] which is an array of 'nr_subbufs' entries. If the code becomes buggy and 's' becomes equal to or greater than 'nr_subbufs' then this will be an out of bounds hit before the WARN_ON() is triggered and the code exiting safely.
Make the 'page' initialization consistent with the code logic and assign it after the out of bounds check.
--- kernel/trace/ring_buffer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
kernel/trace/ring_buffer.c +3 -1
@@ -7028,7 +7028,7 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, }while (p < nr_pages) { -struct page *page =virt_to_page ((void *)cpu_buffer->subbuf_ids[s]); +struct page *page;int off =0 ;if (WARN_ON_ONCE (s >= nr_subbufs)) {
@@ -7036,6 +7036,8 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, goto out; } + page =virt_to_page ((void *)cpu_buffer->subbuf_ids[s]); +for (; off < (1 << (subbuf_order)); off++, page++) {if (p >= nr_pages)break ;
Signature · 1 line
2.45.2