From: Steven Rostedt <rostedt@goodmis.org>
To: Colin Cross <ccross@android.com>
Cc: linux-arm-kernel@lists.infradead.org,
Frederic Weisbecker <fweisbec@gmail.com>,
Ingo Molnar <mingo@redhat.com>,
Russell King <linux@arm.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: ftrace: Trace function entry before updating index
Date: Wed, 18 Jul 2012 13:38:53 -0400 [thread overview]
Message-ID: <1342633133.11900.13.camel@gandalf.stny.rr.com> (raw)
In-Reply-To: <1342490592-20373-1-git-send-email-ccross@android.com>
On Mon, 2012-07-16 at 19:03 -0700, Colin Cross wrote:
> Commit 722b3c74695377d11d18a52f3da08114d37f3f37 modified x86 ftrace to
> avoid tracing all functions called from irqs when function graph was
> used with a filter. Port the same fix to ARM.
>
> Cc: Steven Rostedt <rostedt@goodmis.org>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Someone on the ARM side needs to pull this in.
I'll look into fixing this for PPC.
Thanks!
-- Steve
> Signed-off-by: Colin Cross <ccross@android.com>
> ---
>
> It looks like the same issue affects blackfin, microblaze, mips,
> parisc, powerpc, s390, sh, and sparc, but I don't have patches to
> fix those.
>
> arch/arm/kernel/ftrace.c | 17 +++++++++--------
> 1 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
> index df0bf0c..34e5664 100644
> --- a/arch/arm/kernel/ftrace.c
> +++ b/arch/arm/kernel/ftrace.c
> @@ -179,19 +179,20 @@ void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
> old = *parent;
> *parent = return_hooker;
>
> - err = ftrace_push_return_trace(old, self_addr, &trace.depth,
> - frame_pointer);
> - if (err == -EBUSY) {
> - *parent = old;
> - return;
> - }
> -
> trace.func = self_addr;
> + trace.depth = current->curr_ret_stack + 1;
>
> /* Only trace if the calling function expects to */
> if (!ftrace_graph_entry(&trace)) {
> - current->curr_ret_stack--;
> *parent = old;
> + return;
> + }
> +
> + err = ftrace_push_return_trace(old, self_addr, &trace.depth,
> + frame_pointer);
> + if (err == -EBUSY) {
> + *parent = old;
> + return;
> }
> }
>
next prev parent reply other threads:[~2012-07-18 17:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 2:03 Colin Cross
2012-07-18 17:38 ` Steven Rostedt [this message]
2012-07-18 18:10 ` Colin Cross
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=1342633133.11900.13.camel@gandalf.stny.rr.com \
--to=rostedt@goodmis.org \
--cc=ccross@android.com \
--cc=fweisbec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mingo@redhat.com \
/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®