From: Steven Rostedt <rostedt@goodmis.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>,
Tzvetomir Stoyanov <tz.stoyanov@gmail.com>,
Vincent Donnefort <vdonnefort@google.com>,
Kent Overstreet <kent.overstreet@gmail.com>
Subject: [for-next][PATCH 06/16] ring-buffer: Clear pages on error in ring_buffer_subbuf_order_set() failure
Date: Thu, 21 Dec 2023 11:10:30 -0500 [thread overview]
Message-ID: <20231221161103.912510492@goodmis.org> (raw)
In-Reply-To: 20231221161024.478795180@goodmis.org
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
On failure to allocate ring buffer pages, the pointer to the CPU buffer
pages is freed, but the pages that were allocated previously were not.
Make sure they are freed too.
Link: https://lore.kernel.org/linux-trace-kernel/20231219185629.179352802@goodmis.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
Cc: Vincent Donnefort <vdonnefort@google.com>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Fixes: f9b94daa542a ("tracing: Set new size of the ring buffer sub page")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index c2afcf98ea91..3c11e8e811ed 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -5927,6 +5927,7 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order)
for_each_buffer_cpu(buffer, cpu) {
if (!cpu_buffers[cpu])
continue;
+ rb_free_cpu_buffer(cpu_buffers[cpu]);
kfree(cpu_buffers[cpu]);
}
kfree(cpu_buffers);
--
2.42.0
next prev parent reply other threads:[~2023-12-21 16:10 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-21 16:10 [for-next][PATCH 00/16] tracing: Add dynamic sub-buffer size for 6.8 Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 01/16] ring-buffer: Have ring_buffer_print_page_header() be able to access ring_buffer_iter Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 02/16] ring-buffer: Page size per ring buffer Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 03/16] ring-buffer: Add interface for configuring trace sub buffer size Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 04/16] ring-buffer: Set new size of the ring buffer sub page Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 05/16] ring-buffer: Read and write to ring buffers with custom sub buffer size Steven Rostedt
2023-12-21 16:10 ` Steven Rostedt [this message]
2023-12-21 16:10 ` [for-next][PATCH 07/16] ring-buffer: Do no swap cpu buffers if order is different Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 08/16] ring-buffer: Make sure the spare sub buffer used for reads has same size Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 09/16] tracing: Update snapshot order along with main buffer order Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 10/16] tracing: Stop the tracing while changing the ring buffer subbuf size Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 11/16] ring-buffer: Keep the same size when updating the order Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 12/16] ring-buffer: Just update the subbuffers when changing their allocation order Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 13/16] ring-buffer: Add documentation on the buffer_subbuf_order file Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 14/16] ringbuffer/selftest: Add basic selftest to test changing subbuf order Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 15/16] tracing: Update subbuffer with kilobytes not page order Steven Rostedt
2023-12-21 16:10 ` [for-next][PATCH 16/16] ring-buffer: Use subbuf_order for buffer page masking 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=20231221161103.912510492@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=tz.stoyanov@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.