The array length is the total size in bytes of the data for the current event. It is possible to compress this value into the event header type, which has 28 unused types, saving 32 bits for sufficiently small events.
The compressed length is expressed as a multiple of the ring-buffer alignment, 4-bytes by default. Enforces this alignment. Signed-off-by: Vincent Donnefort <[email protected]> diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_buffer.c index f4642f5adda3..1a97d17cca24 100644 --- a/kernel/trace/simple_ring_buffer.c +++ b/kernel/trace/simple_ring_buffer.c @@ -207,7 +207,15 @@ static unsigned long rb_event_size(unsigned long length) { struct ring_buffer_event *event; - return length + RB_EVNT_HDR_SIZE + sizeof(event->array[0]); + if (!length) + length++; + + length = ALIGN(length, RB_ALIGNMENT); + + if (length > RB_MAX_SMALL_DATA) + length += sizeof(event->array[0]); + + return length + RB_EVNT_HDR_SIZE; } static struct ring_buffer_event * @@ -223,12 +231,15 @@ rb_event_add_ts_extend(struct ring_buffer_event *event, u64 delta) static struct ring_buffer_event * simple_rb_reserve_next(struct simple_rb_per_cpu *cpu_buffer, unsigned long length, u64 timestamp) { - unsigned long ts_ext_size = 0, event_size = rb_event_size(length); struct simple_buffer_page *tail = cpu_buffer->tail_page; + unsigned long event_size, array_size, ts_ext_size = 0; struct ring_buffer_event *event; u32 write, prev_write; u64 time_delta; + event_size = rb_event_size(length); + array_size = event_size - RB_EVNT_HDR_SIZE; + time_delta = timestamp - cpu_buffer->write_stamp; if (test_time_stamp(time_delta)) @@ -259,9 +270,13 @@ simple_rb_reserve_next(struct simple_rb_per_cpu *cpu_buffer, unsigned long lengt time_delta = 0; } - event->type_len = 0; + if (length > RB_MAX_SMALL_DATA) { + event->type_len = 0; + event->array[0] = array_size; + } else { + event->type_len = DIV_ROUND_UP(array_size, RB_ALIGNMENT); + } event->time_delta = time_delta; - event->array[0] = event_size - RB_EVNT_HDR_SIZE; return event; } @@ -284,7 +299,7 @@ void *simple_ring_buffer_reserve(struct simple_rb_per_cpu *cpu_buffer, unsigned rb_event = simple_rb_reserve_next(cpu_buffer, length, timestamp); - return &rb_event->array[1]; + return rb_event->type_len ? &rb_event->array[0] : &rb_event->array[1]; } EXPORT_SYMBOL_GPL(simple_ring_buffer_reserve); -- 2.54.0.1032.g2f8565e1d1-goog
