Commit f377912b authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

tracing: Have trace_printk functions use flags instead of using global_trace 

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.

Instead of testing the trace_array tr pointer to &global_trace, test the
tr->flags to see if TRACE_ARRAY_FL_GLOBAL set.

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>
Link: https://patch.msgid.link/20260208032450.491116245@kernel.org


Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 93c88d06

kernel/trace/trace.c

+5 −4
Original line number Diff line number Diff line
@@ -1071,7 +1071,8 @@ int __trace_array_puts(struct trace_array *tr, unsigned long ip, 
	if (!(tr->trace_flags & TRACE_ITER(PRINTK)))

		return 0;



	if (unlikely(tracing_selftest_running && tr == &global_trace))

	if (unlikely(tracing_selftest_running &&

		     (tr->flags & TRACE_ARRAY_FL_GLOBAL)))

		return 0;



	if (unlikely(tracing_disabled))
@@ -3386,7 +3387,7 @@ int __trace_array_vprintk(struct trace_buffer *buffer, 
int trace_array_vprintk(struct trace_array *tr,

			unsigned long ip, const char *fmt, va_list args)

{

	if (tracing_selftest_running && tr == &global_trace)

	if (tracing_selftest_running && (tr->flags & TRACE_ARRAY_FL_GLOBAL))

		return 0;



	return __trace_array_vprintk(tr->array_buffer.buffer, ip, fmt, args);
@@ -3422,7 +3423,7 @@ int trace_array_printk(struct trace_array *tr, 
		return -ENOENT;



	/* This is only allowed for created instances */

	if (tr == &global_trace)

	if (tr->flags & TRACE_ARRAY_FL_GLOBAL)

		return 0;



	if (!(tr->trace_flags & TRACE_ITER(PRINTK)))
@@ -3449,7 +3450,7 @@ int trace_array_init_printk(struct trace_array *tr) 
		return -ENOENT;



	/* This is only allowed for created instances */

	if (tr == &global_trace)

	if (tr->flags & TRACE_ARRAY_FL_GLOBAL)

		return -EINVAL;



	return alloc_percpu_trace_buffer();