tracing: Minor fixes that will be going to Linus shortly
Subsystems (4)
Steven Rostedt
maintainercover tracing: Minor fixes that will be going to Linus shortly
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
ftrace/urgent
Head SHA1: d6097c9e4454adf1f8f2c9547c2fa6060d55d952
Jann Horn (1):
tracing: Fix buffer_ref pipe ops
Peter Zijlstra (1):
trace: Fix preempt_enable_no_resched() abuse
Wenwen Wang (1):
tracing: Fix a memory leak by early error exit in trace_pid_write()
----
fs/splice.c | 4 ++-- include/linux/pipe_fs_i.h | 1 + kernel/trace/ring_buffer.c | 2 +- kernel/trace/trace.c | 33 ++++++++++++++++++--------------- 4 files changed, 22 insertions(+), 18 deletions(-)
Steven Rostedt
maintainerPATCH 3/3 trace: Fix preempt_enable_no_resched() abuse
From: Peter Zijlstra <[email protected]>
Unless the very next line is schedule(), or implies it, one must not use preempt_enable_no_resched(). It can cause a preemption to go missing and thereby cause arbitrary delays, breaking the PREEMPT=y invariant.
--- kernel/trace/ring_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ring_buffer.c +1 -1
@@ -762,7 +762,7 @@ u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu)preempt_disable_notrace (); time =rb_time_stamp (buffer); -preempt_enable_no_resched_notrace (); +preempt_enable_notrace ();return time; }
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH 1/3 tracing: Fix buffer_ref pipe ops
In reply to Steven RostedtFrom: Jann Horn <[email protected]>
This fixes multiple issues in buffer_pipe_buf_ops:
- The ->steal() handler must not return zero unless the pipe buffer has the only reference to the page. But generic_pipe_buf_steal() assumes that every reference to the pipe is tracked by the page's refcount, which isn't true for these buffers - buffer_pipe_buf_get(), which duplicates a buffer, doesn't touch the page's refcount.
Fix it by using generic_pipe_buf_nosteal(), which refuses every attempted theft. It should be easy to actually support ->steal, but the only current users of pipe_buf_steal() are the virtio console and FUSE, and they also only use it as an optimization. So it's probably not worth the effort.
- The ->get() and ->release() handlers can be invoked concurrently on pipe buffers backed by the same struct buffer_ref. Make them safe against concurrency by using refcount_t.
- The pointers stored in ->private were only zeroed out when the last reference to the buffer_ref was dropped. As far as I know, this shouldn't be necessary anyway, but if we do it, let's always do it.
--- fs/splice.c | 4 ++-- include/linux/pipe_fs_i.h | 1 + kernel/trace/trace.c | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 16 deletions(-)
fs/splice.c +2 -2
@@ -330,8 +330,8 @@ const struct pipe_buf_operations default_pipe_buf_ops = { .get = generic_pipe_buf_get, }; -static int generic_pipe_buf_nosteal (struct pipe_inode_info *pipe, -struct pipe_buffer *buf) +int generic_pipe_buf_nosteal (struct pipe_inode_info *pipe, +struct pipe_buffer *buf) {return 1 ; }
include/linux/pipe_fs_i.h +1 -0
@@ -174,6 +174,7 @@ void free_pipe_info(struct pipe_inode_info *);void generic_pipe_buf_get (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_confirm (struct pipe_inode_info *,struct pipe_buffer *);int generic_pipe_buf_steal (struct pipe_inode_info *,struct pipe_buffer *); +int generic_pipe_buf_nosteal (struct pipe_inode_info *,struct pipe_buffer *);void generic_pipe_buf_release (struct pipe_inode_info *,struct pipe_buffer *);void pipe_buf_mark_unmergeable (struct pipe_buffer *buf);
kernel/trace/trace.c +14 -14
@@ -7025,19 +7025,23 @@ struct buffer_ref {struct ring_buffer *buffer;void *page;int cpu; -int ref; +refcount_t refcount; }; +static void buffer_ref_release (struct buffer_ref *ref) +{ +if (!refcount_dec_and_test (&ref->refcount)) +return ; +ring_buffer_free_read_page (ref->buffer, ref->cpu, ref->page); +kfree (ref); +} +static void buffer_pipe_buf_release (struct pipe_inode_info *pipe,struct pipe_buffer *buf) {struct buffer_ref *ref = (struct buffer_ref *)buf->private; -if (--ref->ref) -return ; - -ring_buffer_free_read_page (ref->buffer, ref->cpu, ref->page); -kfree (ref); +buffer_ref_release (ref); buf->private =0 ; }
@@ -7046,14 +7050,14 @@ static void buffer_pipe_buf_get(struct pipe_inode_info *pipe, {struct buffer_ref *ref = (struct buffer_ref *)buf->private; - ref->ref++; +refcount_inc (&ref->refcount); }/* Pipe buffer operations for a buffer. */ static const struct pipe_buf_operations buffer_pipe_buf_ops = { .confirm = generic_pipe_buf_confirm, .release = buffer_pipe_buf_release, - .steal = generic_pipe_buf_steal, + .steal = generic_pipe_buf_nosteal, .get = buffer_pipe_buf_get, };
@@ -7066,11 +7070,7 @@ static void buffer_spd_release(struct splice_pipe_desc *spd, unsigned int i)struct buffer_ref *ref = (struct buffer_ref *)spd->partial[i].private; -if (--ref->ref) -return ; - -ring_buffer_free_read_page (ref->buffer, ref->cpu, ref->page); -kfree (ref); +buffer_ref_release (ref); spd->partial[i].private =0 ; }
@@ -7125,7 +7125,7 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,break ; } - ref->ref =1 ; +refcount_set (&ref->refcount,1 ); ref->buffer = iter->trace_buffer->buffer; ref->page =ring_buffer_alloc_read_page (ref->buffer, iter->cpu_file);if (IS_ERR (ref->page)) {
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH 2/3 tracing: Fix a memory leak by early error exit in trace_pid_write()
In reply to Steven RostedtFrom: Wenwen Wang <[email protected]>
In trace_pid_write(), the buffer for trace parser is allocated through kmalloc() in trace_parser_get_init(). Later on, after the buffer is used, it is then freed through kfree() in trace_parser_put(). However, it is possible that trace_pid_write() is terminated due to unexpected errors, e.g., ENOMEM. In that case, the allocated buffer will not be freed, which is a memory leak bug.
To fix this issue, free the allocated buffer when an error is encountered.
--- kernel/trace/trace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/trace/trace.c +4 -1
@@ -496,8 +496,10 @@ int trace_pid_write(struct trace_pid_list *filtered_pids,* not modified. */ pid_list =kmalloc (sizeof (*pid_list),GFP_KERNEL ); -if (!pid_list) +if (!pid_list) { +trace_parser_put (&parser);return -ENOMEM ; + } pid_list->pid_max =READ_ONCE (pid_max);
@@ -507,6 +509,7 @@ int trace_pid_write(struct trace_pid_list *filtered_pids, pid_list->pids =vzalloc ((pid_list->pid_max +7 ) >>3 );if (!pid_list->pids) { +trace_parser_put (&parser);kfree (pid_list);return -ENOMEM ; }
Signature · 1 line
2.20.1