perf tools: Fix memory leak in addr2inlines()
Namhyung Kim
maintainerPATCH 1/2 perf tools: Fix memory leak in addr2inlines()
When libbfd is not used, addr2inlines() executes addr2line -i and process output line by line. But it resets filename to NULL in the loop so getline() allocates additional memory everytime instead of realloc.
--- tools/perf/util/srcline.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
tools/perf/util/srcline.c +2 -5
@@ -456,20 +456,17 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,while (getline (&filename, &len, fp) !=-1 ) {char *srcline; -if (filename_split (filename, &line_nr) !=1 ) { -free (filename); +if (filename_split (filename, &line_nr) !=1 ) goto out; - } srcline =srcline_from_fileline (filename, line_nr);if (inline_list__append (sym, srcline, node) !=0 ) goto out; - - filename =NULL ; } out:pclose (fp); +free (filename);return node; }
Signature · 1 line
2.14.3
Namhyung Kim
maintainerPATCH 2/2 perf tools: Show correct function name for srcline of callchains
When libbfd is not used, it doesn't show proper function name and reuse the original symbol of the sample. That's because it passes the original sym to inline_list__append(). As addr2line -f returns function names as well, use that to create ad inline_sym and pass it to inline_list__append().
For example, following data shows that inlined entries of main have same name (main).
Before:
$ perf report -g srcline -q | head
45.22% inlining libm-2.26.so [.] __hypot_finite
|
---__hypot_finite ??:0
|
|--44.15%--hypot ??:0
| main complex:589
| main complex:597
| main complex:654
| main complex:664
| main inlining.cpp:14After:
$ perf report -g srcline -q | head
45.22% inlining libm-2.26.so [.] __hypot_finite
|
---__hypot_finite
|
|--44.15%--hypot
| std::__complex_abs complex:589 (inlined)
| std::abs<double> complex:597 (inlined)
| std::_Norm_helper<true>::_S_do_it<double> complex:654 (inlined)
| std::norm<double> complex:664 (inlined)
| main inlining.cpp:14--- tools/perf/util/srcline.c | 95 +++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 40 deletions(-)
tools/perf/util/srcline.c +55 -40
@@ -10,7 +10,7 @@#include "util/debug.h" #include "util/callchain.h" #include "srcline.h" - +#include "string2.h" #include "symbol.h" bool srcline_full_filename;
@@ -77,6 +77,41 @@ static char *srcline_from_fileline(const char *file, unsigned int line)return srcline; } +static struct symbol *new_inline_sym (struct dso *dso, +struct symbol *base_sym, +const char *funcname) +{ +struct symbol *inline_sym; +char *demangled =NULL ; + +if (dso) { + demangled =dso__demangle_sym (dso,0 , funcname); +if (demangled) + funcname = demangled; + } + +if (base_sym &&strcmp (funcname, base_sym->name) ==0 ) { +/* reuse the real, existing symbol */ + inline_sym = base_sym; +/* ensure that we don't alias an inlined symbol, which could +* lead to double frees in inline_node__delete +*/ +assert (!base_sym->inlined); + }else { +/* create a fake symbol for the inline frame */ + inline_sym =symbol__new (base_sym ? base_sym->start :0 , + base_sym ? base_sym->end :0 , + base_sym ? base_sym->binding :0 , + funcname); +if (inline_sym) + inline_sym->inlined =1 ; + } + +free (demangled); + +return inline_sym; +} +#ifdef HAVE_LIBBFD_SUPPORT /*
@@ -219,41 +254,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)#define MAX_INLINE_NEST 1024 -static struct symbol *new_inline_sym (struct dso *dso, -struct symbol *base_sym, -const char *funcname) -{ -struct symbol *inline_sym; -char *demangled =NULL ; - -if (dso) { - demangled =dso__demangle_sym (dso,0 , funcname); -if (demangled) - funcname = demangled; - } - -if (base_sym &&strcmp (funcname, base_sym->name) ==0 ) { -/* reuse the real, existing symbol */ - inline_sym = base_sym; -/* ensure that we don't alias an inlined symbol, which could -* lead to double frees in inline_node__delete -*/ -assert (!base_sym->inlined); - }else { -/* create a fake symbol for the inline frame */ - inline_sym =symbol__new (base_sym ? base_sym->start :0 , - base_sym ? base_sym->end :0 , - base_sym ? base_sym->binding :0 , - funcname); -if (inline_sym) - inline_sym->inlined =1 ; - } - -free (demangled); - -return inline_sym; -} -static int inline_list__append_dso_a2l (struct dso *dso,struct inline_node *node,struct symbol *sym)
@@ -432,10 +432,11 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,char cmd[PATH_MAX ];struct inline_node *node;char *filename =NULL ; -size_t len; +char *funcname =NULL ; +size_t filelen, funclen;unsigned int line_nr =0 ; -scnprintf (cmd,sizeof (cmd),"addr2line -e %s -i %016" PRIx64, +scnprintf (cmd,sizeof (cmd),"addr2line -e %s -i -f %016" PRIx64, dso_name, addr); fp =popen (cmd,"r" );
@@ -453,20 +454,34 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,INIT_LIST_HEAD (&node->val); node->addr = addr; -while (getline (&filename, &len, fp) !=-1 ) { +/* addr2line -f generates two lines for each inlined functions */ +while (getline (&funcname, &funclen, fp) !=-1 ) {char *srcline; +struct symbol *inline_sym; + +rtrim (funcname); + +if (getline (&filename, &filelen, fp) ==-1 ) + goto out;if (filename_split (filename, &line_nr) !=1 ) goto out; srcline =srcline_from_fileline (filename, line_nr); -if (inline_list__append (sym, srcline, node) !=0 ) + inline_sym =new_inline_sym (dso, sym, funcname); + +if (inline_list__append (inline_sym, srcline, node) !=0 ) { +free (srcline); +if (inline_sym && inline_sym->inlined) +symbol__delete (inline_sym); goto out; + } } out:pclose (fp);free (filename); +free (funcname);return node; }
Signature · 1 line
2.14.3
A message that is not in the archive (sent off-list or not yet received): 2208660.mvSdWdKhUF@milian-kdab2
Namhyung Kim
maintainerRe: [PATCH 2/2] perf tools: Show correct function name for srcline of callchains
Hi Milian,
Quoted 8 lines · Milian Wolff
Quoted 5 lines · CET Namhyung Kim
When libbfd is not used, it doesn't show proper function name and reuse the original symbol of the sample. That's because it passes the original sym to
inline_list__append(). Asaddr2line -freturns function names as well, use that to create adinline_symand pass it toinline_list__append().Typo above: "ad" -> "and"
I think it's "an" instead of "and". :)
Quoted 4 lines
Otherwise these patches look fine to me
Reviewed-by Milian Wolff <[email protected]>
Thanks,
Namhyung
Arnaldo Carvalho de Melo
maintainerRe: [PATCH 2/2] perf tools: Show correct function name for srcline of callchains
Em Wed, Nov 01, 2017 at 09:05:59PM +0900, Namhyung Kim escreveu:
Quoted 10 lines
Hi Milian,
Quoted 7 lines · Milian Wolff
Quoted 5 lines · CET Namhyung Kim
When libbfd is not used, it doesn't show proper function name and reuse the original symbol of the sample. That's because it passes the original sym to
inline_list__append(). Asaddr2line -freturns function names as well, use that to create adinline_symand pass it toinline_list__append().
Quoted 3 lines
Quoted 1 line
Typo above: "ad" -> "and"
I think it's "an" instead of "and". :)
I didn't catch that, bummer! 8-) Ok, made the ad -> and -> an change :-)
And added Milian's Reviewed-by,
- Arnaldo
Quoted 6 lines
Quoted 3 lines
Otherwise these patches look fine to me
Reviewed-by Milian Wolff <[email protected]>Thanks,
Namhyung
Re: [PATCH 2/2] perf tools: Show correct function name for srcline of callchains
In reply to Namhyung KimQuoted 35 lines · Namhyung Kim
When libbfd is not used, it doesn't show proper function name and reuse the original symbol of the sample. That's because it passes the original sym to
inline_list__append(). Asaddr2line -freturns function names as well, use that to create adinline_symand pass it toinline_list__append().For example, following data shows that inlined entries of main have same name (main).
Before:
$ perf report -g srcline -q | head 45.22% inlining libm-2.26.so [.] __hypot_finite | ---__hypot_finite ??:0 | |--44.15%--hypot ??:0 | main complex:589 | main complex:597 | main complex:654 | main complex:664 | main inlining.cpp:14After:
$ perf report -g srcline -q | head 45.22% inlining libm-2.26.so [.] __hypot_finite | ---__hypot_finite | |--44.15%--hypot | std::__complex_abs complex:589 (inlined) | std::abs<double> complex:597 (inlined) | std::_Norm_helper<true>::_S_do_it<double> complex:654 (inlined) | std::norm<double> complex:664 (inlined) | main inlining.cpp:14
Quoted 3 lines
Cc Jin Yao <[email protected]>Cc Milian Wolff <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
looks ok
jirka
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf srcline: Show correct function name for srcline of callchains
In reply to Namhyung Kimperf srcline: Show correct function name for srcline of callchains
Commit-ID: 7285cf3325b4a1dfb336d31eebc27dfbc30fb9aa Gitweb: https://git.kernel.org/tip/7285cf3325b4a1dfb336d31eebc27dfbc30fb9aa Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 31 Oct 2017 11:06:54 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 1 Nov 2017 11:44:38 -0300
perf srcline: Show correct function name for srcline of callchains
When libbfd is not used, it doesn't show proper function name and reuse the original symbol of the sample. That's because it passes the original sym to inline_list__append(). As addr2line -f returns function names as well, use that to create an inline_sym and pass it to inline_list__append().
For example, following data shows that inlined entries of main have same name (main).
Before:
$ perf report -g srcline -q | head
45.22% inlining libm-2.26.so [.] __hypot_finite
|
---__hypot_finite ??:0
|
|--44.15%--hypot ??:0
| main complex:589
| main complex:597
| main complex:654
| main complex:664
| main inlining.cpp:14After:
$ perf report -g srcline -q | head
45.22% inlining libm-2.26.so [.] __hypot_finite
|
---__hypot_finite
|
|--44.15%--hypot
| std::__complex_abs complex:589 (inlined)
| std::abs<double> complex:597 (inlined)
| std::_Norm_helper<true>::_S_do_it<double> complex:654 (inlined)
| std::norm<double> complex:664 (inlined)
| main inlining.cpp:14--- tools/perf/util/srcline.c | 95 +++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 40 deletions(-)
tools/perf/util/srcline.c +55 -40
@@ -10,7 +10,7 @@#include "util/debug.h" #include "util/callchain.h" #include "srcline.h" - +#include "string2.h" #include "symbol.h" bool srcline_full_filename;
@@ -77,6 +77,41 @@ static char *srcline_from_fileline(const char *file, unsigned int line)return srcline; } +static struct symbol *new_inline_sym (struct dso *dso, +struct symbol *base_sym, +const char *funcname) +{ +struct symbol *inline_sym; +char *demangled =NULL ; + +if (dso) { + demangled =dso__demangle_sym (dso,0 , funcname); +if (demangled) + funcname = demangled; + } + +if (base_sym &&strcmp (funcname, base_sym->name) ==0 ) { +/* reuse the real, existing symbol */ + inline_sym = base_sym; +/* ensure that we don't alias an inlined symbol, which could +* lead to double frees in inline_node__delete +*/ +assert (!base_sym->inlined); + }else { +/* create a fake symbol for the inline frame */ + inline_sym =symbol__new (base_sym ? base_sym->start :0 , + base_sym ? base_sym->end :0 , + base_sym ? base_sym->binding :0 , + funcname); +if (inline_sym) + inline_sym->inlined =1 ; + } + +free (demangled); + +return inline_sym; +} +#ifdef HAVE_LIBBFD_SUPPORT /*
@@ -219,41 +254,6 @@ static void addr2line_cleanup(struct a2l_data *a2l)#define MAX_INLINE_NEST 1024 -static struct symbol *new_inline_sym (struct dso *dso, -struct symbol *base_sym, -const char *funcname) -{ -struct symbol *inline_sym; -char *demangled =NULL ; - -if (dso) { - demangled =dso__demangle_sym (dso,0 , funcname); -if (demangled) - funcname = demangled; - } - -if (base_sym &&strcmp (funcname, base_sym->name) ==0 ) { -/* reuse the real, existing symbol */ - inline_sym = base_sym; -/* ensure that we don't alias an inlined symbol, which could -* lead to double frees in inline_node__delete -*/ -assert (!base_sym->inlined); - }else { -/* create a fake symbol for the inline frame */ - inline_sym =symbol__new (base_sym ? base_sym->start :0 , - base_sym ? base_sym->end :0 , - base_sym ? base_sym->binding :0 , - funcname); -if (inline_sym) - inline_sym->inlined =1 ; - } - -free (demangled); - -return inline_sym; -} -static int inline_list__append_dso_a2l (struct dso *dso,struct inline_node *node,struct symbol *sym)
@@ -432,10 +432,11 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,char cmd[PATH_MAX ];struct inline_node *node;char *filename =NULL ; -size_t len; +char *funcname =NULL ; +size_t filelen, funclen;unsigned int line_nr =0 ; -scnprintf (cmd,sizeof (cmd),"addr2line -e %s -i %016" PRIx64, +scnprintf (cmd,sizeof (cmd),"addr2line -e %s -i -f %016" PRIx64, dso_name, addr); fp =popen (cmd,"r" );
@@ -453,20 +454,34 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,INIT_LIST_HEAD (&node->val); node->addr = addr; -while (getline (&filename, &len, fp) !=-1 ) { +/* addr2line -f generates two lines for each inlined functions */ +while (getline (&funcname, &funclen, fp) !=-1 ) {char *srcline; +struct symbol *inline_sym; + +rtrim (funcname); + +if (getline (&filename, &filelen, fp) ==-1 ) + goto out;if (filename_split (filename, &line_nr) !=1 ) goto out; srcline =srcline_from_fileline (filename, line_nr); -if (inline_list__append (sym, srcline, node) !=0 ) + inline_sym =new_inline_sym (dso, sym, funcname); + +if (inline_list__append (inline_sym, srcline, node) !=0 ) { +free (srcline); +if (inline_sym && inline_sym->inlined) +symbol__delete (inline_sym); goto out; + } } out:pclose (fp);free (filename); +free (funcname);return node; }
Quoted 7 lines · Namhyung Kim
When libbfd is not used,
addr2inlines()executesaddr2line -iand process output line by line. But it resets filename to NULL in the loop sogetline()allocates additional memory everytime instead of realloc.Cc Jin Yao <[email protected]>Cc Milian Wolff <[email protected]>Signed-off-by Namhyung Kim <[email protected]>
jirka
Quoted 34 lines
--- tools/perf/util/srcline.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)tools/perf/util/srcline.c +2
-5@@ -456,20 +456,17 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,while (getline (&filename, &len, fp) !=-1 ) {char *srcline; -if (filename_split (filename, &line_nr) !=1 ) { -free (filename); +if (filename_split (filename, &line_nr) !=1 ) goto out; - } srcline =srcline_from_fileline (filename, line_nr);if (inline_list__append (sym, srcline, node) !=0 ) goto out; - - filename =NULL ; } out:pclose (fp); +free (filename);return node; }Signature · 1 line
2.14.3
Arnaldo Carvalho de Melo
maintainerEm Wed, Nov 01, 2017 at 01:13:57PM +0100, Jiri Olsa escreveu:
Quoted 10 lines · Namhyung Kim
Quoted 7 lines
When libbfd is not used,
addr2inlines()executesaddr2line -iand process output line by line. But it resets filename to NULL in the loop sogetline()allocates additional memory everytime instead of realloc.Cc Jin Yao <[email protected]>Cc Milian Wolff <[email protected]>Signed-off-by Namhyung Kim <[email protected]>Acked-by Jiri Olsa <[email protected]>
Thanks, added this and the Reviewed-by to 2/2.
- Arnaldo
Quoted 36 lines
jirka
Quoted 34 lines
--- tools/perf/util/srcline.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)tools/perf/util/srcline.c +2
-5@@ -456,20 +456,17 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,while (getline (&filename, &len, fp) !=-1 ) {char *srcline; -if (filename_split (filename, &line_nr) !=1 ) { -free (filename); +if (filename_split (filename, &line_nr) !=1 ) goto out; - } srcline =srcline_from_fileline (filename, line_nr);if (inline_list__append (sym, srcline, node) !=0 ) goto out; - - filename =NULL ; } out:pclose (fp); +free (filename);return node; }Signature · 1 line
2.14.3
tip-bot for Namhyung Kim
merge bot[tip:perf/core] perf srcline: Fix memory leak in addr2inlines()
In reply to Namhyung Kimperf srcline: Fix memory leak in addr2inlines()
Commit-ID: b7b75a60b291cc699ca9bb2a8517a1b3b08bbeb1 Gitweb: https://git.kernel.org/tip/b7b75a60b291cc699ca9bb2a8517a1b3b08bbeb1 Author: Namhyung Kim <[email protected]> AuthorDate: Tue, 31 Oct 2017 11:06:53 +0900 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 1 Nov 2017 11:43:56 -0300
perf srcline: Fix memory leak in addr2inlines()
When libbfd is not used, addr2inlines() executes addr2line -i and process output line by line. But it resets filename to NULL in the loop so getline() allocates additional memory everytime instead of realloc.
--- tools/perf/util/srcline.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
tools/perf/util/srcline.c +2 -5
@@ -456,20 +456,17 @@ static struct inline_node *addr2inlines(const char *dso_name, u64 addr,while (getline (&filename, &len, fp) !=-1 ) {char *srcline; -if (filename_split (filename, &line_nr) !=1 ) { -free (filename); +if (filename_split (filename, &line_nr) !=1 ) goto out; - } srcline =srcline_from_fileline (filename, line_nr);if (inline_list__append (sym, srcline, node) !=0 ) goto out; - - filename =NULL ; } out:pclose (fp); +free (filename);return node; }