Commit 56e144fe authored by Ian Rogers's avatar Ian Rogers Committed by Namhyung Kim
Browse files

perf mem_info: Add and use map_symbol__exit and addr_map_symbol__exit 



Fix leak where mem_info__put wouldn't release the maps/map as used by
perf mem. Add exit functions and use elsewhere that the maps and map
are released.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Anshuman Khandual <anshuman.khandual@arm.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: James Clark <james.clark@arm.com>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: liuwenyu <liuwenyu7@huawei.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Song Liu <song@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Yanteng Si <siyanteng@loongson.cn>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Link: https://lore.kernel.org/r/20231024222353.3024098-12-irogers@google.com


Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
parent dec07fe5

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ perf-y += dso.o 
perf-y += dsos.o

perf-y += symbol.o

perf-y += symbol_fprintf.o

perf-y += map_symbol.o

perf-y += color.o

perf-y += color_config.o

perf-y += metricgroup.o

tools/perf/util/callchain.c

+9 −18
Original line number Diff line number Diff line
@@ -659,8 +659,7 @@ add_child(struct callchain_node *parent, 


		list_for_each_entry_safe(call, tmp, &new->val, list) {

			list_del_init(&call->list);

			map__zput(call->ms.map);

			maps__zput(call->ms.maps);

			map_symbol__exit(&call->ms);

			zfree(&call->brtype_stat);

			free(call);

		}
@@ -1040,10 +1039,8 @@ merge_chain_branch(struct callchain_cursor *cursor, 
		};

		callchain_cursor_append(cursor, list->ip, &ms, false, NULL, 0, 0, 0, list->srcline);

		list_del_init(&list->list);

		map__zput(ms.map);

		maps__zput(ms.maps);

		map__zput(list->ms.map);

		maps__zput(list->ms.maps);

		map_symbol__exit(&ms);

		map_symbol__exit(&list->ms);

		zfree(&list->brtype_stat);

		free(list);

	}
@@ -1096,8 +1093,7 @@ int callchain_cursor_append(struct callchain_cursor *cursor, 
	}



	node->ip = ip;

	maps__zput(node->ms.maps);

	map__zput(node->ms.map);

	map_symbol__exit(&node->ms);

	node->ms = *ms;

	node->ms.maps = maps__get(ms->maps);

	node->ms.map = map__get(ms->map);
@@ -1496,16 +1492,14 @@ static void free_callchain_node(struct callchain_node *node) 


	list_for_each_entry_safe(list, tmp, &node->parent_val, list) {

		list_del_init(&list->list);

		map__zput(list->ms.map);

		maps__zput(list->ms.maps);

		map_symbol__exit(&list->ms);

		zfree(&list->brtype_stat);

		free(list);

	}



	list_for_each_entry_safe(list, tmp, &node->val, list) {

		list_del_init(&list->list);

		map__zput(list->ms.map);

		maps__zput(list->ms.maps);

		map_symbol__exit(&list->ms);

		zfree(&list->brtype_stat);

		free(list);

	}
@@ -1591,8 +1585,7 @@ int callchain_node__make_parent_list(struct callchain_node *node) 
out:

	list_for_each_entry_safe(chain, new, &head, list) {

		list_del_init(&chain->list);

		map__zput(chain->ms.map);

		maps__zput(chain->ms.maps);

		map_symbol__exit(&chain->ms);

		zfree(&chain->brtype_stat);

		free(chain);

	}
@@ -1676,10 +1669,8 @@ void callchain_cursor_reset(struct callchain_cursor *cursor) 
	cursor->nr = 0;

	cursor->last = &cursor->first;



	for (node = cursor->first; node != NULL; node = node->next) {

		map__zput(node->ms.map);

		maps__zput(node->ms.maps);

	}

	for (node = cursor->first; node != NULL; node = node->next)

		map_symbol__exit(&node->ms);

}



void callchain_param_setup(u64 sample_type, const char *arch)

tools/perf/util/hist.c

+12 −16
Original line number Diff line number Diff line
@@ -515,17 +515,16 @@ static int hist_entry__init(struct hist_entry *he, 


err_infos:

	if (he->branch_info) {

		map__put(he->branch_info->from.ms.map);

		map__put(he->branch_info->to.ms.map);

		map_symbol__exit(&he->branch_info->from.ms);

		map_symbol__exit(&he->branch_info->to.ms);

		zfree(&he->branch_info);

	}

	if (he->mem_info) {

		map__put(he->mem_info->iaddr.ms.map);

		map__put(he->mem_info->daddr.ms.map);

		map_symbol__exit(&he->mem_info->iaddr.ms);

		map_symbol__exit(&he->mem_info->daddr.ms);

	}

err:

	maps__zput(he->ms.maps);

	map__zput(he->ms.map);

	map_symbol__exit(&he->ms);

	zfree(&he->stat_acc);

	return -ENOMEM;

}
@@ -1317,20 +1316,19 @@ void hist_entry__delete(struct hist_entry *he) 
	struct hist_entry_ops *ops = he->ops;



	thread__zput(he->thread);

	maps__zput(he->ms.maps);

	map__zput(he->ms.map);

	map_symbol__exit(&he->ms);



	if (he->branch_info) {

		map__zput(he->branch_info->from.ms.map);

		map__zput(he->branch_info->to.ms.map);

		map_symbol__exit(&he->branch_info->from.ms);

		map_symbol__exit(&he->branch_info->to.ms);

		zfree_srcline(&he->branch_info->srcline_from);

		zfree_srcline(&he->branch_info->srcline_to);

		zfree(&he->branch_info);

	}



	if (he->mem_info) {

		map__zput(he->mem_info->iaddr.ms.map);

		map__zput(he->mem_info->daddr.ms.map);

		map_symbol__exit(&he->mem_info->iaddr.ms);

		map_symbol__exit(&he->mem_info->daddr.ms);

		mem_info__zput(he->mem_info);

	}
@@ -2700,10 +2698,8 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al, 
					*total_cycles += bi[i].flags.cycles;

			}

			for (unsigned int i = 0; i < bs->nr; i++) {

				map__put(bi[i].to.ms.map);

				maps__put(bi[i].to.ms.maps);

				map__put(bi[i].from.ms.map);

				maps__put(bi[i].from.ms.maps);

				map_symbol__exit(&bi[i].to.ms);

				map_symbol__exit(&bi[i].from.ms);

			}

			free(bi);

		}

tools/perf/util/machine.c

+2 −4
Original line number Diff line number Diff line
@@ -2389,8 +2389,7 @@ static int add_callchain_ip(struct thread *thread, 
				      iter_cycles, branch_from, srcline);

out:

	addr_location__exit(&al);

	maps__put(ms.maps);

	map__put(ms.map);

	map_symbol__exit(&ms);

	return err;

}
@@ -3116,8 +3115,7 @@ static int append_inlines(struct callchain_cursor *cursor, struct map_symbol *ms 
		if (ret != 0)

			return ret;

	}

	map__put(ilist_ms.map);

	maps__put(ilist_ms.maps);

	map_symbol__exit(&ilist_ms);



	return ret;

}

tools/perf/util/map_symbol.c

0 → 100644
+15 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "map_symbol.h"

#include "maps.h"

#include "map.h"



void map_symbol__exit(struct map_symbol *ms)

{

	maps__zput(ms->maps);

	map__zput(ms->map);

}



void addr_map_symbol__exit(struct addr_map_symbol *ams)

{

	map_symbol__exit(&ams->ms);

}