Commit 0bea55ab authored Mar 19, 2024 by Steven Rostedt (Google) Committed by Peng Zhang Mar 19, 2024

ring-buffer: Have saved event hold the entire event

stable inclusion
from stable-v6.6.8
commit 307ed139d7af56502698438f0a737e4c7dfcac82
bugzilla: https://gitee.com/openeuler/kernel/issues/I99K53

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=307ed139d7af56502698438f0a737e4c7dfcac82

--------------------------------

commit b049525855fdd0024881c9b14b8fbec61c3f53d3 upstream.

For the ring buffer iterator (non-consuming read), the event needs to be
copied into the iterator buffer to make sure that a writer does not
overwrite it while the user is reading it. If a write happens during the
copy, the buffer is simply discarded.

But the temp buffer itself was not big enough. The allocation of the
buffer was only BUF_MAX_DATA_SIZE, which is the maximum data size that can
be passed into the ring buffer and saved. But the temp buffer needs to
hold the meta data as well. That would be BUF_PAGE_SIZE and not
BUF_MAX_DATA_SIZE.

Link: https://lore.kernel.org/linux-trace-kernel/20231212072558.61f76493@gandalf.local.home



Cc: stable@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Fixes: 785888c5 ("ring-buffer: Have rb_iter_head_event() handle concurrent writer")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>

parent e153da08

kernel/trace/ring_buffer.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -2416,7 +2416,7 @@ rb_iter_head_event(struct ring_buffer_iter *iter)
		*/
		barrier();

		if ((iter->head + length) > commit \|\| length > BUF_MAX_DATA_SIZE)
		if ((iter->head + length) > commit \|\| length > BUF_PAGE_SIZE)
		/* Writer corrupted the read? */
		goto reset;

		@@ -5120,7 +5120,8 @@ ring_buffer_read_prepare(struct trace_buffer *buffer, int cpu, gfp_t flags)
		if (!iter)
		return NULL;

		iter->event = kmalloc(BUF_MAX_DATA_SIZE, flags);
		/* Holds the entire event: data and meta data */
		iter->event = kmalloc(BUF_PAGE_SIZE, flags);
		if (!iter->event) {
		kfree(iter);
		return NULL;