Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ad6a85 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Greg Kroah-Hartman
Browse files

perf probe: Fix to find range-only function instance 



[ Upstream commit b77afa1f810f37bd8a36cb1318178dfe2d7af6b6 ]

Fix die_is_func_instance() to find range-only function instance.

In some case, a function instance can be made without any low PC or
entry PC, but only with address ranges by optimization.  (e.g. cold text
partially in "text.unlikely" section) To find such function instance, we
have to check the range attribute too.

Fixes: e1ecbbc3 ("perf probe: Fix to handle optimized not-inlined functions")
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/157190835669.1859.8368628035930950596.stgit@devnote2


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ff1e1c72

tools/perf/util/dwarf-aux.c

+5 −1
Original line number Diff line number Diff line
@@ -331,10 +331,14 @@ bool die_is_func_def(Dwarf_Die *dw_die) 
bool die_is_func_instance(Dwarf_Die *dw_die)

{

	Dwarf_Addr tmp;

	Dwarf_Attribute attr_mem;



	/* Actually gcc optimizes non-inline as like as inlined */

	return !dwarf_func_inline(dw_die) && dwarf_entrypc(dw_die, &tmp) == 0;

	return !dwarf_func_inline(dw_die) &&

	       (dwarf_entrypc(dw_die, &tmp) == 0 ||

		dwarf_attr(dw_die, DW_AT_ranges, &attr_mem) != NULL);

}



/**

 * die_get_data_member_location - Get the data-member offset

 * @mb_die: a DIE of a member of a data structure