From: Steven Rostedt <rostedt@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Andrew Morton <akpm@linux-foundation.org>,
stable@vger.kernel.org, Sashiko <sashiko-bot@kernel.org>,
Vincent Donnefort <vdonnefort@google.com>
Subject: [for-next][PATCH 2/9] ring-buffer: Free cpu_buffer::free_page with subbuf_order
Date: Fri, 14 Aug 2026 08:41:25 -0400 [thread overview]
Message-ID: <20260814124141.646190168@kernel.org> (raw)
In-Reply-To: 20260814124123.133362396@kernel.org
From: Vincent Donnefort <vdonnefort@google.com>
When sub-buffers use an order greater than 0, cpu_buffer->free_page is
allocated with subbuf_order. Use the correct order for
cpu_buffer->free_page.
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260813131152.3589632-2-vdonnefort@google.com
Fixes: f9b94daa542a ("ring-buffer: Set new size of the ring buffer sub page")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 8f34ff6fd066..73a3fb76ba4d 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2631,7 +2631,7 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)
free_buffer_page(bpage);
}
- free_page((unsigned long)cpu_buffer->free_page);
+ free_pages((unsigned long)cpu_buffer->free_page, cpu_buffer->buffer->subbuf_order);
kfree(cpu_buffer);
}
--
2.53.0
next prev parent reply other threads:[~2026-08-14 12:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-14 12:41 [for-next][PATCH 0/9] ring-buffer: Updates for v7.3 Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 1/9] ring-buffer: drop unneeded semicolon Steven Rostedt
2026-08-14 12:41 ` Steven Rostedt [this message]
2026-08-14 12:41 ` [for-next][PATCH 3/9] ring-buffer: Hold cpu_buffer::lock when resizing a subbuf Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 4/9] ring-buffer: Make cpu_buffer::free_page a buffer_data_read_page Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 5/9] ring-buffer: Fix subbuf resize race with ring buffer readers Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 6/9] ring-buffer: Fix subbuf resize race with ring_buffer_alloc_read_page() Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 7/9] ring-buffer: Dynamically calculate max_data_size Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 8/9] ring-buffer: Remove trace_buffer::cpus Steven Rostedt
2026-08-14 12:41 ` [for-next][PATCH 9/9] ring-buffer: Remove ring_buffer_per_cpu::mapped Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260814124141.646190168@kernel.org \
--to=rostedt@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=sashiko-bot@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vdonnefort@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox