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 5/7] ftrace: don't increment @pos in g_start()
Date: Wed, 24 Jun 2009 09:54:00 +0800	[thread overview]
Message-ID: <4A418738.7090401@cn.fujitsu.com> (raw)
In-Reply-To: <4A4186C6.9090706@cn.fujitsu.com>

It's wrong to increment @pos in g_start(). It causes some entries
lost when reading set_graph_function, if the output of the file
is large than PAGE_SIZE.

[ Impact: fix missing entries when reading set_graph_function ]

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

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 561cafc..c06e9ab 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2499,32 +2499,31 @@ int ftrace_graph_count;
 unsigned long ftrace_graph_funcs[FTRACE_GRAPH_MAX_FUNCS] __read_mostly;
 
 static void *
-g_next(struct seq_file *m, void *v, loff_t *pos)
+__g_next(struct seq_file *m, loff_t *pos)
 {
 	unsigned long *array = m->private;
-	int index = *pos;
-
-	(*pos)++;
 
-	if (index >= ftrace_graph_count)
+	if (*pos >= ftrace_graph_count)
 		return NULL;
+	return &array[*pos];
+}
 
-	return &array[index];
+static void *
+g_next(struct seq_file *m, void *v, loff_t *pos)
+{
+	(*pos)++;
+	return __g_next(m, pos);
 }
 
 static void *g_start(struct seq_file *m, loff_t *pos)
 {
-	void *p = NULL;
-
 	mutex_lock(&graph_lock);
 
 	/* Nothing, tell g_show to print all functions are enabled */
 	if (!ftrace_graph_count && !*pos)
 		return (void *)1;
 
-	p = g_next(m, p, pos);
-
-	return p;
+	return __g_next(m, pos);
 }
 
 static void g_stop(struct seq_file *m, void *p)
-- 
1.5.4.rc3


  parent reply	other threads:[~2009-06-24  1:53 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 ` Li Zefan [this message]
2009-06-24  9:46   ` [tip:tracing/urgent] ftrace: Don't increment @pos in g_start() 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=4A418738.7090401@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.