Unverified Commit 9586f809 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13126 Revert "perf callchain: Fix stitch LBR memory leaks" 

Merge Pull Request from: @ci-robot 
 
PR sync from: Peng Zhang <zhangpeng362@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OZ6CVVOYEEKUD547X5FPQRMS6BJUFOLR/ 
 
https://gitee.com/openeuler/kernel/issues/IB2ZN9 
 
Link:https://gitee.com/openeuler/kernel/pulls/13126

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 0f78b7af e686a427

tools/perf/util/machine.c

+2 −15
Original line number Diff line number Diff line
@@ -2536,12 +2536,8 @@ static void save_lbr_cursor_node(struct thread *thread, 
		cursor->curr = cursor->first;

	else

		cursor->curr = cursor->curr->next;



	map_symbol__exit(&lbr_stitch->prev_lbr_cursor[idx].ms);

	memcpy(&lbr_stitch->prev_lbr_cursor[idx], cursor->curr,

	       sizeof(struct callchain_cursor_node));

	lbr_stitch->prev_lbr_cursor[idx].ms.maps = maps__get(cursor->curr->ms.maps);

	lbr_stitch->prev_lbr_cursor[idx].ms.map = map__get(cursor->curr->ms.map);



	lbr_stitch->prev_lbr_cursor[idx].valid = true;

	cursor->pos++;
@@ -2752,9 +2748,6 @@ static bool has_stitched_lbr(struct thread *thread, 
		memcpy(&stitch_node->cursor, &lbr_stitch->prev_lbr_cursor[i],

		       sizeof(struct callchain_cursor_node));



		stitch_node->cursor.ms.maps = maps__get(lbr_stitch->prev_lbr_cursor[i].ms.maps);

		stitch_node->cursor.ms.map = map__get(lbr_stitch->prev_lbr_cursor[i].ms.map);



		if (callee)

			list_add(&stitch_node->node, &lbr_stitch->lists);

		else
@@ -2778,8 +2771,6 @@ static bool alloc_lbr_stitch(struct thread *thread, unsigned int max_lbr) 
	if (!thread__lbr_stitch(thread)->prev_lbr_cursor)

		goto free_lbr_stitch;



	thread__lbr_stitch(thread)->prev_lbr_cursor_size = max_lbr + 1;



	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->lists);

	INIT_LIST_HEAD(&thread__lbr_stitch(thread)->free_lists);
@@ -2835,12 +2826,8 @@ static int resolve_lbr_callchain_sample(struct thread *thread, 
						max_lbr, callee);



		if (!stitched_lbr && !list_empty(&lbr_stitch->lists)) {

			struct stitch_list *stitch_node;



			list_for_each_entry(stitch_node, &lbr_stitch->lists, node)

				map_symbol__exit(&stitch_node->cursor.ms);



			list_splice_init(&lbr_stitch->lists, &lbr_stitch->free_lists);

			list_replace_init(&lbr_stitch->lists,

					  &lbr_stitch->free_lists);

		}

		memcpy(&lbr_stitch->prev_sample, sample, sizeof(*sample));

	}

tools/perf/util/thread.c

+0 −4
Original line number Diff line number Diff line
@@ -478,7 +478,6 @@ void thread__free_stitch_list(struct thread *thread) 
		return;



	list_for_each_entry_safe(pos, tmp, &lbr_stitch->lists, node) {

		map_symbol__exit(&pos->cursor.ms);

		list_del_init(&pos->node);

		free(pos);

	}
@@ -488,9 +487,6 @@ void thread__free_stitch_list(struct thread *thread) 
		free(pos);

	}



	for (unsigned int i = 0 ; i < lbr_stitch->prev_lbr_cursor_size; i++)

		map_symbol__exit(&lbr_stitch->prev_lbr_cursor[i].ms);



	zfree(&lbr_stitch->prev_lbr_cursor);

	free(thread__lbr_stitch(thread));

	thread__set_lbr_stitch(thread, NULL);

tools/perf/util/thread.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ struct lbr_stitch { 
	struct list_head		free_lists;

	struct perf_sample		prev_sample;

	struct callchain_cursor_node	*prev_lbr_cursor;

	unsigned int prev_lbr_cursor_size;

};



struct thread_rb_node {