Messages in this thread Patch in this message | | | Date | Tue, 30 Dec 2014 14:38:13 +0900 | From | Namhyung Kim <> | Subject | Re: "perf top -g" leaking ~300MB per second. |
| |
Hi David and Markus,
On Sat, Dec 13, 2014 at 11:16:43AM -0700, David Ahern wrote: > On 12/13/14 8:26 AM, Arnaldo Carvalho de Melo wrote: > >The callchain code was done initially for 'report' and when I made 'top' > >reuse the hist_entry code allowing 'top' to collect callchains was too > >easy, but then we need to go thru the callchain/hists/hist_entry code to > >make sure that they don't leak, will try to do it... > > > > As I recall it is build up of the dead_threads list.
Maybe. But I guess it's because of leak of callchains..
Markus, could you please test below patch how much it affects?
From b29ccd79727654653986ab1170e0b1f5d6518035 Mon Sep 17 00:00:00 2001 From: Namhyung Kim <namhyung@kernel.org> Date: Tue, 30 Dec 2014 14:28:45 +0900 Subject: [PATCH] perf callchain: Free callchains when hist entries are deleted
Markus reported that "perf top -g" can leak ~300MB per second on his machine. This is partly because it missed to free callchains when hist entries are deleted. Fix it.
Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/util/callchain.c | 30 ++++++++++++++++++++++++++++++ tools/perf/util/callchain.h | 2 ++ tools/perf/util/hist.c | 1 + 3 files changed, 33 insertions(+)
diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 64b377e591e4..14e7a123d43b 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -841,3 +841,33 @@ char *callchain_list__sym_name(struct callchain_list *cl, return bf; } + +static void free_callchain_node(struct callchain_node *node) +{ + struct callchain_list *list, *tmp; + struct callchain_node *child; + struct rb_node *n; + + list_for_each_entry_safe(list, tmp, &node->val, list) { + list_del(&list->list); + free(list); + } + + n = rb_first(&node->rb_root_in); + while (n) { + child = container_of(n, struct callchain_node, rb_node_in); + n = rb_next(n); + rb_erase(&child->rb_node_in, &node->rb_root_in); + + free_callchain_node(child); + free(child); + } +} + +void free_callchain(struct callchain_root *root) +{ + if (!symbol_conf.use_callchain) + return; + + free_callchain_node(&root->node); +} diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index dbc08cf5f970..c0ec1acc38e4 100644 --- a/tools/perf/util/callchain.h +++ b/tools/perf/util/callchain.h @@ -198,4 +198,6 @@ static inline int arch_skip_callchain_idx(struct thread *thread __maybe_unused, char *callchain_list__sym_name(struct callchain_list *cl, char *bf, size_t bfsize, bool show_dso); +void free_callchain(struct callchain_root *root); + #endif /* __PERF_CALLCHAIN_H */ diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 30ff2cb92884..e17163fcb702 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -945,6 +945,7 @@ void hist_entry__delete(struct hist_entry *he) zfree(&he->mem_info); zfree(&he->stat_acc); free_srcline(he->srcline); + free_callchain(he->callchain); free(he); } -- 2.1.3
| |