All of lore.kernel.org
 help / color / mirror / Atom feed
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 3/9] ring-buffer: Hold cpu_buffer::lock when resizing a subbuf
Date: Fri, 14 Aug 2026 08:41:26 -0400	[thread overview]
Message-ID: <20260814124141.810285258@kernel.org> (raw)
In-Reply-To: 20260814124123.133362396@kernel.org

From: Vincent Donnefort <vdonnefort@google.com>

Because, ring_buffer_subbuf_order_set() can clear cpu_buffer->free_page,
hold cpu_buffer->lock to prevent races with
ring_buffer_alloc_read_page() and ring_buffer_free_read_page().

Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260813131152.3589632-3-vdonnefort@google.com
Fixes: 8e7b58c27b3c ("ring-buffer: Just update the subbuffers when changing their allocation order")
Reported-by: Sashiko <sashiko-bot@kernel.org>
Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/ring_buffer.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 73a3fb76ba4d..0479c404db03 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -7431,8 +7431,10 @@ int ring_buffer_subbuf_order_set(struct trace_buffer *buffer, int order)
 		cpu_buffer->nr_pages = cpu_buffer->nr_pages_to_update;
 		cpu_buffer->nr_pages_to_update = 0;
 
+		arch_spin_lock(&cpu_buffer->lock);
 		old_free_data_page = cpu_buffer->free_page;
 		cpu_buffer->free_page = NULL;
+		arch_spin_unlock(&cpu_buffer->lock);
 
 		rb_head_page_activate(cpu_buffer);
 
-- 
2.53.0



  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 ` [for-next][PATCH 2/9] ring-buffer: Free cpu_buffer::free_page with subbuf_order Steven Rostedt
2026-08-14 12:41 ` Steven Rostedt [this message]
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.810285258@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 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.