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

Commit 7e8c391e authored by Adrian Hunter's avatar Adrian Hunter Committed by Greg Kroah-Hartman
Browse files

perf symbols: Fix debuginfo search for Ubuntu 



commit 85afd35575a3c1a3a905722dde5ee70b49282e70 upstream.

Reportedly, from 19.10 Ubuntu has begun mixing up the location of some
debug symbol files, putting files expected to be in
/usr/lib/debug/usr/lib into /usr/lib/debug/lib instead. Fix by adding
another dso_binary_type.

Example on Ubuntu 20.04

  Before:

    $ perf record -e intel_pt//u uname
    Linux
    [ perf record: Woken up 1 times to write data ]
    [ perf record: Captured and wrote 0.030 MB perf.data ]
    $ perf script --call-trace | head -5
           uname 14003 [005] 15321.764958566:  cbr: 42 freq: 4219 MHz (156%)
           uname 14003 [005] 15321.764958566: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )          7f1e71cc4100
           uname 14003 [005] 15321.764961566: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )              7f1e71cc4df0
           uname 14003 [005] 15321.764961900: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )              7f1e71cc4e18
           uname 14003 [005] 15321.764963233: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )              7f1e71cc5128

  After:

    $ perf script --call-trace | head -5
           uname 14003 [005] 15321.764958566:  cbr: 42 freq: 4219 MHz (156%)
           uname 14003 [005] 15321.764958566: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )      _start
           uname 14003 [005] 15321.764961566: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )          _dl_start
           uname 14003 [005] 15321.764961900: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )          _dl_start
           uname 14003 [005] 15321.764963233: (/usr/lib/x86_64-linux-gnu/ld-2.31.so              )          _dl_start

Reported-by: default avatarTravis Downs <travis.downs@gmail.com>
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: stable@vger.kernel.org
Link: http://lore.kernel.org/lkml/20200526155207.9172-1-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c7006692

tools/perf/util/dso.c

+16 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ char dso__symtab_origin(const struct dso *dso) 
		[DSO_BINARY_TYPE__BUILD_ID_CACHE_DEBUGINFO]	= 'D',

		[DSO_BINARY_TYPE__FEDORA_DEBUGINFO]		= 'f',

		[DSO_BINARY_TYPE__UBUNTU_DEBUGINFO]		= 'u',

		[DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO]	= 'x',

		[DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO]	= 'o',

		[DSO_BINARY_TYPE__BUILDID_DEBUGINFO]		= 'b',

		[DSO_BINARY_TYPE__SYSTEM_PATH_DSO]		= 'd',
@@ -120,6 +121,21 @@ int dso__read_binary_type_filename(const struct dso *dso, 
		snprintf(filename + len, size - len, "%s", dso->long_name);

		break;



	case DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO:

		/*

		 * Ubuntu can mixup /usr/lib with /lib, putting debuginfo in

		 * /usr/lib/debug/lib when it is expected to be in

		 * /usr/lib/debug/usr/lib

		 */

		if (strlen(dso->long_name) < 9 ||

		    strncmp(dso->long_name, "/usr/lib/", 9)) {

			ret = -1;

			break;

		}

		len = __symbol__join_symfs(filename, size, "/usr/lib/debug");

		snprintf(filename + len, size - len, "%s", dso->long_name + 4);

		break;



	case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:

	{

		const char *last_slash;

tools/perf/util/dso.h

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ enum dso_binary_type { 
	DSO_BINARY_TYPE__BUILD_ID_CACHE_DEBUGINFO,

	DSO_BINARY_TYPE__FEDORA_DEBUGINFO,

	DSO_BINARY_TYPE__UBUNTU_DEBUGINFO,

	DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO,

	DSO_BINARY_TYPE__BUILDID_DEBUGINFO,

	DSO_BINARY_TYPE__SYSTEM_PATH_DSO,

	DSO_BINARY_TYPE__GUEST_KMODULE,

tools/perf/util/probe-finder.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ enum dso_binary_type distro_dwarf_types[] = { 
	DSO_BINARY_TYPE__UBUNTU_DEBUGINFO,

	DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,

	DSO_BINARY_TYPE__BUILDID_DEBUGINFO,

	DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO,

	DSO_BINARY_TYPE__NOT_FOUND,

};

tools/perf/util/symbol.c

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static enum dso_binary_type binary_type_symtab[] = { 
	DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE,

	DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE_COMP,

	DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO,

	DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO,

	DSO_BINARY_TYPE__NOT_FOUND,

};
@@ -1419,6 +1420,7 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod, 
	case DSO_BINARY_TYPE__SYSTEM_PATH_DSO:

	case DSO_BINARY_TYPE__FEDORA_DEBUGINFO:

	case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO:

	case DSO_BINARY_TYPE__MIXEDUP_UBUNTU_DEBUGINFO:

	case DSO_BINARY_TYPE__BUILDID_DEBUGINFO:

	case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:

		return !kmod && dso->kernel == DSO_TYPE_USER;