tracing: allocate page when need
PATCH 2/4 tracing: allocate page when need
Impact: Cleanup
Sometimes, we open trace_pipe_raw, but we don't read(2) it, we just splice(2) it, thus, the page is not used.
Signed-off-by Lai Jiangshan <[email protected]>
---
kernel/trace/trace.c +8 -8
@@ -3257,19 +3257,13 @@ static int tracing_buffers_open(struct inode *inode, struct file *filp) info->tr = &global_trace; info->cpu = cpu; - info->spare =ring_buffer_alloc_read_page (info->tr->buffer); + info->spare =NULL ;/* Force reading ring buffer for first read */ info->read = (unsigned int )-1 ; -if (!info->spare) - goto out; filp->private_data = info;return nonseekable_open (inode, filp); - - out: -kfree (info); -return -ENOMEM ; } static ssize_t
@@ -3284,6 +3278,11 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,if (!count)return 0 ; +if (!info->spare) + info->spare =ring_buffer_alloc_read_page (info->tr->buffer); +if (!info->spare) +return -ENOMEM ; +/* Do we have previous read data to read? */ if (info->read <PAGE_SIZE ) goto read;
@@ -3322,7 +3321,8 @@ static int tracing_buffers_release(struct inode *inode, struct file *file) {struct ftrace_buffer_info *info = file->private_data; -ring_buffer_free_read_page (info->tr->buffer, info->spare); +if (info->spare) +ring_buffer_free_read_page (info->tr->buffer, info->spare);kfree (info);return 0 ;
[tip:tracing/core] tracing: allocate page when needed
Commit-ID: ddd538f3e6a1a4bec2f6942f83a753263e6577b4 Gitweb: http://git.kernel.org/tip/ddd538f3e6a1a4bec2f6942f83a753263e6577b4 Author: Lai Jiangshan <[email protected]> AuthorDate: Thu, 2 Apr 2009 15:16:59 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 10 Apr 2009 12:44:43 +0200
tracing: allocate page when needed
Impact: Cleanup
Sometimes, we open trace_pipe_raw, but we don't read(2) it, we just splice(2) it, thus, the page is not used.
Signed-off-by Lai Jiangshan <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Steven Rostedt <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- kernel/trace/trace.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
kernel/trace/trace.c +8 -8
@@ -3277,19 +3277,13 @@ static int tracing_buffers_open(struct inode *inode, struct file *filp) info->tr = &global_trace; info->cpu = cpu; - info->spare =ring_buffer_alloc_read_page (info->tr->buffer); + info->spare =NULL ;/* Force reading ring buffer for first read */ info->read = (unsigned int )-1 ; -if (!info->spare) - goto out; filp->private_data = info;return nonseekable_open (inode, filp); - - out: -kfree (info); -return -ENOMEM ; } static ssize_t
@@ -3304,6 +3298,11 @@ tracing_buffers_read(struct file *filp, char __user *ubuf,if (!count)return 0 ; +if (!info->spare) + info->spare =ring_buffer_alloc_read_page (info->tr->buffer); +if (!info->spare) +return -ENOMEM ; +/* Do we have previous read data to read? */ if (info->read <PAGE_SIZE ) goto read;
@@ -3342,7 +3341,8 @@ static int tracing_buffers_release(struct inode *inode, struct file *file) {struct ftrace_buffer_info *info = file->private_data; -ring_buffer_free_read_page (info->tr->buffer, info->spare); +if (info->spare) +ring_buffer_free_read_page (info->tr->buffer, info->spare);kfree (info);return 0 ;