From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 21/37] perf machine: Fix machine__findnew_module_map to put registered map
Date: Thu, 19 Nov 2015 14:53:07 -0300 [thread overview]
Message-ID: <1447955603-24895-22-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1447955603-24895-1-git-send-email-acme@kernel.org>
From: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Fix machine object to drop the reference to the map object after it
inserted it into machine->kmaps.
refcnt debugger shows what happened:
----
==== [2] ====
Unreclaimed map: 0x346f750
Refcount +1 => 1 at
./perf(map__new2+0xb5) [0x4bdea5]
./perf() [0x4b8aaf]
./perf(modules__parse+0xfc) [0x4a9cbc]
./perf() [0x4b83c0]
./perf(machine__create_kernel_maps+0x148) [0x4bb208]
./perf(machine__new_host+0xfa) [0x4bb3fa]
./perf(init_probe_symbol_maps+0x93) [0x5062b3]
./perf() [0x455ffa]
./perf(cmd_probe+0x6c) [0x4566bc]
./perf() [0x47abc5]
./perf(main+0x610) [0x421f90]
/lib64/libc.so.6(__libc_start_main+0xf5) [0x7f5373899af5]
./perf() [0x4220a9]
Refcount +1 => 2 at
./perf(maps__insert+0x9a) [0x4bfd4a]
./perf() [0x4b8acb]
./perf(modules__parse+0xfc) [0x4a9cbc]
./perf() [0x4b83c0]
./perf(machine__create_kernel_maps+0x148) [0x4bb208]
./perf(machine__new_host+0xfa) [0x4bb3fa]
./perf(init_probe_symbol_maps+0x93) [0x5062b3]
./perf() [0x455ffa]
./perf(cmd_probe+0x6c) [0x4566bc]
./perf() [0x47abc5]
./perf(main+0x610) [0x421f90]
/lib64/libc.so.6(__libc_start_main+0xf5) [0x7f5373899af5]
./perf() [0x4220a9]
Refcount -1 => 1 at
./perf(map_groups__exit+0x94) [0x4bea54]
./perf(machine__delete+0x3d) [0x4b91ed]
./perf(exit_probe_symbol_maps+0x28) [0x506358]
./perf() [0x45628a]
./perf(cmd_probe+0x6c) [0x4566bc]
./perf() [0x47abc5]
./perf(main+0x610) [0x421f90]
/lib64/libc.so.6(__libc_start_main+0xf5) [0x7f5373899af5]
./perf() [0x4220a9]
----
This pattern clearly shows that the refcnt of the map is acquired twice
by map__new2 and maps__insert but released onlu once at
map_groups__exit, when we purge its maps rbtree.
Since maps__insert already reference counted the map, we have to drop
the constructor (map__new2) reference count right after inserting it.
These happened in machine__findnew_module_map, as below.
----
# eu-addr2line -e ./perf -f 0x4b8aaf
machine__findnew_module_map inlined at util/machine.c:1046
in machine__create_module
util/machine.c:582
# eu-addr2line -e ./perf -f 0x4b8acb
map_groups__insert inlined at util/machine.c:585
in machine__create_module
util/map.h:208
----
(note that both are at util/machine.c:58X which is
machine__findnew_module_map)
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20151118064020.30709.40499.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/machine.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 8b303ff20289..0487d7795f13 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -585,6 +585,8 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start,
map_groups__insert(&machine->kmaps, map);
+ /* Put the map here because map_groups__insert alread got it */
+ map__put(map);
out:
free(m.name);
return map;
--
2.1.0
next prev parent reply other threads:[~2015-11-19 18:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-19 17:52 [GIT PULL 00/37] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 01/37] perf test: Fix build of BPF and LLVM on older glibc libraries Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 02/37] tools: Fix selftests_install Makefile rule Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 03/37] tools: Adopt memdup() from tools/perf, moving it to tools/lib/string.c Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 04/37] tools: Clone the kernel's strtobool function Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 05/37] bpf tools: Load a program with different instances using preprocessor Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 06/37] perf bpf: Add BPF_PROLOGUE config options for further patches Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 07/37] perf bpf: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 08/37] perf bpf: Allow BPF program attach to uprobe events Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 09/37] perf bpf: Allow attaching BPF programs to modules symbols Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 10/37] perf bpf: Allow BPF program config probing options Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 11/37] perf bpf: Add prologue for BPF programs for fetching arguments Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 12/37] perf bpf: Generate prologue for BPF programs Arnaldo Carvalho de Melo
2015-11-19 17:52 ` [PATCH 13/37] perf test: Test the BPF prologue adding infrastructure Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 14/37] perf test: Fix 'perf test BPF' when it fails to find a suitable vmlinux Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 15/37] perf bpf: Use same BPF program if arguments are identical Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 16/37] perf tests: Pass the subtest index to each test routine Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 17/37] perf test: Print result for each LLVM subtest Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 18/37] perf test: Print result for each BPF subtest Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 19/37] perf test: Mute test cases error messages if verbose == 0 Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 20/37] perf probe: Fix to free temporal Dwarf_Frame Arnaldo Carvalho de Melo
2015-11-19 17:53 ` Arnaldo Carvalho de Melo [this message]
2015-11-19 17:53 ` [PATCH 22/37] perf machine: Fix machine__destroy_kernel_maps to drop vmlinux_maps references Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 23/37] perf machine: Fix to destroy kernel maps when machine exits Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 24/37] perf tools: Make perf_exec_path() always return malloc'd string Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 25/37] perf tools: Fix to put new map after inserting to map_groups in dso__load_sym Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 26/37] perf tools: Fix __dsos__addnew to put dso after adding it to the list Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 27/37] perf tools: Fix machine__create_kernel_maps to put kernel dso refcount Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 28/37] perf machine: Fix machine__findnew_module_map to put dso Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 29/37] perf report: Support folded callchain mode on --stdio Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 30/37] perf callchain: Abstract callchain print function Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 31/37] perf callchain: Add count fields to struct callchain_node Arnaldo Carvalho de Melo
2015-11-23 14:35 ` Frederic Weisbecker
2015-11-24 5:15 ` Namhyung Kim
2015-11-19 17:53 ` [PATCH 32/37] perf report: Add callchain value option Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 33/37] perf hists browser: Factor out hist_browser__show_callchain_list() Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 34/37] perf hists browser: Support flat callchains Arnaldo Carvalho de Melo
2015-11-23 15:16 ` Frederic Weisbecker
2015-11-24 5:27 ` Namhyung Kim
2015-11-24 14:45 ` Arnaldo Carvalho de Melo
2015-11-25 1:26 ` Namhyung Kim
2015-11-25 1:34 ` Arnaldo Carvalho de Melo
2015-11-25 2:10 ` Arnaldo Carvalho de Melo
2015-11-25 21:03 ` Namhyung Kim
2015-11-19 17:53 ` [PATCH 35/37] perf hists browser: Support folded callchains Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 36/37] perf ui/gtk: Support flat callchains Arnaldo Carvalho de Melo
2015-11-19 17:53 ` [PATCH 37/37] perf ui/gtk: Support folded callchains Arnaldo Carvalho de Melo
2015-11-20 10:01 ` [GIT PULL 00/37] perf/core improvements and fixes 平松雅巳 / HIRAMATU,MASAMI
2015-11-20 12:08 ` 'Arnaldo Carvalho de Melo'
2015-11-20 16:50 ` 平松雅巳 / HIRAMATU,MASAMI
2015-11-23 8:16 ` Ingo Molnar
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=1447955603-24895-22-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@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