From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCHv2 8/8] perf probe powerpc: Fixup function entry if using kallsyms lookup
Date: Thu, 12 Mar 2015 17:37:11 -0300 [thread overview]
Message-ID: <20150312203711.GI3550@kernel.org> (raw)
In-Reply-To: <e27b74c5d94b240cb72ce0c7d6221acf758ebc8a.1418654436.git.naveen.n.rao@linux.vnet.ibm.com>
Em Mon, Dec 15, 2014 at 08:20:38PM +0530, Naveen N. Rao escreveu:
> On powerpc ABIv2, if no debug-info is found and we use kallsyms, we need
> to fixup the function entry to point to the local entry point. Use
> offset of 8 since current toolchains always generate 2 instructions (8
> bytes).
So perhaps we should rename ARCH_SYMBOL_HANDLING to ARCH_ABI_SYMBOL_FIXUPS?
> Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
> ---
> Changes:
> Generalize and introduce helper to post-process trace point.
>
> tools/perf/arch/powerpc/util/sym-handling.c | 17 +++++++++++++++++
> tools/perf/util/probe-event.c | 1 +
> tools/perf/util/probe-event.h | 10 ++++++++++
> 3 files changed, 28 insertions(+)
>
> diff --git a/tools/perf/arch/powerpc/util/sym-handling.c b/tools/perf/arch/powerpc/util/sym-handling.c
> index 22fc2e6..30c8797 100644
> --- a/tools/perf/arch/powerpc/util/sym-handling.c
> +++ b/tools/perf/arch/powerpc/util/sym-handling.c
> @@ -45,3 +45,20 @@ inline bool prefer_symtab(void)
> return false;
> #endif
> }
> +
> +void arch_fix_tev_from_maps(struct perf_probe_event *pev __maybe_unused,
> + struct probe_trace_event *tev __maybe_unused,
> + struct map *map __maybe_unused)
> +{
> +#if defined(_CALL_ELF) && _CALL_ELF == 2
> + /*
> + * If we used kallsyms, we should fixup the function entry address here.
> + * ppc64 ABIv2 local entry point is currently always 2 instructions (8 bytes)
> + * after the global entry point. Fix this if it ever changes.
> + */
> + if (!pev->uprobes && map->dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS) {
> + tev->point.address += 8;
> + tev->point.offset += 8;
> + }
> +#endif
> +}
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index dfc3151..85f37a4 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2340,6 +2340,7 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev,
> strdup_or_goto(pev->args[i].type,
> nomem_out);
> }
> + arch_fix_tev_from_maps(pev, tev, map);
> }
>
> out:
> diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h
> index 5f92906..335a6a4 100644
> --- a/tools/perf/util/probe-event.h
> +++ b/tools/perf/util/probe-event.h
> @@ -147,6 +147,16 @@ extern bool prefer_symtab(void);
> static inline bool prefer_symtab(void) { return false; };
> #endif
>
> +#ifdef HAVE_ARCH_SYMBOL_HANDLING
> +extern void arch_fix_tev_from_maps(struct perf_probe_event *pev __maybe_unused,
> + struct probe_trace_event *tev __maybe_unused,
> + struct map *map __maybe_unused);
> +#else
> +static inline void arch_fix_tev_from_maps(struct perf_probe_event *pev __maybe_unused,
> + struct probe_trace_event *tev __maybe_unused,
> + struct map *map __maybe_unused) { }
> +#endif
> +
> /* Maximum index number of event-name postfix */
> #define MAX_EVENT_INDEX 1024
>
> --
> 2.1.3
next prev parent reply other threads:[~2015-03-12 20:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-15 14:50 [PATCHv2 0/8] Fix perf probe issues on powerpc Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 1/8] kprobes: Fix kallsyms lookup across powerpc ABIv1 and ABIv2 Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 2/8] perf probe: Improve detection of file/function name in the probe pattern Naveen N. Rao
2015-03-12 20:24 ` Arnaldo Carvalho de Melo
2015-03-12 20:25 ` Arnaldo Carvalho de Melo
2015-03-13 2:03 ` Ananth N Mavinakayanahalli
2015-03-13 11:20 ` Masami Hiramatsu
2015-04-27 5:05 ` Naveen N. Rao
2015-04-27 5:09 ` Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 3/8] perf probe powerpc: Fix symbol fixup issues due to ELF type Naveen N. Rao
2015-03-12 20:23 ` Arnaldo Carvalho de Melo
2015-04-27 5:06 ` Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 4/8] perf probe powerpc: Handle powerpc dot symbols Naveen N. Rao
2015-03-12 20:26 ` Arnaldo Carvalho de Melo
2014-12-15 14:50 ` [PATCHv2 5/8] perf probe powerpc: Allow matching against " Naveen N. Rao
2015-03-12 20:30 ` Arnaldo Carvalho de Melo
2015-04-27 5:08 ` Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 6/8] perf tools powerpc: Fix PPC64 ELF ABIv2 symbol decoding Naveen N. Rao
2015-03-12 20:35 ` Arnaldo Carvalho de Melo
2014-12-15 14:50 ` [PATCHv2 7/8] perf probe powerpc: Use DWARF info only if necessary Naveen N. Rao
2014-12-15 14:50 ` [PATCHv2 8/8] perf probe powerpc: Fixup function entry if using kallsyms lookup Naveen N. Rao
2015-03-12 20:37 ` Arnaldo Carvalho de Melo [this message]
2015-01-28 5:42 ` [PATCHv2 0/8] Fix perf probe issues on powerpc Naveen N. Rao
2015-01-28 6:14 ` Michael Ellerman
2015-01-28 6:43 ` Naveen N. Rao
2015-01-30 2:19 ` Michael Ellerman
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=20150312203711.GI3550@kernel.org \
--to=acme@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen.n.rao@linux.vnet.ibm.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;
as well as URLs for NNTP newsgroup(s).