Skip to content

L
linux
Commit 5389f6fa authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files
Options

locking, tracing: Annotate tracing locks as raw 

The tracing locks can be taken in atomic context and therefore
cannot be preempted on -rt - annotate it.

In mainline this change documents the low level nature of
the lock - otherwise there's no functional difference. Lockdep
and Sparse checking will work as usual.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 740969f9
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
kernel/trace/ring_buffer.c
View file @ 5389f6fa
...@@ -478,7 +478,7 @@ struct ring_buffer_per_cpu { ...@@ -478,7 +478,7 @@ struct ring_buffer_per_cpu {
int cpu; int cpu;
atomic_t record_disabled; atomic_t record_disabled;
struct ring_buffer *buffer; struct ring_buffer *buffer;
spinlock_t reader_lock; /* serialize readers */ raw_spinlock_t reader_lock; /* serialize readers */
arch_spinlock_t lock; arch_spinlock_t lock;
struct lock_class_key lock_key; struct lock_class_key lock_key;
struct list_head *pages; struct list_head *pages;
...@@ -1062,7 +1062,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int cpu) ...@@ -1062,7 +1062,7 @@ rb_allocate_cpu_buffer(struct ring_buffer *buffer, int cpu)
cpu_buffer->cpu = cpu; cpu_buffer->cpu = cpu;
cpu_buffer->buffer = buffer; cpu_buffer->buffer = buffer;
spin_lock_init(&cpu_buffer->reader_lock); raw_spin_lock_init(&cpu_buffer->reader_lock);
lockdep_set_class(&cpu_buffer->reader_lock, buffer->reader_lock_key); lockdep_set_class(&cpu_buffer->reader_lock, buffer->reader_lock_key);
cpu_buffer->lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED; cpu_buffer->lock = (arch_spinlock_t)__ARCH_SPIN_LOCK_UNLOCKED;
...@@ -1259,7 +1259,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages) ...@@ -1259,7 +1259,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)
struct list_head *p; struct list_head *p;
unsigned i; unsigned i;
spin_lock_irq(&cpu_buffer->reader_lock); raw_spin_lock_irq(&cpu_buffer->reader_lock);
rb_head_page_deactivate(cpu_buffer); rb_head_page_deactivate(cpu_buffer);
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
...@@ -1277,7 +1277,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages) ...@@ -1277,7 +1277,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)
rb_check_pages(cpu_buffer); rb_check_pages(cpu_buffer);
out: out:
spin_unlock_irq(&cpu_buffer->reader_lock); raw_spin_unlock_irq(&cpu_buffer->reader_lock);
} }
static void static void
...@@ -1288,7 +1288,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -1288,7 +1288,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
struct list_head *p; struct list_head *p;
unsigned i; unsigned i;
spin_lock_irq(&cpu_buffer->reader_lock); raw_spin_lock_irq(&cpu_buffer->reader_lock);
rb_head_page_deactivate(cpu_buffer); rb_head_page_deactivate(cpu_buffer);
for (i = 0; i < nr_pages; i++) { for (i = 0; i < nr_pages; i++) {
...@@ -1303,7 +1303,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer, ...@@ -1303,7 +1303,7 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer,
rb_check_pages(cpu_buffer); rb_check_pages(cpu_buffer);
out: out:
spin_unlock_irq(&cpu_buffer->reader_lock); raw_spin_unlock_irq(&cpu_buffer->reader_lock);
} }
/** /**
...@@ -2804,9 +2804,9 @@ void ring_buffer_iter_reset(struct ring_buffer_iter *iter) ...@@ -2804,9 +2804,9 @@ void ring_buffer_iter_reset(struct ring_buffer_iter *iter)
cpu_buffer = iter->cpu_buffer; cpu_buffer = iter->cpu_buffer;
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
rb_iter_reset(iter); rb_iter_reset(iter);
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
} }
EXPORT_SYMBOL_GPL(ring_buffer_iter_reset); EXPORT_SYMBOL_GPL(ring_buffer_iter_reset);
...@@ -3265,12 +3265,12 @@ ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts, ...@@ -3265,12 +3265,12 @@ ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,
again: again:
local_irq_save(flags); local_irq_save(flags);
if (dolock) if (dolock)
spin_lock(&cpu_buffer->reader_lock); raw_spin_lock(&cpu_buffer->reader_lock);
event = rb_buffer_peek(cpu_buffer, ts, lost_events); event = rb_buffer_peek(cpu_buffer, ts, lost_events);
if (event && event->type_len == RINGBUF_TYPE_PADDING) if (event && event->type_len == RINGBUF_TYPE_PADDING)
rb_advance_reader(cpu_buffer); rb_advance_reader(cpu_buffer);
if (dolock) if (dolock)
spin_unlock(&cpu_buffer->reader_lock); raw_spin_unlock(&cpu_buffer->reader_lock);
local_irq_restore(flags); local_irq_restore(flags);
if (event && event->type_len == RINGBUF_TYPE_PADDING) if (event && event->type_len == RINGBUF_TYPE_PADDING)
...@@ -3295,9 +3295,9 @@ ring_buffer_iter_peek(struct ring_buffer_iter *iter, u64 *ts) ...@@ -3295,9 +3295,9 @@ ring_buffer_iter_peek(struct ring_buffer_iter *iter, u64 *ts)
unsigned long flags; unsigned long flags;
again: again:
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
event = rb_iter_peek(iter, ts); event = rb_iter_peek(iter, ts);
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
if (event && event->type_len == RINGBUF_TYPE_PADDING) if (event && event->type_len == RINGBUF_TYPE_PADDING)
goto again; goto again;
...@@ -3337,7 +3337,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts, ...@@ -3337,7 +3337,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts,
cpu_buffer = buffer->buffers[cpu]; cpu_buffer = buffer->buffers[cpu];
local_irq_save(flags); local_irq_save(flags);
if (dolock) if (dolock)
spin_lock(&cpu_buffer->reader_lock); raw_spin_lock(&cpu_buffer->reader_lock);
event = rb_buffer_peek(cpu_buffer, ts, lost_events); event = rb_buffer_peek(cpu_buffer, ts, lost_events);
if (event) { if (event) {
...@@ -3346,7 +3346,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts, ...@@ -3346,7 +3346,7 @@ ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts,
} }
if (dolock) if (dolock)
spin_unlock(&cpu_buffer->reader_lock); raw_spin_unlock(&cpu_buffer->reader_lock);
local_irq_restore(flags); local_irq_restore(flags);
out: out:
...@@ -3438,11 +3438,11 @@ ring_buffer_read_start(struct ring_buffer_iter *iter) ...@@ -3438,11 +3438,11 @@ ring_buffer_read_start(struct ring_buffer_iter *iter)
cpu_buffer = iter->cpu_buffer; cpu_buffer = iter->cpu_buffer;
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
arch_spin_lock(&cpu_buffer->lock); arch_spin_lock(&cpu_buffer->lock);
rb_iter_reset(iter); rb_iter_reset(iter);
arch_spin_unlock(&cpu_buffer->lock); arch_spin_unlock(&cpu_buffer->lock);
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
} }
EXPORT_SYMBOL_GPL(ring_buffer_read_start); EXPORT_SYMBOL_GPL(ring_buffer_read_start);
...@@ -3477,7 +3477,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts) ...@@ -3477,7 +3477,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts)
struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer; struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
again: again:
event = rb_iter_peek(iter, ts); event = rb_iter_peek(iter, ts);
if (!event) if (!event)
...@@ -3488,7 +3488,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts) ...@@ -3488,7 +3488,7 @@ ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts)
rb_advance_iter(iter); rb_advance_iter(iter);
out: out:
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
return event; return event;
} }
...@@ -3557,7 +3557,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) ...@@ -3557,7 +3557,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
atomic_inc(&cpu_buffer->record_disabled); atomic_inc(&cpu_buffer->record_disabled);
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing))) if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing)))
goto out; goto out;
...@@ -3569,7 +3569,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) ...@@ -3569,7 +3569,7 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu)
arch_spin_unlock(&cpu_buffer->lock); arch_spin_unlock(&cpu_buffer->lock);
out: out:
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
atomic_dec(&cpu_buffer->record_disabled); atomic_dec(&cpu_buffer->record_disabled);
} }
...@@ -3607,10 +3607,10 @@ int ring_buffer_empty(struct ring_buffer *buffer) ...@@ -3607,10 +3607,10 @@ int ring_buffer_empty(struct ring_buffer *buffer)
cpu_buffer = buffer->buffers[cpu]; cpu_buffer = buffer->buffers[cpu];
local_irq_save(flags); local_irq_save(flags);
if (dolock) if (dolock)
spin_lock(&cpu_buffer->reader_lock); raw_spin_lock(&cpu_buffer->reader_lock);
ret = rb_per_cpu_empty(cpu_buffer); ret = rb_per_cpu_empty(cpu_buffer);
if (dolock) if (dolock)
spin_unlock(&cpu_buffer->reader_lock); raw_spin_unlock(&cpu_buffer->reader_lock);
local_irq_restore(flags); local_irq_restore(flags);
if (!ret) if (!ret)
...@@ -3641,10 +3641,10 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu) ...@@ -3641,10 +3641,10 @@ int ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu)
cpu_buffer = buffer->buffers[cpu]; cpu_buffer = buffer->buffers[cpu];
local_irq_save(flags); local_irq_save(flags);
if (dolock) if (dolock)
spin_lock(&cpu_buffer->reader_lock); raw_spin_lock(&cpu_buffer->reader_lock);
ret = rb_per_cpu_empty(cpu_buffer); ret = rb_per_cpu_empty(cpu_buffer);
if (dolock) if (dolock)
spin_unlock(&cpu_buffer->reader_lock); raw_spin_unlock(&cpu_buffer->reader_lock);
local_irq_restore(flags); local_irq_restore(flags);
return ret; return ret;
...@@ -3841,7 +3841,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, ...@@ -3841,7 +3841,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
if (!bpage) if (!bpage)
goto out; goto out;
spin_lock_irqsave(&cpu_buffer->reader_lock, flags); raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
reader = rb_get_reader_page(cpu_buffer); reader = rb_get_reader_page(cpu_buffer);
if (!reader) if (!reader)
...@@ -3964,7 +3964,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, ...@@ -3964,7 +3964,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
memset(&bpage->data[commit], 0, BUF_PAGE_SIZE - commit); memset(&bpage->data[commit], 0, BUF_PAGE_SIZE - commit);
out_unlock: out_unlock:
spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
out: out:
return ret; return ret;
......
kernel/trace/trace.c
View file @ 5389f6fa
...@@ -341,7 +341,7 @@ unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK | ...@@ -341,7 +341,7 @@ unsigned long trace_flags = TRACE_ITER_PRINT_PARENT | TRACE_ITER_PRINTK |
TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE; TRACE_ITER_GRAPH_TIME | TRACE_ITER_RECORD_CMD | TRACE_ITER_OVERWRITE;
static int trace_stop_count; static int trace_stop_count;
static DEFINE_SPINLOCK(tracing_start_lock); static DEFINE_RAW_SPINLOCK(tracing_start_lock);
static void wakeup_work_handler(struct work_struct *work) static void wakeup_work_handler(struct work_struct *work)
{ {
...@@ -960,7 +960,7 @@ void tracing_start(void) ...@@ -960,7 +960,7 @@ void tracing_start(void)
if (tracing_disabled) if (tracing_disabled)
return; return;
spin_lock_irqsave(&tracing_start_lock, flags); raw_spin_lock_irqsave(&tracing_start_lock, flags);
if (--trace_stop_count) { if (--trace_stop_count) {
if (trace_stop_count < 0) { if (trace_stop_count < 0) {
/* Someone screwed up their debugging */ /* Someone screwed up their debugging */
...@@ -985,7 +985,7 @@ void tracing_start(void) ...@@ -985,7 +985,7 @@ void tracing_start(void)
ftrace_start(); ftrace_start();
out: out:
spin_unlock_irqrestore(&tracing_start_lock, flags); raw_spin_unlock_irqrestore(&tracing_start_lock, flags);
} }
/** /**
...@@ -1000,7 +1000,7 @@ void tracing_stop(void) ...@@ -1000,7 +1000,7 @@ void tracing_stop(void)
unsigned long flags; unsigned long flags;
ftrace_stop(); ftrace_stop();
spin_lock_irqsave(&tracing_start_lock, flags); raw_spin_lock_irqsave(&tracing_start_lock, flags);
if (trace_stop_count++) if (trace_stop_count++)
goto out; goto out;
...@@ -1018,7 +1018,7 @@ void tracing_stop(void) ...@@ -1018,7 +1018,7 @@ void tracing_stop(void)
arch_spin_unlock(&ftrace_max_lock); arch_spin_unlock(&ftrace_max_lock);
out: out:
spin_unlock_irqrestore(&tracing_start_lock, flags); raw_spin_unlock_irqrestore(&tracing_start_lock, flags);
} }
void trace_stop_cmdline_recording(void); void trace_stop_cmdline_recording(void);
......
kernel/trace/trace_irqsoff.c
View file @ 5389f6fa
...@@ -23,7 +23,7 @@ static int tracer_enabled __read_mostly; ...@@ -23,7 +23,7 @@ static int tracer_enabled __read_mostly;
static DEFINE_PER_CPU(int, tracing_cpu); static DEFINE_PER_CPU(int, tracing_cpu);
static DEFINE_SPINLOCK(max_trace_lock); static DEFINE_RAW_SPINLOCK(max_trace_lock);
enum { enum {
TRACER_IRQS_OFF = (1 << 1), TRACER_IRQS_OFF = (1 << 1),
...@@ -321,7 +321,7 @@ check_critical_timing(struct trace_array *tr, ...@@ -321,7 +321,7 @@ check_critical_timing(struct trace_array *tr,
if (!report_latency(delta)) if (!report_latency(delta))
goto out; goto out;
spin_lock_irqsave(&max_trace_lock, flags); raw_spin_lock_irqsave(&max_trace_lock, flags);
/* check if we are still the max latency */ /* check if we are still the max latency */
if (!report_latency(delta)) if (!report_latency(delta))
...@@ -344,7 +344,7 @@ check_critical_timing(struct trace_array *tr, ...@@ -344,7 +344,7 @@ check_critical_timing(struct trace_array *tr,
max_sequence++; max_sequence++;
out_unlock: out_unlock:
spin_unlock_irqrestore(&max_trace_lock, flags); raw_spin_unlock_irqrestore(&max_trace_lock, flags);
out: out:
data->critical_sequence = max_sequence; data->critical_sequence = max_sequence;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7