Commit 9c219794 authored Nov 05, 2022 by Masami Hiramatsu (Google) Committed by Greg Kroah-Hartman Jan 18, 2023

perf probe: Fix to get the DW_AT_decl_file and DW_AT_call_file as unsinged data



[ Upstream commit a9dfc46c67b52ad43b8e335e28f4cf8002c67793 ]

DWARF version 5 standard Sec 2.14 says that

  Any debugging information entry representing the declaration of an object,
  module, subprogram or type may have DW_AT_decl_file, DW_AT_decl_line and
  DW_AT_decl_column attributes, each of whose value is an unsigned integer
  constant.

So it should be an unsigned integer data. Also, even though the standard
doesn't clearly say the DW_AT_call_file is signed or unsigned, the
elfutils (eu-readelf) interprets it as unsigned integer data and it is
natural to handle it as unsigned integer data as same as DW_AT_decl_file.
This changes the DW_AT_call_file as unsigned integer data too.

Fixes: 3f4460a2 ("perf probe: Filter out redundant inline-instances")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Link: https://lore.kernel.org/r/166761727445.480106.3738447577082071942.stgit@devnote3


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent f759b4c5

tools/perf/util/dwarf-aux.c

+4 −17

Original line number	Diff line number	Diff line
		@@ -274,19 +274,6 @@ static int die_get_attr_udata(Dwarf_Die *tp_die, unsigned int attr_name,
		return 0;
		}

		/* Get attribute and translate it as a sdata */
		static int die_get_attr_sdata(Dwarf_Die *tp_die, unsigned int attr_name,
		Dwarf_Sword *result)
		{
		Dwarf_Attribute attr;

		if (dwarf_attr_integrate(tp_die, attr_name, &attr) == NULL \|\|
		dwarf_formsdata(&attr, result) != 0)
		return -ENOENT;

		return 0;
		}

		/**
		* die_is_signed_type - Check whether a type DIE is signed or not
		* @tp_die: a DIE of a type
		@@ -410,9 +397,9 @@ int die_get_data_member_location(Dwarf_Die mb_die, Dwarf_Word offs)
		/* Get the call file index number in CU DIE */
		static int die_get_call_fileno(Dwarf_Die *in_die)
		{
		Dwarf_Sword idx;
		Dwarf_Word idx;

		if (die_get_attr_sdata(in_die, DW_AT_call_file, &idx) == 0)
		if (die_get_attr_udata(in_die, DW_AT_call_file, &idx) == 0)
		return (int)idx;
		else
		return -ENOENT;
		@@ -421,9 +408,9 @@ static int die_get_call_fileno(Dwarf_Die *in_die)
		/* Get the declared file index number in CU DIE */
		static int die_get_decl_fileno(Dwarf_Die *pdie)
		{
		Dwarf_Sword idx;
		Dwarf_Word idx;

		if (die_get_attr_sdata(pdie, DW_AT_decl_file, &idx) == 0)
		if (die_get_attr_udata(pdie, DW_AT_decl_file, &idx) == 0)
		return (int)idx;
		else
		return -ENOENT;