From: Masami Hiramatsu <mhiramat@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-kernel@vger.kernel.org
Subject: [BUGFIX PATCH V2 5/6] perf/probe: Fix to show inlined function callsite without entry_pc
Date: Sat, 26 Oct 2019 18:01:04 +0900 [thread overview]
Message-ID: <157208046449.16551.10150500484956159170.stgit@devnote2> (raw)
In-Reply-To: <157208041894.16551.2733647209130045685.stgit@devnote2>
Fix perf-probe --line option to show inlined function callsite
lines even if the function DIE has only ranges.
Without this,
# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/build/linux-pvZVvI/linux-5.0.0/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
__amd_put_nb_event_constraints(cpuc, event);
5 }
With this patch,
# perf probe -L amd_put_event_constraints
<amd_put_event_constraints@/build/linux-pvZVvI/linux-5.0.0/arch/x86/events/amd/core.c:0>
0 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
struct perf_event *event)
2 {
3 if (amd_has_nb(cpuc) && amd_is_nb_event(&event->hw))
4 __amd_put_nb_event_constraints(cpuc, event);
5 }
Fixes: 4cc9cec636e7 ("perf probe: Introduce lines walker interface")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
tools/perf/util/dwarf-aux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c
index 063f71da6b63..e0c507d6b3b4 100644
--- a/tools/perf/util/dwarf-aux.c
+++ b/tools/perf/util/dwarf-aux.c
@@ -695,7 +695,7 @@ static int __die_walk_funclines_cb(Dwarf_Die *in_die, void *data)
if (dwarf_tag(in_die) == DW_TAG_inlined_subroutine) {
fname = die_get_call_file(in_die);
lineno = die_get_call_lineno(in_die);
- if (fname && lineno > 0 && dwarf_entrypc(in_die, &addr) == 0) {
+ if (fname && lineno > 0 && die_entrypc(in_die, &addr) == 0) {
lw->retval = lw->callback(fname, lineno, addr, lw->data);
if (lw->retval != 0)
return DIE_FIND_CB_END;
next prev parent reply other threads:[~2019-10-26 9:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-26 9:00 [BUGFIX PATCH V2 0/6] perf/probe: Additional fixes for range only functions Masami Hiramatsu
2019-10-26 9:00 ` [BUGFIX PATCH V2 1/6] perf/probe: Fix wrong address verification Masami Hiramatsu
2019-10-26 9:00 ` [BUGFIX PATCH V2 2/6] perf/probe: Fix to probe a function which has no entry pc Masami Hiramatsu
2019-10-26 9:00 ` [BUGFIX PATCH V2 3/6] perf/probe: Fix to probe an inline " Masami Hiramatsu
2019-10-26 9:00 ` [BUGFIX PATCH V2 4/6] perf/probe: Fix to list probe event with correct line number Masami Hiramatsu
2019-10-26 9:01 ` Masami Hiramatsu [this message]
2019-10-26 9:01 ` [BUGFIX PATCH V2 6/6] perf/probe: Fix to show ranges of variables in functions without entry_pc Masami Hiramatsu
2019-10-28 14:16 ` [BUGFIX PATCH V2 0/6] perf/probe: Additional fixes for range only functions Arnaldo Carvalho de Melo
2019-10-28 14:53 ` Masami Hiramatsu
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=157208046449.16551.10150500484956159170.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=namhyung@kernel.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
Powered by JetHome