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

Commit 6bcf9c1f authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by Arnaldo Carvalho de Melo
Browse files

perf tools powerpc: Use dwfl_report_elf() instead of offline. 



dwfl_report_offline() works only when libraries are prelinked.

Replace dwfl_report_offline() with dwfl_report_elf() so we correctly
extract debug info even from libraries that are not prelinked.

Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Link: http://lkml.kernel.org/r/20150114221045.GA17703@us.ibm.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 813ccd15

tools/perf/arch/powerpc/util/skip-callchain-idx.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -103,7 +103,7 @@ static Dwarf_Frame *get_eh_frame(Dwfl_Module *mod, Dwarf_Addr pc) 
		return NULL;

		return NULL;

	}

	}





	result = dwarf_cfi_addrframe(cfi, pc, &frame);

	result = dwarf_cfi_addrframe(cfi, pc-bias, &frame);

	if (result) {

	if (result) {

		pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));

		pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));

		return NULL;

		return NULL;
@@ -128,7 +128,7 @@ static Dwarf_Frame *get_dwarf_frame(Dwfl_Module *mod, Dwarf_Addr pc) 
		return NULL;

		return NULL;

	}

	}





	result = dwarf_cfi_addrframe(cfi, pc, &frame);

	result = dwarf_cfi_addrframe(cfi, pc-bias, &frame);

	if (result) {

	if (result) {

		pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));

		pr_debug("%s(): %s\n", __func__, dwfl_errmsg(-1));

		return NULL;

		return NULL;
@@ -145,7 +145,7 @@ static Dwarf_Frame *get_dwarf_frame(Dwfl_Module *mod, Dwarf_Addr pc) 
 *		yet used)

 *		yet used)

 *	-1 in case of errors

 *	-1 in case of errors

 */

 */

static int check_return_addr(struct dso *dso, Dwarf_Addr pc)

static int check_return_addr(struct dso *dso, u64 map_start, Dwarf_Addr pc)

{

{

	int		rc = -1;

	int		rc = -1;

	Dwfl		*dwfl;

	Dwfl		*dwfl;
@@ -155,6 +155,7 @@ static int check_return_addr(struct dso *dso, Dwarf_Addr pc) 
	Dwarf_Addr	start = pc;

	Dwarf_Addr	start = pc;

	Dwarf_Addr	end = pc;

	Dwarf_Addr	end = pc;

	bool		signalp;

	bool		signalp;

	const char	*exec_file = dso->long_name;





	dwfl = dso->dwfl;

	dwfl = dso->dwfl;
@@ -165,8 +166,10 @@ static int check_return_addr(struct dso *dso, Dwarf_Addr pc) 
			return -1;

			return -1;

		}

		}





		if (dwfl_report_offline(dwfl, "", dso->long_name, -1) == NULL) {

		mod = dwfl_report_elf(dwfl, exec_file, exec_file, -1,

			pr_debug("dwfl_report_offline() failed %s\n",

						map_start, false);

		if (!mod) {

			pr_debug("dwfl_report_elf() failed %s\n",

						dwarf_errmsg(-1));

						dwarf_errmsg(-1));

			/*

			/*

			 * We normally cache the DWARF debug info and never

			 * We normally cache the DWARF debug info and never
@@ -256,10 +259,10 @@ int arch_skip_callchain_idx(struct thread *thread, struct ip_callchain *chain) 
		return skip_slot;

		return skip_slot;

	}

	}





	rc = check_return_addr(dso, ip);

	rc = check_return_addr(dso, al.map->start, ip);





	pr_debug("DSO %s, nr %" PRIx64 ", ip 0x%" PRIx64 "rc %d\n",

	pr_debug("[DSO %s, sym %s, ip 0x%" PRIx64 "] rc %d\n",

				dso->long_name, chain->nr, ip, rc);

				dso->long_name, al.sym->name, ip, rc);





	if (rc == 0) {

	if (rc == 0) {

		/*

		/*