perf map: Fix map reference count issues
Ian Rogers
reviewerPATCH 1/1 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(-)
tools/perf/util/maps.c +7 -7
@@ -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; }
tools/perf/util/probe-event.c +1 -3
@@ -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; }
Signature · 1 line
2.44.0.278.ge034bb2e1d-goog
Quoted 4 lines · Ian Rogers
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
Quoted 49 lines
--- tools/perf/util/maps.c | 14 +++++++------- tools/perf/util/probe-event.c | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-)tools/perf/util/maps.c +7
-7@@ -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; }tools/perf/util/probe-event.c +1
-4@@ -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
Quoted 3 lines · Ian Rogers
The find will get the map, ensure puts are done on all paths.
Applied to perf-tools-next, thanks!
Best regards,
Signature · 1 line
Namhyung Kim <[email protected]>