2021-11-19 04:26:52

by Sohaib Mohamed

Subject: [PATCH] perf machine: Free machine__findnew_dso

ASan reports memory leaks while running:

$ rm perf.data*
$ perf report

This patch adds the missing dso__put.

Fixes: 8c7f1bb37b29 ("perf machine: Move kernel mmap name into struct
machine")

Signed-off-by: Sohaib Mohamed <[email protected]>
---
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 fb8496df8432..826be7a12da1 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1742,6 +1742,8 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
*/
dso__load(kernel, machine__kernel_map(machine));
}
+
+ dso__put(kernel);
} else if (perf_event__is_extra_kernel_mmap(machine, xm)) {
return machine__process_extra_kernel_map(machine, xm);
}
--
2.25.1

2021-11-28 16:00:12

by Jiri Olsa

Subject: Re: [PATCH] perf machine: Free machine__findnew_dso

On Fri, Nov 19, 2021 at 06:26:04AM +0200, Sohaib Mohamed wrote:
> ASan reports memory leaks while running:
>
> $ rm perf.data*
> $ perf report
>
> This patch adds the missing dso__put.
>
> Fixes: 8c7f1bb37b29 ("perf machine: Move kernel mmap name into struct
> machine")
>
> Signed-off-by: Sohaib Mohamed <[email protected]>
> ---
> 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 fb8496df8432..826be7a12da1 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -1742,6 +1742,8 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
> */
> dso__load(kernel, machine__kernel_map(machine));
> }
> +
> + dso__put(kernel);

nice catch, after machine__findnew_dso we need to do that

but there's also dso search before we call machine__findnew_dso,
that can find dso, so I wonder we need to add change below as well

thanks,
jirka


---
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 826be7a12da1..cd9bdf723aba 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1700,7 +1700,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
continue;


- kernel = dso;
+ kernel = dso__get(dso);
break;
}