Commit eb4717f7 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix debuginfo__new() to enable build-id based debuginfo 



Fix debuginfo__new() to set the build-id to dso before
dso__read_binary_type_filename() so that it can find
DSO_BINARY_TYPE__BUILDID_DEBUGINFO debuginfo correctly.

However, this may not change the result, because elfutils (libdwfl) has
its own debuginfo finder. With/without this patch, the perf probe
correctly find the debuginfo file.

This is just a failsafe and keep code's sanity (if you use
dso__read_binary_type_filename(), you must set the build-id to the dso.)

Reported-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Signed-off-by: default avatarMasami Hiramatsu <mhriamat@kernel.org>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Stefan Liebler <stli@linux.ibm.com>
Cc: Sven Schnelle <svens@linux.ibm.com>
Link: http://lore.kernel.org/lkml/162532651863.393143.11692691321219235810.stgit@devnote2


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

tools/perf/util/probe-finder.c

+5 −0
Original line number Diff line number Diff line
@@ -118,12 +118,17 @@ struct debuginfo *debuginfo__new(const char *path) 
	char buf[PATH_MAX], nil = '\0';

	struct dso *dso;

	struct debuginfo *dinfo = NULL;

	struct build_id bid;



	/* Try to open distro debuginfo files */

	dso = dso__new(path);

	if (!dso)

		goto out;



	/* Set the build id for DSO_BINARY_TYPE__BUILDID_DEBUGINFO */

	if (is_regular_file(path) && filename__read_build_id(path, &bid) > 0)

		dso__set_build_id(dso, &bid);



	for (type = distro_dwarf_types;

	     !dinfo && *type != DSO_BINARY_TYPE__NOT_FOUND;

	     type++) {