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

ring-buffer: Simplify reset_disabled_cpu_buffer() with use of guard() 

Use guard(raw_spinlock_irqsave)() in reset_disabled_cpu_buffer() to
simplify the locking.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Link: https://lore.kernel.org/20250527144623.77a9cc47@gandalf.local.home


Reviewed-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent f115d2b7

kernel/trace/ring_buffer.c

+2 −7
Original line number Diff line number Diff line
@@ -6113,21 +6113,16 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) 
/* Must have disabled the cpu buffer then done a synchronize_rcu */

static void reset_disabled_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer)

{

	unsigned long flags;



	raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);

	guard(raw_spinlock_irqsave)(&cpu_buffer->reader_lock);



	if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))

		goto out;

		return;



	arch_spin_lock(&cpu_buffer->lock);



	rb_reset_cpu(cpu_buffer);



	arch_spin_unlock(&cpu_buffer->lock);



 out:

	raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);

}



/**