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

Commit 1029f9fe authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Check compatible symtab type before loading dso 



When loading a dso it'll look for symbol tables of all possible types.
However it's just wasted of time to check incompatible types - like
trying kernel module when loading user library.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1392859976-32760-4-git-send-email-namhyung@kernel.org


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

tools/perf/util/symbol.c

+52 −9
Original line number Original line Diff line number Diff line
@@ -1251,6 +1251,46 @@ static int dso__load_perf_map(struct dso *dso, struct map *map, 
	return -1;

	return -1;

}

}





static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,

					   enum dso_binary_type type)

{

	switch (type) {

	case DSO_BINARY_TYPE__JAVA_JIT:

	case DSO_BINARY_TYPE__DEBUGLINK:

	case DSO_BINARY_TYPE__SYSTEM_PATH_DSO:

	case DSO_BINARY_TYPE__FEDORA_DEBUGINFO:

	case DSO_BINARY_TYPE__UBUNTU_DEBUGINFO:

	case DSO_BINARY_TYPE__BUILDID_DEBUGINFO:

	case DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO:

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



	case DSO_BINARY_TYPE__KALLSYMS:

	case DSO_BINARY_TYPE__VMLINUX:

	case DSO_BINARY_TYPE__KCORE:

		return dso->kernel == DSO_TYPE_KERNEL;



	case DSO_BINARY_TYPE__GUEST_KALLSYMS:

	case DSO_BINARY_TYPE__GUEST_VMLINUX:

	case DSO_BINARY_TYPE__GUEST_KCORE:

		return dso->kernel == DSO_TYPE_GUEST_KERNEL;



	case DSO_BINARY_TYPE__GUEST_KMODULE:

	case DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE:

		/*

		 * kernel modules know their symtab type - it's set when

		 * creating a module dso in machine__new_module().

		 */

		return kmod && dso->symtab_type == type;



	case DSO_BINARY_TYPE__BUILD_ID_CACHE:

		return true;



	case DSO_BINARY_TYPE__NOT_FOUND:

	default:

		return false;

	}

}



int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)

int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter)

{

{

	char *name;

	char *name;
@@ -1261,6 +1301,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 
	int ss_pos = 0;

	int ss_pos = 0;

	struct symsrc ss_[2];

	struct symsrc ss_[2];

	struct symsrc *syms_ss = NULL, *runtime_ss = NULL;

	struct symsrc *syms_ss = NULL, *runtime_ss = NULL;

	bool kmod;





	dso__set_loaded(dso, map->type);

	dso__set_loaded(dso, map->type);
@@ -1301,7 +1342,11 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 
	if (!name)

	if (!name)

		return -1;

		return -1;





	/* Iterate over candidate debug images.

	kmod = dso->symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ||

		dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE;



	/*

	 * Iterate over candidate debug images.

	 * Keep track of "interesting" ones (those which have a symtab, dynsym,

	 * Keep track of "interesting" ones (those which have a symtab, dynsym,

	 * and/or opd section) for processing.

	 * and/or opd section) for processing.

	 */

	 */
@@ -1311,6 +1356,9 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 




		enum dso_binary_type symtab_type = binary_type_symtab[i];

		enum dso_binary_type symtab_type = binary_type_symtab[i];





		if (!dso__is_compatible_symtab_type(dso, kmod, symtab_type))

			continue;



		if (dso__read_binary_type_filename(dso, symtab_type,

		if (dso__read_binary_type_filename(dso, symtab_type,

						   root_dir, name, PATH_MAX))

						   root_dir, name, PATH_MAX))

			continue;

			continue;
@@ -1351,15 +1399,10 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 
	if (!runtime_ss && syms_ss)

	if (!runtime_ss && syms_ss)

		runtime_ss = syms_ss;

		runtime_ss = syms_ss;





	if (syms_ss) {

	if (syms_ss)

		int km;

		ret = dso__load_sym(dso, map, syms_ss, runtime_ss, filter, kmod);



	else

		km = dso->symtab_type == DSO_BINARY_TYPE__SYSTEM_PATH_KMODULE ||

		     dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE;

		ret = dso__load_sym(dso, map, syms_ss, runtime_ss, filter, km);

	} else {

		ret = -1;

		ret = -1;

	}





	if (ret > 0) {

	if (ret > 0) {

		int nr_plt;

		int nr_plt;