tracing: Fix unload_page for simple_ring_buffer init rollback

a0a2f42a · Vincent Donnefort <[email protected]> · 2026-05-12 15:16:14 +01:00

The unload_page callback expects the return value of load_page() as its
argument: ret = load_page(va); unload(ret). Fix the rollback code in
simple_ring_buffer_init_mm() where the descriptor's VA is used instead
of the loaded page address.

Link: https://patch.msgid.link/[email protected]
Fixes: 635923081c79 ("tracing: load/unload page callbacks for simple_ring_buffer")
Signed-off-by: Vincent Donnefort <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>

Commit: a0a2f42a37f90b29d8c43374dd9c8bd2f3e7bdcc
Parents: c2d2856c

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
kernel/trace/simple_ring_buffer.c	modified	+1	−1	View file

kernel/trace/simple_ring_buffer.c

View file

diff --git a/kernel/trace/simple_ring_buffer.c b/kernel/trace/simple_ring_buffer.c
index f731f14..f4642f5 100644
--- a/kernel/trace/simple_ring_buffer.c
+++ b/kernel/trace/simple_ring_buffer.c
@@ -430,7 +430,7 @@ int simple_ring_buffer_init_mm(struct simple_rb_per_cpu *cpu_buffer,
 
 	if (ret) {
 		for (i--; i >= 0; i--)
-			unload_page((void *)desc->page_va[i]);
+			unload_page(bpages[i].page);
 		unload_page(cpu_buffer->meta);
 
 		return ret;