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
------------------>
Arnaldo Carvalho de Melo (1):
tracing: Update the comm field in the right variable in update_max_tr
Frederic Weisbecker (1):
tracing: Include irqflags headers from trace clock
Lai Jiangshan (2):
tracing: Fix warning in s_next of trace file ops
ring-buffer: Move disabled check into preempt disable section
Steven Rostedt (6):
function-graph: Fix unused reference to ftrace_set_func()
function-graph: Use comment notation for func names of dangling '}'
function-graph: Init curr_ret_stack with ret_stack
tracing: Use same local variable when resetting the ring buffer
tracing: Disable buffer switching when starting or stopping trace
tracing: Do not record user stack trace from NMI context
Tim Bird (1):
function-graph: Add tracing_thresh support to function_graph tracer
kernel/trace/ftrace.c | 8 ++--- kernel/trace/ring_buffer.c | 12 ++++---- kernel/trace/trace.c | 49 ++++++++++++++++++++++++++++----- kernel/trace/trace.h | 3 +- kernel/trace/trace_clock.c | 1 + kernel/trace/trace_functions_graph.c | 27 ++++++++++++++++-- 6 files changed, 77 insertions(+), 23 deletions(-)
kernel/trace/ftrace.c +3 -5
@@ -84,10 +84,6 @@ ftrace_func_t ftrace_trace_function __read_mostly = ftrace_stub;ftrace_func_t __ftrace_trace_function__read_mostly = ftrace_stub;ftrace_func_t ftrace_pid_function__read_mostly = ftrace_stub; -#ifdef CONFIG_FUNCTION_GRAPH_TRACER -static int ftrace_set_func (unsigned long *array,int *idx,char *buffer); -#endif -static void ftrace_list_func (unsigned long ip,unsigned long parent_ip) {struct ftrace_ops *op = ftrace_list;
@@ -2276,6 +2272,8 @@ __setup("ftrace_filter=", set_ftrace_filter);#ifdef CONFIG_FUNCTION_GRAPH_TRACER static char ftrace_graph_buf[FTRACE_FILTER_SIZE ]__initdata ; +static int ftrace_set_func (unsigned long *array,int *idx,char *buffer); +static int __init set_graph_function (char *str) {strlcpy (ftrace_graph_buf, str,FTRACE_FILTER_SIZE );
@@ -3351,6 +3349,7 @@ void ftrace_graph_init_task(struct task_struct *t) {/* Make sure we do not use the parent ret_stack */ t->ret_stack =NULL ; + t->curr_ret_stack =-1 ;if (ftrace_graph_active) {struct ftrace_ret_stack *ret_stack;
@@ -3360,7 +3359,6 @@ void ftrace_graph_init_task(struct task_struct *t) GFP_KERNEL);if (!ret_stack)return ; - t->curr_ret_stack =-1 ;atomic_set (&t->tracing_graph_pause,0 );atomic_set (&t->trace_overrun,0 ); t->ftrace_timestamp =0 ;
kernel/trace/ring_buffer.c +6 -6
@@ -2232,12 +2232,12 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer, unsigned long length)if (ring_buffer_flags !=RB_BUFFERS_ON )return NULL ; -if (atomic_read (&buffer->record_disabled)) -return NULL ; -/* If we are tracing schedule, we don't want to recurse */ resched =ftrace_preempt_disable (); +if (atomic_read (&buffer->record_disabled)) + goto out_nocheck; +if (trace_recursive_lock ()) goto out_nocheck;
@@ -2469,11 +2469,11 @@ int ring_buffer_write(struct ring_buffer *buffer,if (ring_buffer_flags !=RB_BUFFERS_ON )return -EBUSY ; -if (atomic_read (&buffer->record_disabled)) -return -EBUSY ; - resched =ftrace_preempt_disable (); +if (atomic_read (&buffer->record_disabled)) + goto out; + cpu =raw_smp_processor_id ();if (!cpumask_test_cpu (cpu, buffer->cpumask))
kernel/trace/trace.c +41 -8
140 lines not on this page · raw message
kernel/trace/trace.h +2 -1
@@ -396,9 +396,10 @@ extern int process_new_ksym_entry(char *ksymname, int op, unsigned long addr);extern unsigned long nsecs_to_usecs (unsigned long nsecs); +extern unsigned long tracing_thresh; +#ifdef CONFIG_TRACER_MAX_TRACE extern unsigned long tracing_max_latency; -extern unsigned long tracing_thresh;void update_max_tr (struct trace_array *tr,struct task_struct *tsk,int cpu); void update_max_tr_single(struct trace_array *tr,
kernel/trace/trace_clock.c +1 -0
@@ -13,6 +13,7 @@* Tracer plugins will chose a default from these clocks. */ #include <linux/spinlock.h> +#include <linux/irqflags.h> #include <linux/hardirq.h> #include <linux/module.h> #include <linux/percpu.h>
kernel/trace/trace_functions_graph.c +24 -3
@@ -237,6 +237,14 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)return ret; } +int trace_graph_thresh_entry (struct ftrace_graph_ent *trace) +{ +if (tracing_thresh) +return 1 ; +else +return trace_graph_entry (trace); +} + static void __trace_graph_return(struct trace_array *tr, struct ftrace_graph_ret *trace, unsigned long flags,
@@ -290,13 +298,26 @@ void set_graph_array(struct trace_array *tr)smp_mb (); } +void trace_graph_thresh_return (struct ftrace_graph_ret *trace) +{ +if (tracing_thresh && + (trace->rettime - trace->calltime < tracing_thresh)) +return ; +else +trace_graph_return (trace); +} +static int graph_trace_init (struct trace_array *tr) {int ret;set_graph_array (tr); - ret =register_ftrace_graph (&trace_graph_return, - &trace_graph_entry); +if (tracing_thresh) + ret =register_ftrace_graph (&trace_graph_thresh_return, + &trace_graph_thresh_entry); +else + ret =register_ftrace_graph (&trace_graph_return, + &trace_graph_entry);if (ret)return ret;tracing_start_cmdline_record ();
@@ -920,7 +941,7 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,if (!ret)return TRACE_TYPE_PARTIAL_LINE ; }else { - ret =trace_seq_printf (s,"} (%ps)\n" , (void *)trace->func); + ret =trace_seq_printf (s,"} /* %ps */\n" , (void *)trace->func);if (!ret)return TRACE_TYPE_PARTIAL_LINE ; }