Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751516AbbLIPFv (ORCPT ); Wed, 9 Dec 2015 10:05:51 -0500 Received: from mail.kernel.org ([198.145.29.136]:52856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750933AbbLIPFt (ORCPT ); Wed, 9 Dec 2015 10:05:49 -0500 Date: Wed, 9 Dec 2015 12:05:43 -0300 From: Arnaldo Carvalho de Melo To: Masami Hiramatsu Cc: Peter Zijlstra , Adrian Hunter , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ingo Molnar , Namhyung Kim , Jiri Olsa Subject: Re: [PATCH perf/core 18/22] perf stat: Fix cmd_stat to release cpu_map Message-ID: <20151209150543.GI15864@kernel.org> References: <20151209021047.10245.8918.stgit@localhost.localdomain> <20151209021127.10245.93697.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20151209021127.10245.93697.stgit@localhost.localdomain> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2340 Lines: 75 Em Wed, Dec 09, 2015 at 11:11:27AM +0900, Masami Hiramatsu escreveu: > Fix cmd_stat() to release cpu_map objects (aggr_map and > cpus_aggr_map) afterwards. > > refcnt debugger shows that the cmd_stat initializes cpu_map > but not puts it. > ---- > # ./perf stat -v ls > .... > REFCNT: BUG: Unreclaimed objects found. > ==== [0] ==== > Unreclaimed cpu_map@0x29339c0 > Refcount +1 => 1 at > ./perf(cpu_map__empty_new+0x6d) [0x4e64bd] > ./perf(cmd_stat+0x5fe) [0x43594e] > ./perf() [0x47b785] > ./perf(main+0x617) [0x422587] > /lib64/libc.so.6(__libc_start_main+0xf5) [0x7f2dff420af5] > ./perf() [0x4226fd] > REFCNT: Total 1 objects are not reclaimed. > "cpu_map" leaks 1 objects > ---- > > Signed-off-by: Masami Hiramatsu > --- > tools/perf/builtin-stat.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index e74712d..eb6da8f 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -1094,6 +1094,16 @@ static int perf_stat_init_aggr_mode(void) > return cpus_aggr_map ? 0 : -ENOMEM; > } > > +static void perf_stat_exit_aggr_mode(void) > +{ > + if (aggr_map) > + cpu_map__put(aggr_map); > + if (cpus_aggr_map) > + cpu_map__put(cpus_aggr_map); No need to check if it is NULL, as the other __put operations, cpu_map__put() checks it: void cpu_map__put(struct cpu_map *map) { if (map && atomic_dec_and_test(&map->refcnt)) cpu_map__delete(map); } I'm removing those checks and applying this patch, thanks! > + aggr_map = NULL; > + cpus_aggr_map = NULL; > +} > + > /* > * Add default attributes, if there were no attributes specified or > * if -d/--detailed, -d -d or -d -d -d is used: > @@ -1442,6 +1452,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) > if (!forever && status != -1 && !interval) > print_counters(NULL, argc, argv); > > + perf_stat_exit_aggr_mode(); > perf_evlist__free_stats(evsel_list); > out: > perf_evlist__delete(evsel_list); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/