Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982AbZJZPPu (ORCPT ); Mon, 26 Oct 2009 11:15:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752858AbZJZPPt (ORCPT ); Mon, 26 Oct 2009 11:15:49 -0400 Received: from mail-qy0-f174.google.com ([209.85.221.174]:45568 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952AbZJZPPp (ORCPT ); Mon, 26 Oct 2009 11:15:45 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=RDmM0RifS/UoppmHvj7/1NEO4AlLZhC0OPcp096P8OY5OO6B85+n8NHuZKuBH9968X pDBR1yIyjUqjvLQUZGQkpfD1ZpofQTLdO9u5SNwqfg+5sqjkhh0jkkwQDwJIO6klh4ed GL8JBEVAv180HWuVJjOHhMB8h5Se9UmZW0awY= From: Wu Zhangjin To: linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Cc: Wu Zhangjin , Frederic Weisbecker , rostedt@goodmis.org, Thomas Gleixner , Ralf Baechle , Richard Sandiford , Nicholas Mc Guire , David Daney , Adam Nemet , Patrik Kluba Subject: [PATCH -v6 11/13] tracing: not trace mips_timecounter_read() for MIPS Date: Mon, 26 Oct 2009 23:13:28 +0800 Message-Id: X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <4e022c090601c3585a8d69a54deade2a53f93e8c.1256569489.git.wuzhangjin@gmail.com> References: <747deea2f18d5ccffe842df95a9dd1c86251a958.1256569489.git.wuzhangjin@gmail.com> <3f47087b70a965fd679b17a59521671296457df1.1256569489.git.wuzhangjin@gmail.com> <07dc907ec62353b1aca99b2850d3b2e4b734189a.1256569489.git.wuzhangjin@gmail.com> <374da7039d2e1b97083edd8bcd7811356884d427.1256569489.git.wuzhangjin@gmail.com> <3c82af564d70be05b92687949ed134ce034bf8db.1256569489.git.wuzhangjin@gmail.com> <07e35715c3af78e3c4b537940277240ed031365a.1256569489.git.wuzhangjin@gmail.com> <4e022c090601c3585a8d69a54deade2a53f93e8c.1256569489.git.wuzhangjin@gmail.com> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2109 Lines: 68 We use mips_timecounter_read() to get the timestamp in MIPS, so, it's better to not trace it and it's subroutines, otherwise, it will goto recursion(hang) when using function graph tracer. we use the __notrace_funcgraph annotation to indicate them not to be traced. And there are two common functions called by mips_timecounter_read(), we define the __arch_notrace macro to ensure they are not to be traced. Signed-off-by: Wu Zhangjin --- arch/mips/include/asm/ftrace.h | 5 +++++ arch/mips/kernel/csrc-r4k.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/ftrace.h b/arch/mips/include/asm/ftrace.h index d5771e8..452b996 100644 --- a/arch/mips/include/asm/ftrace.h +++ b/arch/mips/include/asm/ftrace.h @@ -31,6 +31,11 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) struct dyn_arch_ftrace { }; #endif /* CONFIG_DYNAMIC_FTRACE */ + +#ifdef CONFIG_FUNCTION_GRAPH_TRACER +#define __arch_notrace +#endif + #endif /* __ASSEMBLY__ */ #endif /* CONFIG_FUNCTION_TRACER */ #endif /* _ASM_MIPS_FTRACE_H */ diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 4e7705f..0c1bf80 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -8,6 +8,7 @@ #include #include #include +#include #include @@ -42,7 +43,7 @@ static struct timecounter r4k_tc = { .cc = NULL, }; -static cycle_t r4k_cc_read(const struct cyclecounter *cc) +static cycle_t __notrace_funcgraph r4k_cc_read(const struct cyclecounter *cc) { return read_c0_count(); } @@ -66,7 +67,7 @@ int __init init_r4k_timecounter(void) return 0; } -u64 r4k_timecounter_read(void) +u64 __notrace_funcgraph r4k_timecounter_read(void) { u64 clock; -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/