From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Frederic Weisbecker <fweisbec@gmail.com>,
Liming Wang <liming.wang@windriver.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/7] tracing/events: don't increment @pos in s_start()
Date: Wed, 24 Jun 2009 09:52:29 +0800 [thread overview]
Message-ID: <4A4186DD.6090405@cn.fujitsu.com> (raw)
In-Reply-To: <4A4186C6.9090706@cn.fujitsu.com>
While testing syscall tracepoints posted by Jason, I found 3 entries
were missing when reading available_events. The output size of
available_events is < 4 pages, which means we lost 1 entry per page.
The cause is, it's wrong to increment @pos in s_start().
Actually there's another bug here -- reading avaiable_events/set_events
can race with module unload:
# cat available_events |
s_start() |
s_stop() |
| # rmmod foo.ko
s_start() |
call = list_entry(m->private) |
@call might be freed and accessing it will lead to crash.
[ Impact fix missing entries when reading available_events/set_events ]
Reviewed-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_events.c | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index aa08be6..53c8fd3 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -300,10 +300,18 @@ t_next(struct seq_file *m, void *v, loff_t *pos)
static void *t_start(struct seq_file *m, loff_t *pos)
{
+ struct ftrace_event_call *call = NULL;
+ loff_t l;
+
mutex_lock(&event_mutex);
- if (*pos == 0)
- m->private = ftrace_events.next;
- return t_next(m, NULL, pos);
+
+ m->private = ftrace_events.next;
+ for (l = 0; l <= *pos; ) {
+ call = t_next(m, NULL, &l);
+ if (!call)
+ break;
+ }
+ return call;
}
static void *
@@ -332,10 +340,18 @@ s_next(struct seq_file *m, void *v, loff_t *pos)
static void *s_start(struct seq_file *m, loff_t *pos)
{
+ struct ftrace_event_call *call = NULL;
+ loff_t l;
+
mutex_lock(&event_mutex);
- if (*pos == 0)
- m->private = ftrace_events.next;
- return s_next(m, NULL, pos);
+
+ m->private = ftrace_events.next;
+ for (l = 0; l <= *pos; ) {
+ call = s_next(m, NULL, &l);
+ if (!call)
+ break;
+ }
+ return call;
}
static int t_show(struct seq_file *m, void *v)
--
1.5.4.rc3
next prev parent reply other threads:[~2009-06-24 1:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-24 1:52 [PATCH 0/7] tracing: seqfile fixes, take 2 Li Zefan
2009-06-24 1:52 ` Li Zefan [this message]
2009-06-24 9:45 ` [tip:tracing/urgent] tracing/events: Don't increment @pos in s_start() tip-bot for Li Zefan
2009-06-24 1:52 ` [PATCH 2/7] tracing_bprintk: don't increment @pos in t_start() Li Zefan
2009-06-24 9:45 ` [tip:tracing/urgent] tracing_bprintk: Don't " tip-bot for Li Zefan
2009-06-24 1:53 ` [PATCH 3/7] trace_stat: don't increment @pos in seq start() Li Zefan
2009-06-24 9:46 ` [tip:tracing/urgent] trace_stat: Don't " tip-bot for Li Zefan
2009-06-24 1:53 ` [PATCH 4/7] tracing: reset iterator in t_start() Li Zefan
2009-06-24 9:46 ` [tip:tracing/urgent] tracing: Reset " tip-bot for Li Zefan
2009-06-24 1:54 ` [PATCH 5/7] ftrace: don't increment @pos in g_start() Li Zefan
2009-06-24 9:46 ` [tip:tracing/urgent] ftrace: Don't " tip-bot for Li Zefan
2009-06-24 1:54 ` [PATCH 6/7] ftrace: don't manipulate @pos in t_start() Li Zefan
2009-06-24 9:46 ` [tip:tracing/urgent] ftrace: Don't " tip-bot for Li Zefan
2009-06-24 1:54 ` [PATCH 7/7] ftrace: fix t_hash_start() Li Zefan
2009-06-24 9:46 ` [tip:tracing/urgent] ftrace: Fix t_hash_start() tip-bot for Li Zefan
2009-06-24 9:03 ` [PATCH 0/7] tracing: seqfile fixes, take 2 Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A4186DD.6090405@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=liming.wang@windriver.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.