Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2930e04d authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Fix race with update_max_tr_single and changing tracers 



The commit 34600f0e "tracing: Fix race with max_tr and changing tracers"
fixed the updating of the main buffers with the race of changing
tracers, but left out the fix to the updating of just a per cpu buffer.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent fd4a5aef

kernel/trace/trace.c

+4 −1
Original line number Diff line number Diff line
@@ -744,8 +744,11 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu) 
		return;



	WARN_ON_ONCE(!irqs_disabled());

	if (WARN_ON_ONCE(!current_trace->allocated_snapshot))

	if (!current_trace->allocated_snapshot) {

		/* Only the nop tracer should hit this when disabling */

		WARN_ON_ONCE(current_trace != &nop_trace);

		return;

	}



	arch_spin_lock(&ftrace_max_lock);