linux-mips
[Top] [All Lists]

[v2 PATCH 5/5] tracing, MIPS: Fix set_graph_function of function graph t

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [v2 PATCH 5/5] tracing, MIPS: Fix set_graph_function of function graph tracer
From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Sat, 22 Jan 2011 01:29:30 +0800
Cc: Steven Rostedt <srostedt@redhat.com>, Sergei Shtylyov <sshtylyov@mvista.com>, linux-mips@linux-mips.org, Wu Zhangjin <wuzhangjin@gmail.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=CL2/32WMjakT05Li5u+/oJhcKByTU5M2BpJ7Fc1otDo=; b=oE0e+ZJxf8xjvcM4R8XKyAjuTGK9qMKA/pmf4OVu51+LqlNZ3ydy9uFRMLImunJ3JI HhR7Hk3VLKlQ+JAJLmBB5HUTGPKbu2zimIClJ1uEVXmqS6Tjg3BpYHuB57wb2M/xdiu3 12021bF6PqCKH47cjBruV765e2YoBP+jXsl5E=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=PZGLSu1h/0R5u1I8ZssJOKC4m+A1IXFSOfEurlPvyoAs5E5FceJrEjfOyKjJ5qGzOq 4RiMcCZJv2g8up8lbAtMMi3aPcUauddzUCbG57KCVj1Y4wie5ROb8eLND+dRJGvoSltd yITlyey8WDHUNIH2qEaZTA5Jw1Jx98R1bWTw8=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
trace.func should be set to the recorded ip of the mcount calling site
in the __mcount_loc section to filter the function entries configured
through the tracing/set_graph_function interface, but before, this is
set to the self_ra(the return address of mcount), which has made
set_graph_function not work as expected.

This fixes it via calculating the right recorded ip in the __mcount_loc
section and assign it to trace.func.

Reported-by: Zhiping Zhong <xzhong86@163.com>
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
 arch/mips/kernel/ftrace.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c
index bc91e4a..be3fa7a 100644
--- a/arch/mips/kernel/ftrace.c
+++ b/arch/mips/kernel/ftrace.c
@@ -257,7 +257,7 @@ void prepare_ftrace_return(unsigned long *parent_ra_addr, 
unsigned long self_ra,
        struct ftrace_graph_ent trace;
        unsigned long return_hooker = (unsigned long)
            &return_to_handler;
-       int faulted;
+       int faulted, insns;
 
        if (unlikely(atomic_read(&current->tracing_graph_pause)))
                return;
@@ -304,7 +304,14 @@ void prepare_ftrace_return(unsigned long *parent_ra_addr, 
unsigned long self_ra,
                return;
        }
 
-       trace.func = self_ra;
+       /*
+        * Get the recorded ip of the current mcount calling site in the
+        * __mcount_loc section, which will be used to filter the function
+        * entries configured through the tracing/set_graph_function interface.
+        */
+
+       insns = (in_kernel_space(self_ra)) ? 2 : MCOUNT_OFFSET_INSNS + 1;
+       trace.func = self_ra - (MCOUNT_INSN_SIZE * insns);
 
        /* Only trace if the calling function expects to */
        if (!ftrace_graph_entry(&trace)) {
-- 
1.7.1


<Prev in Thread] Current Thread [Next in Thread>