* [PATCH] perf report: do not drop last inlined frame
@ 2017-05-16 21:54 Milian Wolff
2017-05-17 4:27 ` Namhyung Kim
0 siblings, 1 reply; 2+ messages in thread
From: Milian Wolff @ 2017-05-16 21:54 UTC (permalink / raw)
To: Linux-kernel
Cc: linux-perf-users, Milian Wolff, Arnaldo Carvalho de Melo,
David Ahern, Namhyung Kim, Peter Zijlstra, Yao Jin
The very last inlined frame, i.e. the one furthest away from the
non-inlined frame, was silently dropped. This is apparent when
comparing the output of `perf script` and `addr2line`:
~~~~~~
$ perf script --inline
...
a.out 26722 80836.309329: 72425 cycles:
21493 __hypot_finite (/usr/lib/libm-2.25.so)
a4a std::abs<double> (inline) (/tmp/a.out)
a4a std::_Norm_helper<true>::_S_do_it<double> (inline) (/tmp/a.out)
a4a std::norm<double> (inline) (/tmp/a.out)
a4a main (/tmp/a.out)
20510 __libc_start_main (/usr/lib/libc-2.25.so)
bd9 _start (/tmp/a.out)
$ addr2line -a -f -i -e /tmp/a.out a4a | c++filt
0x0000000000000a4a
std::__complex_abs(doublecomplex )
/usr/include/c++/6.3.1/complex:589
double std::abs<double>(std::complex<double> const&)
/usr/include/c++/6.3.1/complex:597
double std::_Norm_helper<true>::_S_do_it<double>(std::complex<double> const&)
/usr/include/c++/6.3.1/complex:654
double std::norm<double>(std::complex<double> const&)
/usr/include/c++/6.3.1/complex:664
main
/tmp/inlining.cpp:14
~~~~~
Note how `std::__complex_abs` is missing from the `perf script`
output. This is similarly showing up in `perf report`. The patch
here fixes this issue, and the output becomes:
~~~~~
a.out 26722 80836.309329: 72425 cycles:
21493 __hypot_finite (/usr/lib/libm-2.25.so)
ace3 hypot (/usr/lib/libm-2.25.so)
a4a std::__complex_abs (inline) (/tmp/a.out)
a4a std::abs<double> (inline) (/tmp/a.out)
a4a std::_Norm_helper<true>::_S_do_it<double> (inline) (/tmp/a.out)
a4a std::norm<double> (inline) (/tmp/a.out)
a4a main (/tmp/a.out)
20510 __libc_start_main (/usr/lib/libc-2.25.so)
bd9 _start (/tmp/a.out)
~~~~~
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Yao Jin <yao.jin@linux.intel.com>
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
---
tools/perf/util/srcline.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 8df6b29bf984..160999c51fb0 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -208,6 +208,16 @@ static void addr2line_cleanup(struct a2l_data *a2l)
#define MAX_INLINE_NEST 1024
+static int inline_list__append_dso_a2l(struct dso *dso,
+ struct inline_node *node)
+{
+ struct a2l_data *a2l = dso->a2l;
+ char *funcname = a2l->funcname ? strdup(a2l->funcname) : NULL;
+ char *filename = a2l->filename ? strdup(a2l->filename) : NULL;
+
+ return inline_list__append(filename, funcname, a2l->line, node, dso);
+}
+
static int addr2line(const char *dso_name, u64 addr,
char **file, unsigned int *line, struct dso *dso,
bool unwind_inlines, struct inline_node *node)
@@ -233,17 +243,15 @@ static int addr2line(const char *dso_name, u64 addr,
if (a2l->found && unwind_inlines) {
int cnt = 0;
+ if (node && inline_list__append_dso_a2l(dso, node))
+ return 0;
+
while (bfd_find_inliner_info(a2l->abfd, &a2l->filename,
&a2l->funcname, &a2l->line) &&
cnt++ < MAX_INLINE_NEST) {
- if (node != NULL) {
- if (inline_list__append(strdup(a2l->filename),
- strdup(a2l->funcname),
- a2l->line, node,
- dso) != 0)
- return 0;
- }
+ if (node && inline_list__append_dso_a2l(dso, node))
+ return 0;
}
}
--
2.13.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf report: do not drop last inlined frame
2017-05-16 21:54 [PATCH] perf report: do not drop last inlined frame Milian Wolff
@ 2017-05-17 4:27 ` Namhyung Kim
0 siblings, 0 replies; 2+ messages in thread
From: Namhyung Kim @ 2017-05-17 4:27 UTC (permalink / raw)
To: Milian Wolff
Cc: Linux-kernel, linux-perf-users, Arnaldo Carvalho de Melo,
David Ahern, Peter Zijlstra, Yao Jin, kernel-team
On Tue, May 16, 2017 at 11:54:33PM +0200, Milian Wolff wrote:
> The very last inlined frame, i.e. the one furthest away from the
> non-inlined frame, was silently dropped. This is apparent when
> comparing the output of `perf script` and `addr2line`:
>
> ~~~~~~
> $ perf script --inline
> ...
> a.out 26722 80836.309329: 72425 cycles:
> 21493 __hypot_finite (/usr/lib/libm-2.25.so)
> a4a std::abs<double> (inline) (/tmp/a.out)
> a4a std::_Norm_helper<true>::_S_do_it<double> (inline) (/tmp/a.out)
> a4a std::norm<double> (inline) (/tmp/a.out)
> a4a main (/tmp/a.out)
> 20510 __libc_start_main (/usr/lib/libc-2.25.so)
> bd9 _start (/tmp/a.out)
>
> $ addr2line -a -f -i -e /tmp/a.out a4a | c++filt
> 0x0000000000000a4a
> std::__complex_abs(doublecomplex )
> /usr/include/c++/6.3.1/complex:589
> double std::abs<double>(std::complex<double> const&)
> /usr/include/c++/6.3.1/complex:597
> double std::_Norm_helper<true>::_S_do_it<double>(std::complex<double> const&)
> /usr/include/c++/6.3.1/complex:654
> double std::norm<double>(std::complex<double> const&)
> /usr/include/c++/6.3.1/complex:664
> main
> /tmp/inlining.cpp:14
> ~~~~~
>
> Note how `std::__complex_abs` is missing from the `perf script`
> output. This is similarly showing up in `perf report`. The patch
> here fixes this issue, and the output becomes:
>
> ~~~~~
> a.out 26722 80836.309329: 72425 cycles:
> 21493 __hypot_finite (/usr/lib/libm-2.25.so)
> ace3 hypot (/usr/lib/libm-2.25.so)
> a4a std::__complex_abs (inline) (/tmp/a.out)
> a4a std::abs<double> (inline) (/tmp/a.out)
> a4a std::_Norm_helper<true>::_S_do_it<double> (inline) (/tmp/a.out)
> a4a std::norm<double> (inline) (/tmp/a.out)
> a4a main (/tmp/a.out)
> 20510 __libc_start_main (/usr/lib/libc-2.25.so)
> bd9 _start (/tmp/a.out)
> ~~~~~
>
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Yao Jin <yao.jin@linux.intel.com>
> Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
I also noticed this and thank you for fixing it.
Acked-by: Namhyung Kim <namhyung@kernel.org>
Thanks,
Namhyung
> ---
> tools/perf/util/srcline.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
> index 8df6b29bf984..160999c51fb0 100644
> --- a/tools/perf/util/srcline.c
> +++ b/tools/perf/util/srcline.c
> @@ -208,6 +208,16 @@ static void addr2line_cleanup(struct a2l_data *a2l)
>
> #define MAX_INLINE_NEST 1024
>
> +static int inline_list__append_dso_a2l(struct dso *dso,
> + struct inline_node *node)
> +{
> + struct a2l_data *a2l = dso->a2l;
> + char *funcname = a2l->funcname ? strdup(a2l->funcname) : NULL;
> + char *filename = a2l->filename ? strdup(a2l->filename) : NULL;
> +
> + return inline_list__append(filename, funcname, a2l->line, node, dso);
> +}
> +
> static int addr2line(const char *dso_name, u64 addr,
> char **file, unsigned int *line, struct dso *dso,
> bool unwind_inlines, struct inline_node *node)
> @@ -233,17 +243,15 @@ static int addr2line(const char *dso_name, u64 addr,
> if (a2l->found && unwind_inlines) {
> int cnt = 0;
>
> + if (node && inline_list__append_dso_a2l(dso, node))
> + return 0;
> +
> while (bfd_find_inliner_info(a2l->abfd, &a2l->filename,
> &a2l->funcname, &a2l->line) &&
> cnt++ < MAX_INLINE_NEST) {
>
> - if (node != NULL) {
> - if (inline_list__append(strdup(a2l->filename),
> - strdup(a2l->funcname),
> - a2l->line, node,
> - dso) != 0)
> - return 0;
> - }
> + if (node && inline_list__append_dso_a2l(dso, node))
> + return 0;
> }
> }
>
> --
> 2.13.0
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-17 4:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-16 21:54 [PATCH] perf report: do not drop last inlined frame Milian Wolff
2017-05-17 4:27 ` Namhyung Kim
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).