mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Liming Wang <liming.wang@windriver.com>
To: Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, Liming Wang <liming.wang@windriver.com>
Subject: [PATCH 1/1] ftrace: avoid duplicated function when writing set_graph_function
Date: Thu,  4 Dec 2008 14:24:49 +0800	[thread overview]
Message-ID: <1228371889-11195-1-git-send-email-liming.wang@windriver.com> (raw)
In-Reply-To: <20081203203828.920111079@goodmis.org>

Impact: fix a bug

when writing function to set_graph_function, we should check whether it
has existed in set_graph_function to avoid duplicating.

Signed-off-by: Liming Wang <liming.wang@windriver.com>
---
 kernel/trace/ftrace.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index eb57dc1..d2b1565 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1425,7 +1425,7 @@ ftrace_set_func(unsigned long *array, int idx, char *buffer)
 	struct dyn_ftrace *rec;
 	struct ftrace_page *pg;
 	int found = 0;
-	int i;
+	int i, j;
 
 	if (ftrace_disabled)
 		return -ENODEV;
@@ -1443,7 +1443,13 @@ ftrace_set_func(unsigned long *array, int idx, char *buffer)
 			kallsyms_lookup(rec->ip, NULL, NULL, NULL, str);
 			if (strcmp(str, buffer) == 0) {
 				found = 1;
-				array[idx] = rec->ip;
+				for (j = 0; j < idx; j++)
+					if (array[j] == rec->ip) {
+						found = 0;
+						break;
+					}
+				if (found)
+					array[idx] = rec->ip;
 				break;
 			}
 		}
-- 
1.6.0.3


  parent reply	other threads:[~2008-12-04  6:40 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-03 20:36 [PATCH 0/3] ftrace: updates for tip Steven Rostedt
2008-12-03 20:36 ` [PATCH 1/3] ftrace: graph of a single function Steven Rostedt
2008-12-03 21:07   ` Andrew Morton
2008-12-03 21:10     ` Steven Rostedt
2008-12-03 21:32       ` Andrew Morton
2008-12-03 21:36         ` Steven Rostedt
2008-12-04  8:39           ` Ingo Molnar
2008-12-03 21:08   ` Andrew Morton
2008-12-03 21:11     ` Steven Rostedt
2008-12-04  8:41       ` Ingo Molnar
2008-12-04  8:43         ` Peter Zijlstra
2008-12-15  9:21         ` Andy Whitcroft
2008-12-04  6:24   ` Liming Wang [this message]
2008-12-04  8:42     ` [PATCH 1/1] ftrace: avoid duplicated function when writing set_graph_function Ingo Molnar
2008-12-03 20:36 ` [PATCH 2/3] ftrace: use task struct trace flag to filter on pid Steven Rostedt
2008-12-03 22:34   ` Eric W. Biederman
2008-12-03 20:36 ` [PATCH 3/3] ftrace: trace single pid for function graph tracer Steven Rostedt
2008-12-03 20:49   ` Andrew Morton
2008-12-03 20:52     ` Steven Rostedt
2008-12-03 23:36       ` Eric W. Biederman
2008-12-04  2:29         ` Steven Rostedt
2008-12-04  4:22           ` Eric W. Biederman
2008-12-04  4:32             ` Steven Rostedt
2008-12-04  8:19 ` [PATCH 0/3] ftrace: updates for tip Ingo Molnar
2008-12-04  8:35 ` Ingo Molnar
2008-12-04 13:30   ` Steven Rostedt

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=1228371889-11195-1-git-send-email-liming.wang@windriver.com \
    --to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®