tracing: Don't use tracing_record_cmdline() in workqueue tracer fix
PATCH 1/1 tracing: Don't use tracing_record_cmdline() in workqueue tracer fix
commit c3ffc7a40b7e94b094efe1c8ab4e24370a782b65 "Don't use tracing_record_cmdline() in workqueue tracer" have a race window.
find_task_by_vpid() require task_list_lock(). but the patch doesn't.
fixing here.
--- kernel/trace/trace_workqueue.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-)
kernel/trace/trace_workqueue.c +14 -6
@@ -193,12 +193,20 @@ static int workqueue_stat_show(struct seq_file *s, void *p)struct cpu_workqueue_stats *cws = p;unsigned long flags;int cpu = cws->cpu; -struct task_struct *tsk =find_task_by_vpid (cws->pid); - -seq_printf (s,"%3d %6d %6u %s\n" , cws->cpu, -atomic_read (&cws->inserted), - cws->executed, - tsk ? tsk->comm :"<...>" ); +struct pid *pid; +struct task_struct *tsk; + + pid =find_get_pid (cws->pid); +if (pid) { + tsk =get_pid_task (pid,PIDTYPE_PID ); +if (tsk) { +seq_printf (s,"%3d %6d %6u %s\n" , cws->cpu, +atomic_read (&cws->inserted), cws->executed, + tsk->comm); +put_task_struct (tsk); + } +put_pid (pid); + }spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags);if (&cws->list ==workqueue_cpu_stat (cpu)->list.next)
Signature · 1 line
1.6.0.6
Steven Rostedt
AppliedQuoted 9 lines · KOSAKI Motohiro
commit
c3ffc7a40b7e94b094efe1c8ab4e24370a782b65"Don't usetracing_record_cmdline()in workqueue tracer" have a race window.
find_task_by_vpid()requiretask_list_lock(). but the patch doesn't.fixing here.
Signed-off-by KOSAKI Motohiro <[email protected]>---
Applied, thanks!
-- Steve
Commit-ID: 889a6c367283709a80dad9413488472596a1a1d2 Gitweb: http://git.kernel.org/tip/889a6c367283709a80dad9413488472596a1a1d2 Author: KOSAKI Motohiro <[email protected]> AuthorDate: Fri, 13 Mar 2009 09:03:04 +0900 Commit: Steven Rostedt <[email protected]> CommitDate: Thu, 12 Mar 2009 21:23:47 -0400
tracing: Don't use tracing_record_cmdline() in workqueue tracer fix
commit c3ffc7a40b7e94b094efe1c8ab4e24370a782b65 "Don't use tracing_record_cmdline() in workqueue tracer" has a race window.
find_task_by_vpid() requires task_list_lock().
LKML-Reference: <[email protected]>
--- kernel/trace/trace_workqueue.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-)
kernel/trace/trace_workqueue.c +14 -6
@@ -193,12 +193,20 @@ static int workqueue_stat_show(struct seq_file *s, void *p)struct cpu_workqueue_stats *cws = p;unsigned long flags;int cpu = cws->cpu; -struct task_struct *tsk =find_task_by_vpid (cws->pid); - -seq_printf (s,"%3d %6d %6u %s\n" , cws->cpu, -atomic_read (&cws->inserted), - cws->executed, - tsk ? tsk->comm :"<...>" ); +struct pid *pid; +struct task_struct *tsk; + + pid =find_get_pid (cws->pid); +if (pid) { + tsk =get_pid_task (pid,PIDTYPE_PID ); +if (tsk) { +seq_printf (s,"%3d %6d %6u %s\n" , cws->cpu, +atomic_read (&cws->inserted), cws->executed, + tsk->comm); +put_task_struct (tsk); + } +put_pid (pid); + }spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags);if (&cws->list ==workqueue_cpu_stat (cpu)->list.next)