public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@kernel.org>
To: linux-kernel@vger.kernel.org, linux-trace-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>
Subject: [PATCH v2 06/10] tracing: Make tracing_update_buffers() take NULL for global_trace
Date: Sat, 07 Feb 2026 22:24:23 -0500	[thread overview]
Message-ID: <20260208032450.318864210@kernel.org> (raw)
In-Reply-To: 20260208032417.262341179@kernel.org

From: Steven Rostedt <rostedt@goodmis.org>

The trace.c file has become a dumping ground for all tracing code and has
become quite large. In order to move the trace_printk functions out of it
these functions can not access global_trace directly, as that is something
that needs to stay static in trace.c.

Have tracing_update_buffers() take NULL for its trace_array to denote it
should work on the global_trace top level trace_array allows that function
to be used outside of trace.c and still update the global_trace
trace_array.

Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4a73822e2603..601b6f622391 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3234,7 +3234,7 @@ void trace_printk_init_buffers(void)
 	pr_warn("**********************************************************\n");
 
 	/* Expand the buffers to set size */
-	if (tracing_update_buffers(&global_trace) < 0)
+	if (tracing_update_buffers(NULL) < 0)
 		pr_err("Failed to expand tracing buffers for trace_printk() calls\n");
 	else
 		buffers_allocated = 1;
@@ -6186,6 +6186,9 @@ int tracing_update_buffers(struct trace_array *tr)
 {
 	int ret = 0;
 
+	if (!tr)
+		tr = &global_trace;
+
 	guard(mutex)(&trace_types_lock);
 
 	update_last_data(tr);
-- 
2.51.0



  parent reply	other threads:[~2026-02-08  3:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-08  3:24 [PATCH v2 00/10] tracing: Clean up trace.c and move some code into other files Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 01/10] tracing: Make tracing_disabled global for tracing system Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 02/10] tracing: Make tracing_selftest_running global to the tracing subsystem Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 03/10] tracing: Move __trace_buffer_{un}lock_*() functions to trace.h Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 04/10] tracing: Move ftrace_trace_stack() out of trace.c and into trace.h Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 05/10] tracing: Make printk_trace global for tracing system Steven Rostedt
2026-02-08  3:24 ` Steven Rostedt [this message]
2026-02-08  3:24 ` [PATCH v2 07/10] tracing: Have trace_printk functions use flags instead of using global_trace Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 08/10] tracing: Use system_state in trace_printk_init_buffers() Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 09/10] tracing: Move trace_printk functions out of trace.c and into trace_printk.c Steven Rostedt
2026-02-08  3:24 ` [PATCH v2 10/10] tracing: Move pid filtering into trace_pid.c 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=20260208032450.318864210@kernel.org \
    --to=rostedt@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    /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