tracing: urgent fixes
Subsystems (3)
Steven Rostedt
maintainerIngo,
Please pull the latest tip/tracing/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent
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(-)
Steven Rostedt
maintainerPATCH 1/2 ring-buffer: Synchronize resizing buffer with reader lock
From: Lai Jiangshan <[email protected]>
We got a sudden panic when we reduced the size of the ringbuffer.
We can reproduce the panic by the following steps:
echo 1 > events/sched/enable
cat trace_pipe > /dev/null &
while ((1))
do
echo 12000 > buffer_size_kb
echo 512 > buffer_size_kb
done
(not more than 5 seconds, panic ...)
LKML-Reference: <[email protected]>
--- kernel/trace/ring_buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
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);
Signature · 1 line
1.6.3.3
Steven Rostedt
maintainerPATCH 2/2 ftrace: Fix unmatched locking in ftrace_regex_write()
In reply to Steven RostedtFrom: Li Zefan <[email protected]>
When a command is passed to the set_ftrace_filter, then the ftrace_regex_lock is still held going back to user space.
# echo 'do_open : foo' > set_ftrace_filter (still holding ftrace_regex_lock when returning to user space!)
LKML-Reference: <[email protected]>
--- kernel/trace/ftrace.c | 6 +++--- 1 files changed, 3 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; }
Signature · 1 line
1.6.3.3
Quoted 11 lines · Steven Rostedt
Ingo,
Please pull the latest tip/tracing/urgent tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgentLai Jiangshan (1):
ring-buffer: Synchronize resizing buffer with reader lock
Quoted 7 lines
Li Zefan (1):
ftrace: Fix unmatched locking inftrace_regex_write()----
kernel/trace/ftrace.c | 6 +++--- kernel/trace/ring_buffer.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-)
Pulled, thanks a lot Steve!
Ingo