Commit 6b76323e authored by Vincent Donnefort's avatar Vincent Donnefort Committed by Steven Rostedt (Google)
Browse files

ring-buffer: Zero ring-buffer sub-buffers 

In preparation for the ring-buffer memory mapping where each subbuf will
be accessible to user-space, zero all the page allocations.

Link: https://lore.kernel.org/linux-trace-kernel/20240220202310.2489614-2-vdonnefort@google.com



Signed-off-by: default avatarVincent Donnefort <vdonnefort@google.com>
Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 2cc621fd

kernel/trace/ring_buffer.c

+6 −3
Original line number Diff line number Diff line
@@ -1515,7 +1515,8 @@ static int __rb_allocate_pages(struct ring_buffer_per_cpu *cpu_buffer, 


		list_add(&bpage->list, pages);



		page = alloc_pages_node(cpu_to_node(cpu_buffer->cpu), mflags,

		page = alloc_pages_node(cpu_to_node(cpu_buffer->cpu),

					mflags | __GFP_ZERO,

					cpu_buffer->buffer->subbuf_order);

		if (!page)

			goto free_pages;
@@ -1600,7 +1601,8 @@ rb_allocate_cpu_buffer(struct trace_buffer *buffer, long nr_pages, int cpu) 


	cpu_buffer->reader_page = bpage;



	page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL, cpu_buffer->buffer->subbuf_order);

	page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL | __GFP_ZERO,

				cpu_buffer->buffer->subbuf_order);

	if (!page)

		goto fail_free_reader;

	bpage->page = page_address(page);
@@ -5568,7 +5570,8 @@ ring_buffer_alloc_read_page(struct trace_buffer *buffer, int cpu) 
	if (bpage->data)

		goto out;



	page = alloc_pages_node(cpu_to_node(cpu), GFP_KERNEL | __GFP_NORETRY,

	page = alloc_pages_node(cpu_to_node(cpu),

				GFP_KERNEL | __GFP_NORETRY | __GFP_ZERO,

				cpu_buffer->buffer->subbuf_order);

	if (!page) {

		kfree(bpage);