tracing fixes
Subsystems (3)
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Lai Jiangshan (1):
ring-buffer: Synchronize resizing buffer with reader lock
Li Zefan (1):
ftrace: Fix unmatched locking in ftrace_regex_write()
kernel/trace/ftrace.c | 6 +++--- kernel/trace/ring_buffer.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
kernel/trace/ftrace.c +3 -3
@@ -2222,15 +2222,15 @@ ftrace_regex_write(struct file *file, const char __user *ubuf, ret =ftrace_process_regex (parser->buffer, parser->idx, enable);if (ret) - goto out; + goto out_unlock;trace_parser_clear (parser); } ret = read; - +out_unlock:mutex_unlock (&ftrace_regex_lock); -out: +return ret; }
kernel/trace/ring_buffer.c +2 -0
@@ -1193,6 +1193,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)atomic_inc (&cpu_buffer->record_disabled);synchronize_sched (); +spin_lock_irq (&cpu_buffer->reader_lock);rb_head_page_deactivate (cpu_buffer);for (i =0 ; i < nr_pages; i++) {
@@ -1207,6 +1208,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned nr_pages)return ;rb_reset_cpu (cpu_buffer); +spin_unlock_irq (&cpu_buffer->reader_lock);rb_check_pages (cpu_buffer);