瀏覽代碼

ring_buffer: fix ring_buffer_event_length()

Function ring_buffer_event_length() provides an interface to detect
the length of data stored in an entry. However, the length contains
offsets depending on the internal usage. This makes it unusable. This
patch fixes this and now ring_buffer_event_length() returns the
alligned length that has been used in ring_buffer_lock_reserve().

Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Robert Richter <robert.richter@amd.com>
Robert Richter 16 年之前
父節點
當前提交
465634adc1
共有 1 個文件被更改,包括 7 次插入1 次删除
  1. 7 1
      kernel/trace/ring_buffer.c

+ 7 - 1
kernel/trace/ring_buffer.c

@@ -117,7 +117,13 @@ rb_event_length(struct ring_buffer_event *event)
  */
  */
 unsigned ring_buffer_event_length(struct ring_buffer_event *event)
 unsigned ring_buffer_event_length(struct ring_buffer_event *event)
 {
 {
-	return rb_event_length(event);
+	unsigned length = rb_event_length(event);
+	if (event->type != RINGBUF_TYPE_DATA)
+		return length;
+	length -= RB_EVNT_HDR_SIZE;
+	if (length > RB_MAX_SMALL_DATA + sizeof(event->array[0]))
+                length -= sizeof(event->array[0]);
+	return length;
 }
 }
 EXPORT_SYMBOL_GPL(ring_buffer_event_length);
 EXPORT_SYMBOL_GPL(ring_buffer_event_length);