tracing fixes
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 (2):
tracing: Fix invalid function_graph entry
tracing: Fix missing function_graph events when we splice_read from trace_pipe
Li Zefan (3):
trace_stack: Fix seqfile memory leak
function-graph: Fix seqfile memory leak
tracing/stat: Fix seqfile memory leak
Matt Fleming (2):
ftrace: Fix the conditional that updates $ref_func
ftrace: Only update $offset when we update $ref_func
Mel Gorman (1):
profile: Suppress warning about large allocations when profile=1 is specified
Steven Rostedt (2):
tracing: show proper address for trace-printk format
tracing: only truncate ftrace files when O_TRUNC is set
Thomas Gleixner (1):
trace: stop tracer in oops_enter()
kernel/panic.c | 1 + kernel/profile.c | 5 +++-- kernel/trace/ftrace.c | 19 ++++++++++++++----- kernel/trace/trace.c | 12 ++++++++---- kernel/trace/trace_events.c | 2 +- kernel/trace/trace_functions_graph.c | 11 +++++++++-- kernel/trace/trace_printk.c | 2 +- kernel/trace/trace_stack.c | 7 ++----- kernel/trace/trace_stat.c | 34 ++++++++++++++++++++++------------ scripts/recordmcount.pl | 5 +++-- 10 files changed, 64 insertions(+), 34 deletions(-)
kernel/panic.c +1 -0
@@ -301,6 +301,7 @@ int oops_may_print(void)*/ void oops_enter (void ) { +tracing_off ();/* can't trust the integrity of the kernel anymore: */ debug_locks_off ();do_oops_enter_exit ();
kernel/profile.c +3 -2
@@ -117,11 +117,12 @@ int __ref profile_init(void)cpumask_copy (prof_cpu_mask, cpu_possible_mask); - prof_buffer =kzalloc (buffer_bytes,GFP_KERNEL ); + prof_buffer =kzalloc (buffer_bytes,GFP_KERNEL |__GFP_NOWARN);if (prof_buffer)return 0 ; - prof_buffer =alloc_pages_exact (buffer_bytes,GFP_KERNEL |__GFP_ZERO); + prof_buffer =alloc_pages_exact (buffer_bytes, +GFP_KERNEL |__GFP_ZERO|__GFP_NOWARN);if (prof_buffer)return 0 ;
kernel/trace/ftrace.c +14 -5
@@ -1662,7 +1662,7 @@ ftrace_regex_open(struct inode *inode, struct file *file, int enable)mutex_lock (&ftrace_regex_lock);if ((file->f_mode &FMODE_WRITE ) && - !(file->f_flags &O_APPEND )) + (file->f_flags &O_TRUNC ))ftrace_filter_reset (enable);if (file->f_mode &FMODE_READ ) {
@@ -2577,7 +2577,7 @@ ftrace_graph_open(struct inode *inode, struct file *file)mutex_lock (&graph_lock);if ((file->f_mode &FMODE_WRITE ) && - !(file->f_flags &O_APPEND )) { + (file->f_flags &O_TRUNC )) { ftrace_graph_count =0 ;memset (ftrace_graph_funcs,0 ,sizeof (ftrace_graph_funcs)); }
@@ -2596,6 +2596,14 @@ ftrace_graph_open(struct inode *inode, struct file *file) }static int +ftrace_graph_release (struct inode *inode,struct file *file) +{ +if (file->f_mode &FMODE_READ ) +seq_release (inode, file); +return 0 ; +} + +static int ftrace_set_func (unsigned long *array,int *idx,char *buffer) {struct dyn_ftrace *rec;
@@ -2724,9 +2732,10 @@ ftrace_graph_write(struct file *file, const char __user *ubuf, }static const struct file_operations ftrace_graph_fops = { - .open = ftrace_graph_open, - .read = seq_read, - .write = ftrace_graph_write, + .open = ftrace_graph_open, + .read = seq_read, + .write = ftrace_graph_write, + .release = ftrace_graph_release, };#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
kernel/trace/trace.c +8 -4
@@ -2031,7 +2031,7 @@ static int tracing_open(struct inode *inode, struct file *file)/* If this file was open for write, then erase contents */ if ((file->f_mode &FMODE_WRITE ) && - !(file->f_flags &O_APPEND )) { + (file->f_flags &O_TRUNC )) {long cpu = (long ) inode->i_private;if (cpu ==TRACE_PIPE_ALL_CPU )
@@ -3085,7 +3085,8 @@ tracing_fill_pipe_page(size_t rem, struct trace_iterator *iter)break ; } -trace_consume (iter); +if (ret !=TRACE_TYPE_NO_CONSUME ) +trace_consume (iter); rem -= count;if (!find_next_entry_inc (iter)) { rem =0 ;
@@ -4233,8 +4234,11 @@ static void __ftrace_dump(bool disable_tracing) iter.pos =-1 ;if (find_next_entry_inc (&iter) !=NULL ) { -print_trace_line (&iter); -trace_consume (&iter); +int ret; + + ret =print_trace_line (&iter); +if (ret !=TRACE_TYPE_NO_CONSUME ) +trace_consume (&iter); }trace_printk_seq (&iter.seq);
kernel/trace/trace_events.c +1 -1
@@ -376,7 +376,7 @@ ftrace_event_seq_open(struct inode *inode, struct file *file)const struct seq_operations *seq_ops;if ((file->f_mode &FMODE_WRITE ) && - !(file->f_flags &O_APPEND )) + (file->f_flags &O_TRUNC ))ftrace_clear_events (); seq_ops = inode->i_private;
kernel/trace/trace_functions_graph.c +9 -2
@@ -843,9 +843,16 @@ print_graph_function(struct trace_iterator *iter)switch (entry->type) {case TRACE_GRAPH_ENT : { -struct ftrace_graph_ent_entry *field; +/* +* print_graph_entry() may consume the current event, +* thus @field may become invalid, so we need to save it. +* sizeof(struct ftrace_graph_ent_entry) is very small, +* it can be safely saved at the stack. +*/ +struct ftrace_graph_ent_entry *field, saved;trace_assign_type (field, entry); -return print_graph_entry (field, s, iter); + saved = *field; +return print_graph_entry (&saved, s, iter); }case TRACE_GRAPH_RET : {struct ftrace_graph_ret_entry *field;
kernel/trace/trace_printk.c +1 -1
@@ -176,7 +176,7 @@ static int t_show(struct seq_file *m, void *v)const char *str = *fmt;int i; -seq_printf (m,"0x%lx : \"" , (unsigned long )fmt); +seq_printf (m,"0x%lx : \"" , *(unsigned long *)fmt);/* * Tabs and new lines need to be converted.
kernel/trace/trace_stack.c +2 -5
@@ -301,17 +301,14 @@ static const struct seq_operations stack_trace_seq_ops = {static int stack_trace_open (struct inode *inode,struct file *file) { -int ret; - - ret =seq_open (file, &stack_trace_seq_ops); - -return ret; +return seq_open (file, &stack_trace_seq_ops); }static const struct file_operations stack_trace_fops = { .open = stack_trace_open, .read = seq_read, .llseek = seq_lseek, + .release = seq_release, };int
kernel/trace/trace_stat.c +22 -12
@@ -73,7 +73,7 @@ static struct rb_node *release_next(struct rb_node *node) } } -static void reset_stat_session (struct stat_session *session) +static void __reset_stat_session (struct stat_session *session) {struct rb_node *node = session->stat_root.rb_node;
@@ -83,10 +83,17 @@ static void reset_stat_session(struct stat_session *session) session->stat_root =RB_ROOT ; } +static void reset_stat_session (struct stat_session *session) +{ +mutex_lock (&session->stat_mutex); +__reset_stat_session (session); +mutex_unlock (&session->stat_mutex); +} +static void destroy_session (struct stat_session *session) {debugfs_remove (session->file); -reset_stat_session (session); +__reset_stat_session (session);mutex_destroy (&session->stat_mutex);kfree (session); }
@@ -150,7 +157,7 @@ static int stat_seq_init(struct stat_session *session)int i;mutex_lock (&session->stat_mutex); -reset_stat_session (session); +__reset_stat_session (session);if (!ts->stat_cmp) ts->stat_cmp = dummy_cmp;
@@ -183,7 +190,7 @@ exit:return ret; exit_free_rbtree: -reset_stat_session (session); +__reset_stat_session (session);mutex_unlock (&session->stat_mutex);return ret; }
@@ -250,16 +257,21 @@ static const struct seq_operations trace_stat_seq_ops = {static int tracing_stat_open (struct inode *inode,struct file *file) {int ret; - +struct seq_file *m;struct stat_session *session = inode->i_private; + ret =stat_seq_init (session); +if (ret) +return ret; + ret =seq_open (file, &trace_stat_seq_ops); -if (!ret) { -struct seq_file *m = file->private_data; - m->private = session; - ret =stat_seq_init (session); +if (ret) { +reset_stat_session (session); +return ret; } + m = file->private_data; + m->private = session;return ret; }
@@ -270,11 +282,9 @@ static int tracing_stat_release(struct inode *i, struct file *f) {struct stat_session *session = i->i_private; -mutex_lock (&session->stat_mutex);reset_stat_session (session); -mutex_unlock (&session->stat_mutex); -return 0 ; +return seq_release (i, f); }static const struct file_operations tracing_stat_fops = {
scripts/recordmcount.pl +3 -2
@@ -403,7 +403,6 @@ while (<IN>) { # section found, now is this a start of a function? } elsif ($read_function && /$function_regex/) { $text_found = 1; - $offset = hex $1; $text = $2; # if this is either a local function or a weak function
@@ -412,10 +411,12 @@ while (<IN>) { if (!defined($locals{$text}) && !defined($weak{$text})) { $ref_func = $text; $read_function = 0; + $offset = hex $1; } else { # if we already have a function, and this is weak, skip it - if (!defined($ref_func) || !defined($weak{$text})) { + if (!defined($ref_func) && !defined($weak{$text})) { $ref_func = $text; + $offset = hex $1; } } } elsif ($read_headers && /$mcount_section/) {