On Tue, 27 May 2025 14:46:23 -0400 Steven Rostedt <[email protected]> wrote:
> From: Steven Rostedt <[email protected]> > > Use guard(raw_spinlock_irqsave)() in reset_disabled_cpu_buffer() to > simplify the locking. > Looks good to me. Reviewed-by: Masami Hiramatsu (Google) <[email protected]> > Signed-off-by: Steven Rostedt (Google) <[email protected]> > --- > kernel/trace/ring_buffer.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c > index 10a4b26929ae..0b21d64e90c8 100644 > --- a/kernel/trace/ring_buffer.c > +++ b/kernel/trace/ring_buffer.c > @@ -6112,21 +6112,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); > } > > /** > -- > 2.47.2 > -- Masami Hiramatsu (Google) <[email protected]>
