[v4,08/15] ring-buffer: Make sure the spare sub buffer used for reads has same size

Commit Message

Steven Rostedt Dec. 15, 2023, 5:55 p.m. UTC

From: "Steven Rostedt (Google)" <[e-mail]>

Now that the ring buffer specifies the size of its sub buffers, they all
need to be the same size. When doing a read, a swap is done with a spare
page. Make sure they are the same size before doing the swap, otherwise
the read will fail.

Signed-off-by: Steven Rostedt (Google) <[e-mail]>
---
 kernel/trace/trace.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Patch

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index d4d4e7c7357f..c148797afe6d 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7589,6 +7589,7 @@  struct ftrace_buffer_info {
 	struct trace_iterator	iter;
 	void			*spare;
 	unsigned int		spare_cpu;
+	unsigned int		spare_size;
 	unsigned int		read;
 };
 
@@ -8308,6 +8309,15 @@  tracing_buffers_read(struct file *filp, char __user *ubuf,
 
 	page_size = ring_buffer_subbuf_size_get(iter->array_buffer->buffer);
 
+	/* Make sure the spare matches the current sub buffer size */
+	if (info->spare) {
+		if (page_size != info->spare_size) {
+			ring_buffer_free_read_page(iter->array_buffer->buffer,
+						   info->spare_cpu, info->spare);
+			info->spare = NULL;
+		}
+	}
+
 	if (!info->spare) {
 		info->spare = ring_buffer_alloc_read_page(iter->array_buffer->buffer,
 							  iter->cpu_file);
@@ -8316,6 +8326,7 @@  tracing_buffers_read(struct file *filp, char __user *ubuf,
 			info->spare = NULL;
 		} else {
 			info->spare_cpu = iter->cpu_file;
+			info->spare_size = page_size;
 		}
 	}
 	if (!info->spare)