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
------------------>
Ingo Molnar (1):
tracing: fix mmiotrace resizing crash
Rakib Mullick (1):
kernel/profile.c: fix section mismatch warning
Steven Rostedt (2):
ring-buffer: buffer record on/off switch
ring-buffer: no preempt for sched_clock()
walimis (1):
function tracing: fix wrong pos computing when read buffer has been fulfilled
include/linux/ring_buffer.h | 3 + kernel/profile.c | 2 +- kernel/trace/ftrace.c | 34 ++++++------ kernel/trace/ring_buffer.c | 115 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 135 insertions(+), 19 deletions(-)
include/linux/ring_buffer.h +3 -0
@@ -120,6 +120,9 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer);u64 ring_buffer_time_stamp (int cpu);void ring_buffer_normalize_time_stamp (int cpu,u64 *ts); +void tracing_on (void ); +void tracing_off (void ); +enum ring_buffer_flags {RB_FL_OVERWRITE =1 <<0 , };
kernel/profile.c +1 -1
@@ -544,7 +544,7 @@ static const struct file_operations proc_profile_operations = { };#ifdef CONFIG_SMP -static void __init profile_nop (void *unused) +static inline void profile_nop (void *unused) { }
kernel/trace/ftrace.c +17 -17
@@ -185,7 +185,6 @@ enum { };static int ftrace_filtered; -static int tracing_on;static LIST_HEAD (ftrace_new_addrs);
@@ -506,13 +505,10 @@ static int __ftrace_modify_code(void *data) {int *command = data; -if (*command &FTRACE_ENABLE_CALLS ) { +if (*command &FTRACE_ENABLE_CALLS )ftrace_replace_code (1 ); - tracing_on =1 ; - }else if (*command &FTRACE_DISABLE_CALLS ) { +else if (*command &FTRACE_DISABLE_CALLS )ftrace_replace_code (0 ); - tracing_on =0 ; - }if (*command &FTRACE_UPDATE_TRACE_FUNC )ftrace_update_ftrace_func (ftrace_trace_function);
@@ -677,7 +673,7 @@ static int __init ftrace_dyn_table_alloc(unsigned long num_to_init) cnt = num_to_init /ENTRIES_PER_PAGE ;pr_info ("ftrace: allocating %ld entries in %d pages\n" , - num_to_init, cnt); + num_to_init, cnt +1 );for (i =0 ; i < cnt; i++) { pg->next = (void *)get_zeroed_page (GFP_KERNEL );
@@ -757,13 +753,11 @@ static void *t_start(struct seq_file *m, loff_t *pos)void *p =NULL ;loff_t l =-1 ; -if (*pos != iter->pos) { -for (p =t_next (m, p, &l); p && l < *pos; p =t_next (m, p, &l)) - ; - }else { - l = *pos; - p =t_next (m, p, &l); - } +if (*pos > iter->pos) + *pos = iter->pos; + + l = *pos; + p =t_next (m, p, &l);return p; }
@@ -774,15 +768,21 @@ static void t_stop(struct seq_file *m, void *p)static int t_show (struct seq_file *m,void *v) { +struct ftrace_iterator *iter = m->private;struct dyn_ftrace *rec = v;char str[KSYM_SYMBOL_LEN ]; +int ret =0 ;if (!rec)return 0 ;kallsyms_lookup (rec->ip,NULL ,NULL ,NULL , str); -seq_printf (m,"%s\n" , str); + ret =seq_printf (m,"%s\n" , str); +if (ret <0 ) { + iter->pos--; + iter->idx--; + }return 0 ; }
@@ -808,7 +808,7 @@ ftrace_avail_open(struct inode *inode, struct file *file)return -ENOMEM ; iter->pg = ftrace_pages_start; - iter->pos =-1 ; + iter->pos =0 ; ret =seq_open (file, &show_ftrace_seq_ops);if (!ret) {
@@ -895,7 +895,7 @@ ftrace_regex_open(struct inode *inode, struct file *file, int enable)if (file->f_mode &FMODE_READ ) { iter->pg = ftrace_pages_start; - iter->pos =-1 ; + iter->pos =0 ; iter->flags = enable ?FTRACE_ITER_FILTER :FTRACE_ITER_NOTRACE ;
kernel/trace/ring_buffer.c +114 -1
149 lines not on this page · raw message