* [PATCH] perf record: Fix memory leak in vDSO
@ 2021-03-15 4:56 Namhyung Kim
2021-03-15 13:28 ` Jiri Olsa
0 siblings, 1 reply; 6+ messages in thread
From: Namhyung Kim @ 2021-03-15 4:56 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Jiri Olsa
Cc: Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin,
LKML, Andi Kleen, Ian Rogers
I got several memory leak reports from Asan with a simple command. It
was because VDSO is not released due to the refcount. Like in
__dsos_addnew_id(), it should put the refcount after adding to the list.
$ perf record true
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ]
=================================================================
==692599==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 439 byte(s) in 1 object(s) allocated from:
#0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
#1 0x559bce4aa8ee in dso__new_id util/dso.c:1256
#2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132
#3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347
#4 0x559bce50826c in map__new util/map.c:175
#5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787
#6 0x559bce512f6b in machines__deliver_event util/session.c:1481
#7 0x559bce515107 in perf_session__deliver_event util/session.c:1551
#8 0x559bce51d4d2 in do_flush util/ordered-events.c:244
#9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323
#10 0x559bce519bea in __perf_session__process_events util/session.c:2268
#11 0x559bce519bea in perf_session__process_events util/session.c:2297
#12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017
#13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234
#14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026
#15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858
#16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313
#17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365
#18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409
#19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539
#20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308
Indirect leak of 32 byte(s) in 1 object(s) allocated from:
#0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154
#1 0x559bce520907 in nsinfo__copy util/namespaces.c:169
#2 0x559bce50821b in map__new util/map.c:168
#3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787
#4 0x559bce512f6b in machines__deliver_event util/session.c:1481
#5 0x559bce515107 in perf_session__deliver_event util/session.c:1551
#6 0x559bce51d4d2 in do_flush util/ordered-events.c:244
#7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323
#8 0x559bce519bea in __perf_session__process_events util/session.c:2268
#9 0x559bce519bea in perf_session__process_events util/session.c:2297
#10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017
#11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234
#12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026
#13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858
#14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313
#15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365
#16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409
#17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539
#18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308
SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s).
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/util/vdso.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c
index 3cc91ad048ea..43beb169631d 100644
--- a/tools/perf/util/vdso.c
+++ b/tools/perf/util/vdso.c
@@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s
if (dso != NULL) {
__dsos__add(&machine->dsos, dso);
dso__set_long_name(dso, long_name, false);
+ /* Put dso here because __dsos_add already got it */
+ dso__put(dso);
}
return dso;
--
2.31.0.rc2.261.g7f71774620-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] perf record: Fix memory leak in vDSO 2021-03-15 4:56 [PATCH] perf record: Fix memory leak in vDSO Namhyung Kim @ 2021-03-15 13:28 ` Jiri Olsa 2021-03-16 2:28 ` Namhyung Kim 0 siblings, 1 reply; 6+ messages in thread From: Jiri Olsa @ 2021-03-15 13:28 UTC (permalink / raw) To: Namhyung Kim Cc: Arnaldo Carvalho de Melo, Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers On Mon, Mar 15, 2021 at 01:56:41PM +0900, Namhyung Kim wrote: > I got several memory leak reports from Asan with a simple command. It > was because VDSO is not released due to the refcount. Like in > __dsos_addnew_id(), it should put the refcount after adding to the list. > > $ perf record true > [ perf record: Woken up 1 times to write data ] > [ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ] > > ================================================================= > ==692599==ERROR: LeakSanitizer: detected memory leaks > > Direct leak of 439 byte(s) in 1 object(s) allocated from: > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > #1 0x559bce4aa8ee in dso__new_id util/dso.c:1256 > #2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132 > #3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347 > #4 0x559bce50826c in map__new util/map.c:175 > #5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > #6 0x559bce512f6b in machines__deliver_event util/session.c:1481 > #7 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > #8 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > #9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > #10 0x559bce519bea in __perf_session__process_events util/session.c:2268 > #11 0x559bce519bea in perf_session__process_events util/session.c:2297 > #12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > #13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > #14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > #15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > #16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > #17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > #18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > #19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > #20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > Indirect leak of 32 byte(s) in 1 object(s) allocated from: > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > #1 0x559bce520907 in nsinfo__copy util/namespaces.c:169 > #2 0x559bce50821b in map__new util/map.c:168 > #3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > #4 0x559bce512f6b in machines__deliver_event util/session.c:1481 > #5 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > #6 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > #7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > #8 0x559bce519bea in __perf_session__process_events util/session.c:2268 > #9 0x559bce519bea in perf_session__process_events util/session.c:2297 > #10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > #11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > #12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > #13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > #14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > #15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > #16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > #17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > #18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s). > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/util/vdso.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c > index 3cc91ad048ea..43beb169631d 100644 > --- a/tools/perf/util/vdso.c > +++ b/tools/perf/util/vdso.c > @@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s > if (dso != NULL) { > __dsos__add(&machine->dsos, dso); > dso__set_long_name(dso, long_name, false); > + /* Put dso here because __dsos_add already got it */ > + dso__put(dso); from quick look I don't understand why we take refcnt down right after adding to the list.. it would make sense to me if dso is not stored elsewhere so we want dsos__exit to release it.. but it's still stored in map object I checked and we do extra dso__get in machine__findnew_vdso (and also in dsos__findnew_id) ... so that one seems to me like the one we should remove but I might be missing something, I'll try to check more deeply later on jirka ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf record: Fix memory leak in vDSO 2021-03-15 13:28 ` Jiri Olsa @ 2021-03-16 2:28 ` Namhyung Kim 2021-03-16 12:56 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 6+ messages in thread From: Namhyung Kim @ 2021-03-16 2:28 UTC (permalink / raw) To: Jiri Olsa Cc: Arnaldo Carvalho de Melo, Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers On Mon, Mar 15, 2021 at 10:28 PM Jiri Olsa <jolsa@redhat.com> wrote: > > On Mon, Mar 15, 2021 at 01:56:41PM +0900, Namhyung Kim wrote: > > I got several memory leak reports from Asan with a simple command. It > > was because VDSO is not released due to the refcount. Like in > > __dsos_addnew_id(), it should put the refcount after adding to the list. > > > > $ perf record true > > [ perf record: Woken up 1 times to write data ] > > [ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ] > > > > ================================================================= > > ==692599==ERROR: LeakSanitizer: detected memory leaks > > > > Direct leak of 439 byte(s) in 1 object(s) allocated from: > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > #1 0x559bce4aa8ee in dso__new_id util/dso.c:1256 > > #2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132 > > #3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347 > > #4 0x559bce50826c in map__new util/map.c:175 > > #5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > #6 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > #7 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > #8 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > #9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > #10 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > #11 0x559bce519bea in perf_session__process_events util/session.c:2297 > > #12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > #13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > #14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > #15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > #16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > #17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > #18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > #19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > #20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > Indirect leak of 32 byte(s) in 1 object(s) allocated from: > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > #1 0x559bce520907 in nsinfo__copy util/namespaces.c:169 > > #2 0x559bce50821b in map__new util/map.c:168 > > #3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > #4 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > #5 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > #6 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > #7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > #8 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > #9 0x559bce519bea in perf_session__process_events util/session.c:2297 > > #10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > #11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > #12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > #13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > #14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > #15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > #16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > #17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > #18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s). > > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > > --- > > tools/perf/util/vdso.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c > > index 3cc91ad048ea..43beb169631d 100644 > > --- a/tools/perf/util/vdso.c > > +++ b/tools/perf/util/vdso.c > > @@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s > > if (dso != NULL) { > > __dsos__add(&machine->dsos, dso); > > dso__set_long_name(dso, long_name, false); > > + /* Put dso here because __dsos_add already got it */ > > + dso__put(dso); > > from quick look I don't understand why we take refcnt down > right after adding to the list.. it would make sense to me > if dso is not stored elsewhere so we want dsos__exit to > release it.. but it's still stored in map object > > I checked and we do extra dso__get in machine__findnew_vdso > (and also in dsos__findnew_id) ... so that one seems to me > like the one we should remove > > but I might be missing something, I'll try to check more > deeply later on I think we assume the find/findnew APIs include increment of the refcount, otherwise all callers should be converted to do it explicitly. Then the 'find' part should increase it but the 'new' part is not (as it already has 2) and that's why we have that. Thanks, Namhyung ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf record: Fix memory leak in vDSO 2021-03-16 2:28 ` Namhyung Kim @ 2021-03-16 12:56 ` Arnaldo Carvalho de Melo 2021-03-16 13:50 ` Jiri Olsa 0 siblings, 1 reply; 6+ messages in thread From: Arnaldo Carvalho de Melo @ 2021-03-16 12:56 UTC (permalink / raw) To: Namhyung Kim Cc: Jiri Olsa, Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers Em Tue, Mar 16, 2021 at 11:28:12AM +0900, Namhyung Kim escreveu: > On Mon, Mar 15, 2021 at 10:28 PM Jiri Olsa <jolsa@redhat.com> wrote: > > > > On Mon, Mar 15, 2021 at 01:56:41PM +0900, Namhyung Kim wrote: > > > I got several memory leak reports from Asan with a simple command. It > > > was because VDSO is not released due to the refcount. Like in > > > __dsos_addnew_id(), it should put the refcount after adding to the list. > > > > > > $ perf record true > > > [ perf record: Woken up 1 times to write data ] > > > [ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ] > > > > > > ================================================================= > > > ==692599==ERROR: LeakSanitizer: detected memory leaks > > > > > > Direct leak of 439 byte(s) in 1 object(s) allocated from: > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > #1 0x559bce4aa8ee in dso__new_id util/dso.c:1256 > > > #2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132 > > > #3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347 > > > #4 0x559bce50826c in map__new util/map.c:175 > > > #5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > #6 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > #7 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > #8 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > #9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > #10 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > #11 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > #12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > #13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > #14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > #15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > #16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > #17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > #18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > #19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > #20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > Indirect leak of 32 byte(s) in 1 object(s) allocated from: > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > #1 0x559bce520907 in nsinfo__copy util/namespaces.c:169 > > > #2 0x559bce50821b in map__new util/map.c:168 > > > #3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > #4 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > #5 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > #6 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > #7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > #8 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > #9 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > #10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > #11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > #12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > #13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > #14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > #15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > #16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > #17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > #18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s). > > > > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > > > --- > > > tools/perf/util/vdso.c | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c > > > index 3cc91ad048ea..43beb169631d 100644 > > > --- a/tools/perf/util/vdso.c > > > +++ b/tools/perf/util/vdso.c > > > @@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s > > > if (dso != NULL) { > > > __dsos__add(&machine->dsos, dso); > > > dso__set_long_name(dso, long_name, false); > > > + /* Put dso here because __dsos_add already got it */ > > > + dso__put(dso); > > > > from quick look I don't understand why we take refcnt down > > right after adding to the list.. it would make sense to me That is the right pattern, i.e. the list has a reference to it, if it is removed outside the __dsos__add(), then list traversal may be corrupted. > > if dso is not stored elsewhere so we want dsos__exit to > > release it.. but it's still stored in map object > > > > I checked and we do extra dso__get in machine__findnew_vdso > > (and also in dsos__findnew_id) ... so that one seems to me > > like the one we should remove findnew _needs_ to grab te refcount while holding the lock, so that what it returns won't go away in a different thread. > > but I might be missing something, I'll try to check more > > deeply later on > I think we assume the find/findnew APIs include increment of > the refcount, otherwise all callers should be converted to do it > explicitly. The callers can't grab the reference safely, i.e. its outside the lock. > Then the 'find' part should increase it but the 'new' part is not > (as it already has 2) and that's why we have that. > > Thanks, > Namhyung -- - Arnaldo ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf record: Fix memory leak in vDSO 2021-03-16 12:56 ` Arnaldo Carvalho de Melo @ 2021-03-16 13:50 ` Jiri Olsa 2021-03-24 13:39 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 6+ messages in thread From: Jiri Olsa @ 2021-03-16 13:50 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Namhyung Kim, Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers On Tue, Mar 16, 2021 at 09:56:26AM -0300, Arnaldo Carvalho de Melo wrote: > Em Tue, Mar 16, 2021 at 11:28:12AM +0900, Namhyung Kim escreveu: > > On Mon, Mar 15, 2021 at 10:28 PM Jiri Olsa <jolsa@redhat.com> wrote: > > > > > > On Mon, Mar 15, 2021 at 01:56:41PM +0900, Namhyung Kim wrote: > > > > I got several memory leak reports from Asan with a simple command. It > > > > was because VDSO is not released due to the refcount. Like in > > > > __dsos_addnew_id(), it should put the refcount after adding to the list. > > > > > > > > $ perf record true > > > > [ perf record: Woken up 1 times to write data ] > > > > [ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ] > > > > > > > > ================================================================= > > > > ==692599==ERROR: LeakSanitizer: detected memory leaks > > > > > > > > Direct leak of 439 byte(s) in 1 object(s) allocated from: > > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > > #1 0x559bce4aa8ee in dso__new_id util/dso.c:1256 > > > > #2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132 > > > > #3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347 > > > > #4 0x559bce50826c in map__new util/map.c:175 > > > > #5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > > #6 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > > #7 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > > #8 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > > #9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > > #10 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > > #11 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > > #12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > > #13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > > #14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > > #15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > > #16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > > #17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > > #18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > > #19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > > #20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > > > Indirect leak of 32 byte(s) in 1 object(s) allocated from: > > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > > #1 0x559bce520907 in nsinfo__copy util/namespaces.c:169 > > > > #2 0x559bce50821b in map__new util/map.c:168 > > > > #3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > > #4 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > > #5 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > > #6 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > > #7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > > #8 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > > #9 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > > #10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > > #11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > > #12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > > #13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > > #14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > > #15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > > #16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > > #17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > > #18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > > > SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s). > > > > > > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > > > > --- > > > > tools/perf/util/vdso.c | 2 ++ > > > > 1 file changed, 2 insertions(+) > > > > > > > > diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c > > > > index 3cc91ad048ea..43beb169631d 100644 > > > > --- a/tools/perf/util/vdso.c > > > > +++ b/tools/perf/util/vdso.c > > > > @@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s > > > > if (dso != NULL) { > > > > __dsos__add(&machine->dsos, dso); > > > > dso__set_long_name(dso, long_name, false); > > > > + /* Put dso here because __dsos_add already got it */ > > > > + dso__put(dso); > > > > > > from quick look I don't understand why we take refcnt down > > > right after adding to the list.. it would make sense to me > > That is the right pattern, i.e. the list has a reference to it, if it is > removed outside the __dsos__add(), then list traversal may be corrupted. > > > > if dso is not stored elsewhere so we want dsos__exit to > > > release it.. but it's still stored in map object > > > > > > I checked and we do extra dso__get in machine__findnew_vdso > > > (and also in dsos__findnew_id) ... so that one seems to me > > > like the one we should remove > > findnew _needs_ to grab te refcount while holding the lock, so that what > it returns won't go away in a different thread. > > > > but I might be missing something, I'll try to check more > > > deeply later on > > > I think we assume the find/findnew APIs include increment of > > the refcount, otherwise all callers should be converted to do it > > explicitly. > > The callers can't grab the reference safely, i.e. its outside the lock. > > > Then the 'find' part should increase it but the 'new' part is not > > (as it already has 2) and that's why we have that. map__new { machine__findnew_vdso { __machine__addnew_vdso { dso__new refcnt=1 __dsos__add refcnt=2 dso__put refcnt=1 } dso__get refcnt=2 } map__init refcnt=3 dso__put refcnt=2 } we end up with refcnt=2, which is fine, because there's dsos list and map owners but the process is tricky ;-) anyway I'm ok with the change Acked-by: Jiri Olsa <jolsa@redhat.com> thanks, jirka ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] perf record: Fix memory leak in vDSO 2021-03-16 13:50 ` Jiri Olsa @ 2021-03-24 13:39 ` Arnaldo Carvalho de Melo 0 siblings, 0 replies; 6+ messages in thread From: Arnaldo Carvalho de Melo @ 2021-03-24 13:39 UTC (permalink / raw) To: Jiri Olsa Cc: Namhyung Kim, Ingo Molnar, Peter Zijlstra, Mark Rutland, Alexander Shishkin, LKML, Andi Kleen, Ian Rogers Em Tue, Mar 16, 2021 at 02:50:48PM +0100, Jiri Olsa escreveu: > On Tue, Mar 16, 2021 at 09:56:26AM -0300, Arnaldo Carvalho de Melo wrote: > > Em Tue, Mar 16, 2021 at 11:28:12AM +0900, Namhyung Kim escreveu: > > > On Mon, Mar 15, 2021 at 10:28 PM Jiri Olsa <jolsa@redhat.com> wrote: > > > > > > > > On Mon, Mar 15, 2021 at 01:56:41PM +0900, Namhyung Kim wrote: > > > > > I got several memory leak reports from Asan with a simple command. It > > > > > was because VDSO is not released due to the refcount. Like in > > > > > __dsos_addnew_id(), it should put the refcount after adding to the list. > > > > > > > > > > $ perf record true > > > > > [ perf record: Woken up 1 times to write data ] > > > > > [ perf record: Captured and wrote 0.030 MB perf.data (10 samples) ] > > > > > > > > > > ================================================================= > > > > > ==692599==ERROR: LeakSanitizer: detected memory leaks > > > > > > > > > > Direct leak of 439 byte(s) in 1 object(s) allocated from: > > > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > > > #1 0x559bce4aa8ee in dso__new_id util/dso.c:1256 > > > > > #2 0x559bce59245a in __machine__addnew_vdso util/vdso.c:132 > > > > > #3 0x559bce59245a in machine__findnew_vdso util/vdso.c:347 > > > > > #4 0x559bce50826c in map__new util/map.c:175 > > > > > #5 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > > > #6 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > > > #7 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > > > #8 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > > > #9 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > > > #10 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > > > #11 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > > > #12 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > > > #13 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > > > #14 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > > > #15 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > > > #16 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > > > #17 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > > > #18 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > > > #19 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > > > #20 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > > > > > Indirect leak of 32 byte(s) in 1 object(s) allocated from: > > > > > #0 0x7fea52341037 in __interceptor_calloc ../../../../src/libsanitizer/asan/asan_malloc_linux.cpp:154 > > > > > #1 0x559bce520907 in nsinfo__copy util/namespaces.c:169 > > > > > #2 0x559bce50821b in map__new util/map.c:168 > > > > > #3 0x559bce503c92 in machine__process_mmap2_event util/machine.c:1787 > > > > > #4 0x559bce512f6b in machines__deliver_event util/session.c:1481 > > > > > #5 0x559bce515107 in perf_session__deliver_event util/session.c:1551 > > > > > #6 0x559bce51d4d2 in do_flush util/ordered-events.c:244 > > > > > #7 0x559bce51d4d2 in __ordered_events__flush util/ordered-events.c:323 > > > > > #8 0x559bce519bea in __perf_session__process_events util/session.c:2268 > > > > > #9 0x559bce519bea in perf_session__process_events util/session.c:2297 > > > > > #10 0x559bce2e7a52 in process_buildids /home/namhyung/project/linux/tools/perf/builtin-record.c:1017 > > > > > #11 0x559bce2e7a52 in record__finish_output /home/namhyung/project/linux/tools/perf/builtin-record.c:1234 > > > > > #12 0x559bce2ed4f6 in __cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2026 > > > > > #13 0x559bce2ed4f6 in cmd_record /home/namhyung/project/linux/tools/perf/builtin-record.c:2858 > > > > > #14 0x559bce422db4 in run_builtin /home/namhyung/project/linux/tools/perf/perf.c:313 > > > > > #15 0x559bce2acac8 in handle_internal_command /home/namhyung/project/linux/tools/perf/perf.c:365 > > > > > #16 0x559bce2acac8 in run_argv /home/namhyung/project/linux/tools/perf/perf.c:409 > > > > > #17 0x559bce2acac8 in main /home/namhyung/project/linux/tools/perf/perf.c:539 > > > > > #18 0x7fea51e76d09 in __libc_start_main ../csu/libc-start.c:308 > > > > > > > > > > SUMMARY: AddressSanitizer: 471 byte(s) leaked in 2 allocation(s). > > > > > > > > > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > > > > > --- > > > > > tools/perf/util/vdso.c | 2 ++ > > > > > 1 file changed, 2 insertions(+) > > > > > > > > > > diff --git a/tools/perf/util/vdso.c b/tools/perf/util/vdso.c > > > > > index 3cc91ad048ea..43beb169631d 100644 > > > > > --- a/tools/perf/util/vdso.c > > > > > +++ b/tools/perf/util/vdso.c > > > > > @@ -133,6 +133,8 @@ static struct dso *__machine__addnew_vdso(struct machine *machine, const char *s > > > > > if (dso != NULL) { > > > > > __dsos__add(&machine->dsos, dso); > > > > > dso__set_long_name(dso, long_name, false); > > > > > + /* Put dso here because __dsos_add already got it */ > > > > > + dso__put(dso); > > > > > > > > from quick look I don't understand why we take refcnt down > > > > right after adding to the list.. it would make sense to me > > > > That is the right pattern, i.e. the list has a reference to it, if it is > > removed outside the __dsos__add(), then list traversal may be corrupted. > > > > > > if dso is not stored elsewhere so we want dsos__exit to > > > > release it.. but it's still stored in map object > > > > > > > > I checked and we do extra dso__get in machine__findnew_vdso > > > > (and also in dsos__findnew_id) ... so that one seems to me > > > > like the one we should remove > > > > findnew _needs_ to grab te refcount while holding the lock, so that what > > it returns won't go away in a different thread. > > > > > > but I might be missing something, I'll try to check more > > > > deeply later on > > > > > I think we assume the find/findnew APIs include increment of > > > the refcount, otherwise all callers should be converted to do it > > > explicitly. > > > > The callers can't grab the reference safely, i.e. its outside the lock. > > > > > Then the 'find' part should increase it but the 'new' part is not > > > (as it already has 2) and that's why we have that. > > map__new > { > machine__findnew_vdso > { > __machine__addnew_vdso > { > dso__new refcnt=1 > __dsos__add refcnt=2 > dso__put refcnt=1 > } > dso__get refcnt=2 > } > map__init refcnt=3 > dso__put refcnt=2 > } > > we end up with refcnt=2, which is fine, because there's > dsos list and map owners but the process is tricky ;-) > > anyway I'm ok with the change > > Acked-by: Jiri Olsa <jolsa@redhat.com> Thanks, applied. - Arnaldo ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-24 13:40 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-03-15 4:56 [PATCH] perf record: Fix memory leak in vDSO Namhyung Kim 2021-03-15 13:28 ` Jiri Olsa 2021-03-16 2:28 ` Namhyung Kim 2021-03-16 12:56 ` Arnaldo Carvalho de Melo 2021-03-16 13:50 ` Jiri Olsa 2021-03-24 13:39 ` Arnaldo Carvalho de Melo
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).