2024-02-29 06:21:13

by Ian Rogers

Subject: [PATCH v1] perf map: Fix map reference count issues

The find will get the map, ensure puts are done on all paths.

Signed-off-by: Ian Rogers <[email protected]>
---
tools/perf/util/maps.c | 14 +++++++-------
tools/perf/util/probe-event.c | 4 +---
2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
index 53aea6d2ef93..ce13145a9f8e 100644
--- a/tools/perf/util/maps.c
+++ b/tools/perf/util/maps.c
@@ -611,14 +611,14 @@ struct symbol *maps__find_symbol(struct maps *maps, u64 addr, struct map **mapp)
struct symbol *result = NULL;

/* Ensure map is loaded before using map->map_ip */
- if (map != NULL && map__load(map) >= 0) {
- if (mapp)
- *mapp = map;
-
+ if (map != NULL && map__load(map) >= 0)
result = map__find_symbol(map, map__map_ip(map, addr));
- if (!mapp)
- map__put(map);
- }
+
+ if (mapp)
+ *mapp = map;
+ else
+ map__put(map);
+
return result;
}

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index be71abe8b9b0..2a0ad9ecf0a2 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2274,9 +2274,7 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
ret = pp->function ? 0 : -ENOMEM;

out:
- if (map && !is_kprobe) {
- map__put(map);
- }
+ map__put(map);

return ret;
}
--
2.44.0.278.ge034bb2e1d-goog

2024-03-01 02:04:20

by Namhyung Kim

Subject: Re: [PATCH v1] perf map: Fix map reference count issues

On Wed, Feb 28, 2024 at 10:21 PM Ian Rogers <[email protected]> wrote:
>
> The find will get the map, ensure puts are done on all paths.
>
> Signed-off-by: Ian Rogers <[email protected]>

Acked-by: Namhyung Kim <[email protected]>

Thanks,
Namhyung


> ---
> tools/perf/util/maps.c | 14 +++++++-------
> tools/perf/util/probe-event.c | 4 +---
> 2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c
> index 53aea6d2ef93..ce13145a9f8e 100644
> --- a/tools/perf/util/maps.c
> +++ b/tools/perf/util/maps.c
> @@ -611,14 +611,14 @@ struct symbol *maps__find_symbol(struct maps *maps, u64 addr, struct map **mapp)
> struct symbol *result = NULL;
>
> /* Ensure map is loaded before using map->map_ip */
> - if (map != NULL && map__load(map) >= 0) {
> - if (mapp)
> - *mapp = map;
> -
> + if (map != NULL && map__load(map) >= 0)
> result = map__find_symbol(map, map__map_ip(map, addr));
> - if (!mapp)
> - map__put(map);
> - }
> +
> + if (mapp)
> + *mapp = map;
> + else
> + map__put(map);
> +
> return result;
> }
>
> diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
> index be71abe8b9b0..2a0ad9ecf0a2 100644
> --- a/tools/perf/util/probe-event.c
> +++ b/tools/perf/util/probe-event.c
> @@ -2274,9 +2274,7 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
> ret = pp->function ? 0 : -ENOMEM;
>
> out:
> - if (map && !is_kprobe) {
> - map__put(map);
> - }
> + map__put(map);
>
> return ret;
> }
> --
> 2.44.0.278.ge034bb2e1d-goog
>

2024-03-01 19:32:09

by Namhyung Kim

Subject: Re: [PATCH v1] perf map: Fix map reference count issues

On Wed, 28 Feb 2024 22:20:48 -0800, Ian Rogers wrote:
> The find will get the map, ensure puts are done on all paths.
>
>

Applied to perf-tools-next, thanks!

Best regards,
--
Namhyung Kim <[email protected]>