In rb_reserve_next_event(), the absolute timestamp path compares length
against rb_subbuf_max_data_size(). The latter subtracts the event
header while rb_calculate_event_length() already accounts for it, which
incorrectly rejects valid reservations of ring_buffer_max_event_size().
Compare against commit_page capacity instead so event headers are
accounted for consistently on both sides. This check also applies to
normal timestamp mode, so share it across both paths.
In rb_reserve_next_event(), commit_page is stable and avoids accessing
the mutex-protected buffer::subbuf_order, rendering the early calls to
rb_subbuf_max_data_size() in ring_buffer_lock_reserve() and
ring_buffer_write() unnecessary. Drop them.
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
---
kernel/trace/ring_buffer.c | 44 ++++++++++++++------------------------
1 file changed, 16 insertions(+), 28 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 80f500ffd7ac..9834f9dae440 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -625,23 +625,6 @@ static __always_inline unsigned int rb_subbuf_capacity(struct trace_buffer *buff
return rb_subbuf_size(buffer) - BUF_PAGE_HDR_SIZE;
}
-/**
- * rb_subbuf_max_data_size - Get the maximum payload size of a single event
- * @buffer: A trace buffer
- *
- * Return: The maximum data payload size that can be stored in a single event.
- */
-static __always_inline unsigned int rb_subbuf_max_data_size(struct trace_buffer *buffer)
-{
- struct ring_buffer_event *event;
-
- /*
- * surely rb_subbuf_capacity() is bigger than
- * RINGBUF_TYPE_DATA_TYPE_LEN_MAX (see ring_buffer_event_length).
- */
- return rb_subbuf_capacity(buffer) - RB_EVNT_HDR_SIZE - sizeof(event->array[0]);
-}
-
static unsigned long rb_calculate_nr_pages(struct trace_buffer *buffer, unsigned long size)
{
return max(DIV_ROUND_UP(size, rb_subbuf_capacity(buffer)), RING_BUFFER_MIN_NR_PAGES);@@ -4143,7 +4126,7 @@ rb_update_event(struct ring_buffer_per_cpu *cpu_buffer,
event->type_len = DIV_ROUND_UP(length, RB_ALIGNMENT);
}
-static unsigned rb_calculate_event_length(unsigned length)
+static unsigned long rb_calculate_event_length(unsigned long length)
{
struct ring_buffer_event event; /* Used only for sizeof array */
@@ -4986,12 +4969,13 @@ rb_reserve_next_event(struct trace_buffer *buffer,
if (ring_buffer_time_stamp_abs(cpu_buffer->buffer)) {
add_ts_default = RB_ADD_STAMP_ABSOLUTE;
info.length += RB_LEN_TIME_EXTEND;
- if (info.length > rb_subbuf_max_data_size(cpu_buffer->buffer))
- goto out_fail;
} else {
add_ts_default = RB_ADD_STAMP_NONE;
}
+ if (unlikely(info.length > rb_page_capacity(cpu_buffer->commit_page)))
+ goto out_fail;
+
again:
info.add_timestamp = add_ts_default;
info.delta = 0;@@ -5061,9 +5045,6 @@ ring_buffer_lock_reserve(struct trace_buffer *buffer, unsigned long length)
if (unlikely(atomic_read(&cpu_buffer->record_disabled)))
goto out;
- if (unlikely(length > rb_subbuf_max_data_size(buffer)))
- goto out;
-
if (unlikely(trace_recursive_lock(cpu_buffer)))
goto out;
@@ -5208,9 +5189,6 @@ int ring_buffer_write(struct trace_buffer *buffer,
if (atomic_read(&cpu_buffer->record_disabled))
return -EBUSY;
- if (length > rb_subbuf_max_data_size(buffer))
- return -EBUSY;
-
if (unlikely(trace_recursive_lock(cpu_buffer)))
return -EBUSY;
@@ -6575,11 +6553,21 @@ EXPORT_SYMBOL_GPL(ring_buffer_capacity);
*/
unsigned long ring_buffer_max_event_size(struct trace_buffer *buffer)
{
+ struct ring_buffer_event *event;
+ unsigned long max_data_size;
+
+ /*
+ * surely rb_subbuf_capacity() is bigger than
+ * RINGBUF_TYPE_DATA_TYPE_LEN_MAX (see ring_buffer_event_length).
+ */
+ max_data_size = rb_subbuf_capacity(buffer) - RB_EVNT_HDR_SIZE -
+ sizeof(event->array[0]);
+
/* If abs timestamp is requested, events have a timestamp too */
if (ring_buffer_time_stamp_abs(buffer))
- return rb_subbuf_max_data_size(buffer) - RB_LEN_TIME_EXTEND;
+ return max_data_size - RB_LEN_TIME_EXTEND;
- return rb_subbuf_max_data_size(buffer);
+ return max_data_size;
}
EXPORT_SYMBOL_GPL(ring_buffer_max_event_size);
--
2.56.0.567.gdb80ae8cd5-goog