ftrace: updates for tip
Subsystems (3)
Steven Rostedt
maintainercover ftrace: updates for tip
Ingo,
Arnaldo was nice enough to do something that was on my todo list for quite some time.
I also included the change you asked for.
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
branch: tip/devel
Arnaldo Carvalho de Melo (2):
trace_branch: Remove unused function
trace: Remove unused trace_array_cpu parameter
Steven Rostedt (1):
trace: code style clean up
----
block/blktrace.c | 2 +- kernel/trace/trace.c | 76 ++++++++++++++++--------------------- kernel/trace/trace.h | 4 -- kernel/trace/trace_branch.c | 17 -------- kernel/trace/trace_functions.c | 8 ++-- kernel/trace/trace_irqsoff.c | 10 ++-- kernel/trace/trace_sched_switch.c | 4 +- kernel/trace/trace_sched_wakeup.c | 12 ++--- 8 files changed, 50 insertions(+), 83 deletions(-)
Steven Rostedt
maintainerPATCH 1/3 trace_branch: Remove unused function
From: Arnaldo Carvalho de Melo <[email protected]>
Impact: cleanup
--- kernel/trace/trace_branch.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-)
kernel/trace/trace_branch.c +0 -17
@@ -143,23 +143,6 @@ static void branch_trace_reset(struct trace_array *tr)stop_branch_trace (tr); } -static int -trace_print_print (struct trace_seq *s,struct trace_entry *entry,int flags) -{ -struct print_entry *field; - -trace_assign_type (field, entry); - -if (seq_print_ip_sym (s, field->ip, flags)) - goto partial; - -if (trace_seq_printf (s,": %s" , field->buf)) - goto partial; - - partial: -return TRACE_TYPE_PARTIAL_LINE ; -} -static enum print_line_t trace_branch_print (struct trace_iterator *iter,int flags) {
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 2/3 trace: Remove unused trace_array_cpu parameter
In reply to Steven RostedtFrom: Arnaldo Carvalho de Melo <[email protected]>
Impact: cleanup
--- block/blktrace.c | 2 +- kernel/trace/trace.c | 47 ++++++++++++++---------------------- kernel/trace/trace.h | 4 --- kernel/trace/trace_functions.c | 8 +++--- kernel/trace/trace_irqsoff.c | 10 ++++---- kernel/trace/trace_sched_switch.c | 4 +- kernel/trace/trace_sched_wakeup.c | 12 ++++----- 7 files changed, 35 insertions(+), 52 deletions(-)
block/blktrace.c +1 -1
@@ -245,7 +245,7 @@ record_it:if (pid !=0 && !(blk_tracer_flags.val &TRACE_BLK_OPT_CLASSIC ) && (trace_flags &TRACE_ITER_STACKTRACE ) !=0 ) -__trace_stack (blk_tr,NULL , flags,5 , pc); +__trace_stack (blk_tr, flags,5 , pc);trace_wake_up ();return ; }
kernel/trace/trace.c +18 -29
159 lines not on this page · raw message
kernel/trace/trace.h +0 -4
@@ -419,14 +419,12 @@ void ftrace(struct trace_array *tr,unsigned long parent_ip, unsigned long flags, int pc);void tracing_sched_switch_trace (struct trace_array *tr, -struct trace_array_cpu *data,struct task_struct *prev,struct task_struct *next,unsigned long flags,int pc);void tracing_record_cmdline (struct task_struct *tsk);void tracing_sched_wakeup_trace (struct trace_array *tr, -struct trace_array_cpu *data,struct task_struct *wakee,struct task_struct *cur,unsigned long flags,int pc);
@@ -436,7 +434,6 @@ void trace_special(struct trace_array *tr,unsigned long arg2, unsigned long arg3, int pc);void trace_function (struct trace_array *tr, -struct trace_array_cpu *data,unsigned long ip,unsigned long parent_ip,unsigned long flags,int pc);
@@ -462,7 +459,6 @@ void update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu);void __trace_stack (struct trace_array *tr, -struct trace_array_cpu *data,unsigned long flags,int skip,int pc);
kernel/trace/trace_functions.c +4 -4
@@ -78,7 +78,7 @@ function_trace_call_preempt_only(unsigned long ip, unsigned long parent_ip) disabled =atomic_inc_return (&data->disabled);if (likely (disabled ==1 )) -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc);atomic_dec (&data->disabled);ftrace_preempt_enable (resched);
@@ -108,7 +108,7 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)if (likely (disabled ==1 )) { pc =preempt_count (); -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc); }atomic_dec (&data->disabled);
@@ -139,7 +139,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)if (likely (disabled ==1 )) { pc =preempt_count (); -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc);/* * skip over 5 funcs: * __ftrace_trace_stack,
@@ -148,7 +148,7 @@ function_stack_trace_call(unsigned long ip, unsigned long parent_ip)* ftrace_list_func * ftrace_call */ -__trace_stack (tr, data, flags,5 , pc); +__trace_stack (tr, flags,5 , pc); }atomic_dec (&data->disabled);
kernel/trace/trace_irqsoff.c +5 -5
@@ -95,7 +95,7 @@ irqsoff_tracer_call(unsigned long ip, unsigned long parent_ip) disabled =atomic_inc_return (&data->disabled);if (likely (disabled ==1 )) -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());atomic_dec (&data->disabled); }
@@ -153,7 +153,7 @@ check_critical_timing(struct trace_array *tr,if (!report_latency (delta)) goto out_unlock; -trace_function (tr, data,CALLER_ADDR0 , parent_ip, flags, pc); +trace_function (tr,CALLER_ADDR0 , parent_ip, flags, pc); latency =nsecs_to_usecs (delta);
@@ -177,7 +177,7 @@ out: data->critical_sequence = max_sequence; data->preempt_timestamp =ftrace_now (cpu);tracing_reset (tr, cpu); -trace_function (tr, data,CALLER_ADDR0 , parent_ip, flags, pc); +trace_function (tr,CALLER_ADDR0 , parent_ip, flags, pc); } static inline void
@@ -210,7 +210,7 @@ start_critical_timing(unsigned long ip, unsigned long parent_ip)local_save_flags (flags); -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());per_cpu (tracing_cpu, cpu) =1 ;
@@ -244,7 +244,7 @@ stop_critical_timing(unsigned long ip, unsigned long parent_ip)atomic_inc (&data->disabled);local_save_flags (flags); -trace_function (tr, data, ip, parent_ip, flags,preempt_count ()); +trace_function (tr, ip, parent_ip, flags,preempt_count ());check_critical_timing (tr, data, parent_ip ? : ip, cpu); data->critical_start =0 ;atomic_dec (&data->disabled);
kernel/trace/trace_sched_switch.c +2 -2
@@ -43,7 +43,7 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev, data = ctx_trace->data[cpu];if (likely (!atomic_read (&data->disabled))) -tracing_sched_switch_trace (ctx_trace, data, prev, next, flags, pc); +tracing_sched_switch_trace (ctx_trace, prev, next, flags, pc);local_irq_restore (flags); }
@@ -66,7 +66,7 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee, int success) data = ctx_trace->data[cpu];if (likely (!atomic_read (&data->disabled))) -tracing_sched_wakeup_trace (ctx_trace, data, wakee, current, +tracing_sched_wakeup_trace (ctx_trace, wakee, current, flags, pc);local_irq_restore (flags);
kernel/trace/trace_sched_wakeup.c +5 -7
@@ -72,7 +72,7 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)if (task_cpu (wakeup_task) != cpu) goto unlock; -trace_function (tr, data, ip, parent_ip, flags, pc); +trace_function (tr, ip, parent_ip, flags, pc); unlock:__raw_spin_unlock (&wakeup_lock);
@@ -152,8 +152,8 @@ probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev,if (unlikely (!tracer_enabled || next != wakeup_task)) goto out_unlock; -trace_function (wakeup_trace, data,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); -tracing_sched_switch_trace (wakeup_trace, data, prev, next, flags, pc); +trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); +tracing_sched_switch_trace (wakeup_trace, prev, next, flags, pc);/* * usecs conversion is slow so we try to delay the conversion
@@ -254,10 +254,8 @@ probe_wakeup(struct rq *rq, struct task_struct *p, int success) data = wakeup_trace->data[wakeup_cpu]; data->preempt_timestamp =ftrace_now (cpu); -tracing_sched_wakeup_trace (wakeup_trace, data, p, current, - flags, pc); -trace_function (wakeup_trace, data,CALLER_ADDR1 ,CALLER_ADDR2 , - flags, pc); +tracing_sched_wakeup_trace (wakeup_trace, p, current, flags, pc); +trace_function (wakeup_trace,CALLER_ADDR1 ,CALLER_ADDR2 , flags, pc); out_locked:__raw_spin_unlock (&wakeup_lock);
Signature · 3 lines
1.5.6.5 --
Steven Rostedt
maintainerPATCH 3/3 trace: code style clean up
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Ingo Molar suggested using goto logic to keep the indentation down and to be able to remove the nasty line breaks. This actually makes the code a bit more readable.
--- kernel/trace/trace.c | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-)
kernel/trace/trace.c +15 -14
@@ -522,23 +522,24 @@ int register_tracer(struct tracer *type) tracing_selftest_running = false;mutex_unlock (&trace_types_lock); -if (!ret && default_bootup_tracer) { -if (!strncmp (default_bootup_tracer, type->name, -BOOTUP_TRACER_SIZE )) { -printk (KERN_INFO "Starting tracer '%s'\n" , - type->name); -/* Do we want this tracer to start on bootup? */ -tracing_set_tracer (type->name); - default_bootup_tracer =NULL ; -/* disable other selftests, since this will break it. */ - tracing_selftest_disabled =1 ; +if (ret || !default_bootup_tracer) + goto out_unlock; + +if (strncmp (default_bootup_tracer, type->name,BOOTUP_TRACER_SIZE )) + goto out_unlock; + +printk (KERN_INFO "Starting tracer '%s'\n" , type->name); +/* Do we want this tracer to start on bootup? */ +tracing_set_tracer (type->name); + default_bootup_tracer =NULL ; +/* disable other selftests, since this will break it. */ + tracing_selftest_disabled =1 ;#ifdef CONFIG_FTRACE_STARTUP_TEST -printk (KERN_INFO "Disabling FTRACE selftests due" -" to running tracer '%s'\n" , type->name); +printk (KERN_INFO "Disabling FTRACE selftests due to running tracer '%s'\n" , + type->name);#endif - } - } + out_unlock:lock_kernel ();return ret; }
Signature · 3 lines
1.5.6.5 --
Ingo Molnar
AppliedQuoted 22 lines · Steven Rostedt
Ingo,
Arnaldo was nice enough to do something that was on my todo list for quite some time.
I also included the change you asked for.
The following patches are in:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.gitbranch: tip/devel
Arnaldo Carvalho de Melo (2):
trace_branch: Remove unused function
trace: Remove unusedtrace_array_cpuparameterSteven Rostedt (1):
trace: code style clean up----
Quoted 9 lines
block/blktrace.c | 2 +- kernel/trace/trace.c | 76 ++++++++++++++++--------------------- kernel/trace/trace.h | 4 -- kernel/trace/trace_branch.c | 17 -------- kernel/trace/trace_functions.c | 8 ++-- kernel/trace/trace_irqsoff.c | 10 ++-- kernel/trace/trace_sched_switch.c | 4 +- kernel/trace/trace_sched_wakeup.c | 12 ++--- 8 files changed, 50 insertions(+), 83 deletions(-)
Applied to tip:tracing/ftrace, thanks guys!
Ingo