All of lore.kernel.org
 help / color / mirror / Atom feed
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 7/7] ftrace: fix t_hash_start()
Date: Wed, 24 Jun 2009 09:54:54 +0800	[thread overview]
Message-ID: <4A41876E.2060407@cn.fujitsu.com> (raw)
In-Reply-To: <4A4186C6.9090706@cn.fujitsu.com>

When the output of set_ftrace_filter is larger than PAGE_SIZE,
t_hash_start() will be called the 2nd time, and then we start
from the head of a hlist, which is wrong and causes some entries
to be outputed twice.

The worse is, if the hlist is large enough, reading set_ftrace_filter
won't stop but in a dead loop.

[ Impact: fix output of set_ftrace_filter for selected functions ]

Reviewed-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 kernel/trace/ftrace.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7946938..5771cc1 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1416,10 +1416,20 @@ static void *t_hash_start(struct seq_file *m, loff_t *pos)
 {
 	struct ftrace_iterator *iter = m->private;
 	void *p = NULL;
+	loff_t l;
+
+	if (!(iter->flags & FTRACE_ITER_HASH))
+		*pos = 0;
 
 	iter->flags |= FTRACE_ITER_HASH;
 
-	return t_hash_next(m, p, pos);
+	iter->hidx = 0;
+	for (l = 0; l <= *pos; ) {
+		p = t_hash_next(m, p, &l);
+		if (!p)
+			break;
+	}
+	return p;
 }
 
 static int t_hash_show(struct seq_file *m, void *v)
-- 
1.5.4.rc3

  parent reply	other threads:[~2009-06-24  1:54 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 ` [PATCH 1/7] tracing/events: don't increment @pos in s_start() Li Zefan
2009-06-24  9:45   ` [tip:tracing/urgent] tracing/events: Don't " 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 ` Li Zefan [this message]
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=4A41876E.2060407@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.