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

tracing: branch: Use trace_tracing_is_on_cpu() instead of "disabled" field 

The branch tracer currently checks the per CPU "disabled" field to know if
tracing is enabled or not for the CPU. As the "disabled" value is not used
anymore to turn of tracing generically, use tracing_tracer_is_on_cpu()
instead.

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://lore.kernel.org/20250505212236.224658526@goodmis.org


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

kernel/trace/trace_branch.c

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) 
{

	struct trace_array *tr = branch_tracer;

	struct trace_buffer *buffer;

	struct trace_array_cpu *data;

	struct ring_buffer_event *event;

	struct trace_branch *entry;

	unsigned long flags;
@@ -54,8 +53,7 @@ probe_likely_condition(struct ftrace_likely_data *f, int val, int expect) 


	raw_local_irq_save(flags);

	current->trace_recursion |= TRACE_BRANCH_BIT;

	data = this_cpu_ptr(tr->array_buffer.data);

	if (atomic_read(&data->disabled))

	if (!tracer_tracing_is_on_cpu(tr, raw_smp_processor_id()))

		goto out;



	trace_ctx = tracing_gen_ctx_flags(flags);