perf: add @rq to perf_event_task_sched_out()
in [Kernel]
|
Prev: lockdep, fork: Fix dependency of hardirqs_enabled and softirqs_enabled
Next: sched: drop @cpu argument from sched_in preempt notifier
From: Peter Zijlstra on 4 May 2010 13:20 On Tue, 2010-05-04 at 14:38 +0200, Tejun Heo wrote: > Add @rq to perf_event_task_sched_out() so that its argument matches > those of trace_sched_switch(). This will help unifying notifiers in > sched. The alternative is dropping rq from the trace events, its not like anybody outside sched.o can do anything sensible with it anyway. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Tejun Heo on 4 May 2010 13:30 Hello, On 05/04/2010 07:11 PM, Peter Zijlstra wrote: > On Tue, 2010-05-04 at 14:38 +0200, Tejun Heo wrote: >> Add @rq to perf_event_task_sched_out() so that its argument matches >> those of trace_sched_switch(). This will help unifying notifiers in >> sched. > > The alternative is dropping rq from the trace events, its not like > anybody outside sched.o can do anything sensible with it anyway. The comment in include/trace/events/sched.h says... * (NOTE: the 'rq' argument is not used by generic trace events, * but used by the latency tracer plugin. ) So, I left it there. It would be great if all those @rq params can be removed tho. The latency tracer thing needs it, right? Thanks. -- tejun -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Peter Zijlstra on 4 May 2010 13:50 On Tue, 2010-05-04 at 19:22 +0200, Tejun Heo wrote: > Hello, > > On 05/04/2010 07:11 PM, Peter Zijlstra wrote: > > On Tue, 2010-05-04 at 14:38 +0200, Tejun Heo wrote: > >> Add @rq to perf_event_task_sched_out() so that its argument matches > >> those of trace_sched_switch(). This will help unifying notifiers in > >> sched. > > > > The alternative is dropping rq from the trace events, its not like > > anybody outside sched.o can do anything sensible with it anyway. > > The comment in include/trace/events/sched.h says... > > * (NOTE: the 'rq' argument is not used by generic trace events, > * but used by the latency tracer plugin. ) > > So, I left it there. It would be great if all those @rq params can be > removed tho. The latency tracer thing needs it, right? I had a quick look but couldn't actually find anything. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Peter Zijlstra on 4 May 2010 14:30 On Tue, 2010-05-04 at 14:22 -0400, Steven Rostedt wrote: > On Tue, 2010-05-04 at 19:22 +0200, Tejun Heo wrote: > > Hello, > > > > On 05/04/2010 07:11 PM, Peter Zijlstra wrote: > > > On Tue, 2010-05-04 at 14:38 +0200, Tejun Heo wrote: > > >> Add @rq to perf_event_task_sched_out() so that its argument matches > > >> those of trace_sched_switch(). This will help unifying notifiers in > > >> sched. > > > > > > The alternative is dropping rq from the trace events, its not like > > > anybody outside sched.o can do anything sensible with it anyway. > > > > The comment in include/trace/events/sched.h says... > > > > * (NOTE: the 'rq' argument is not used by generic trace events, > > * but used by the latency tracer plugin. ) > > > > So, I left it there. It would be great if all those @rq params can be > > removed tho. The latency tracer thing needs it, right? > > I believe the rq was used by the original latency tracer code that was > in the -rt patch set before ftrace. It is most likely there for > historical purposes. I guess it would be fine to just remove it. I'm building the below, so far so good... ;-) --- include/trace/events/sched.h | 32 ++++++++++---------------------- kernel/sched.c | 8 ++++---- kernel/trace/trace_sched_wakeup.c | 5 ++--- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index cfceb0b..4f733ec 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -51,15 +51,12 @@ TRACE_EVENT(sched_kthread_stop_ret, /* * Tracepoint for waiting on task to unschedule: - * - * (NOTE: the 'rq' argument is not used by generic trace events, - * but used by the latency tracer plugin. ) */ TRACE_EVENT(sched_wait_task, - TP_PROTO(struct rq *rq, struct task_struct *p), + TP_PROTO(struct task_struct *p), - TP_ARGS(rq, p), + TP_ARGS(p), TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) @@ -79,15 +76,12 @@ TRACE_EVENT(sched_wait_task, /* * Tracepoint for waking up a task: - * - * (NOTE: the 'rq' argument is not used by generic trace events, - * but used by the latency tracer plugin. ) */ DECLARE_EVENT_CLASS(sched_wakeup_template, - TP_PROTO(struct rq *rq, struct task_struct *p, int success), + TP_PROTO(struct task_struct *p, int success), - TP_ARGS(rq, p, success), + TP_ARGS(p, success), TP_STRUCT__entry( __array( char, comm, TASK_COMM_LEN ) @@ -111,31 +105,25 @@ DECLARE_EVENT_CLASS(sched_wakeup_template, ); DEFINE_EVENT(sched_wakeup_template, sched_wakeup, - TP_PROTO(struct rq *rq, struct task_struct *p, int success), - TP_ARGS(rq, p, success)); + TP_PROTO(struct task_struct *p, int success), + TP_ARGS(p, success)); /* * Tracepoint for waking up a new task: - * - * (NOTE: the 'rq' argument is not used by generic trace events, - * but used by the latency tracer plugin. ) */ DEFINE_EVENT(sched_wakeup_template, sched_wakeup_new, - TP_PROTO(struct rq *rq, struct task_struct *p, int success), - TP_ARGS(rq, p, success)); + TP_PROTO(struct task_struct *p, int success), + TP_ARGS(p, success)); /* * Tracepoint for task switches, performed by the scheduler: - * - * (NOTE: the 'rq' argument is not used by generic trace events, - * but used by the latency tracer plugin. ) */ TRACE_EVENT(sched_switch, - TP_PROTO(struct rq *rq, struct task_struct *prev, + TP_PROTO(struct task_struct *prev, struct task_struct *next), - TP_ARGS(rq, prev, next), + TP_ARGS(prev, next), TP_STRUCT__entry( __array( char, prev_comm, TASK_COMM_LEN ) diff --git a/kernel/sched.c b/kernel/sched.c index 9a0f37c..2642864 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2135,7 +2135,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state) * just go back and repeat. */ rq = task_rq_lock(p, &flags); - trace_sched_wait_task(rq, p); + trace_sched_wait_task(p); running = task_running(rq, p); on_rq = p->se.on_rq; ncsw = 0; @@ -2406,7 +2406,7 @@ out_activate: success = 1; out_running: - trace_sched_wakeup(rq, p, success); + trace_sched_wakeup(p, success); check_preempt_curr(rq, p, wake_flags); p->state = TASK_RUNNING; @@ -2580,7 +2580,7 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) rq = task_rq_lock(p, &flags); activate_task(rq, p, 0); - trace_sched_wakeup_new(rq, p, 1); + trace_sched_wakeup_new(p, 1); check_preempt_curr(rq, p, WF_FORK); #ifdef CONFIG_SMP if (p->sched_class->task_woken) @@ -2800,7 +2800,7 @@ context_switch(struct rq *rq, struct task_struct *prev, struct mm_struct *mm, *oldmm; prepare_task_switch(rq, prev, next); - trace_sched_switch(rq, prev, next); + trace_sched_switch(prev, next); mm = next->mm; oldmm = prev->active_mm; /* diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index 0271742..8052446 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -107,8 +107,7 @@ static void probe_wakeup_migrate_task(struct task_struct *task, int cpu) } static void notrace -probe_wakeup_sched_switch(struct rq *rq, struct task_struct *prev, - struct task_struct *next) +probe_wakeup_sched_switch(struct task_struct *prev, struct task_struct *next) { struct trace_array_cpu *data; cycle_t T0, T1, delta; @@ -200,7 +199,7 @@ static void wakeup_reset(struct trace_array *tr) } static void -probe_wakeup(struct rq *rq, struct task_struct *p, int success) +probe_wakeup(struct task_struct *p, int success) { struct trace_array_cpu *data; int cpu = smp_processor_id(); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Steven Rostedt on 4 May 2010 14:30
On Tue, 2010-05-04 at 19:22 +0200, Tejun Heo wrote: > Hello, > > On 05/04/2010 07:11 PM, Peter Zijlstra wrote: > > On Tue, 2010-05-04 at 14:38 +0200, Tejun Heo wrote: > >> Add @rq to perf_event_task_sched_out() so that its argument matches > >> those of trace_sched_switch(). This will help unifying notifiers in > >> sched. > > > > The alternative is dropping rq from the trace events, its not like > > anybody outside sched.o can do anything sensible with it anyway. > > The comment in include/trace/events/sched.h says... > > * (NOTE: the 'rq' argument is not used by generic trace events, > * but used by the latency tracer plugin. ) > > So, I left it there. It would be great if all those @rq params can be > removed tho. The latency tracer thing needs it, right? I believe the rq was used by the original latency tracer code that was in the -rt patch set before ftrace. It is most likely there for historical purposes. I guess it would be fine to just remove it. -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |