Re: [PATCH 2/3] perf symbols: Try reading the symbol table with libbfd

[Jiri Olsa <jolsa@redhat.com>]

On Wed, Jun 24, 2020 at 12:30:40PM +0200, Remi Bernon wrote:

SNIP

> +
> +		symbols__insert(&dso->symbols, symbol);
> +	}
> +#ifdef bfd_get_section
> +#undef bfd_asymbol_section
> +#endif
> +
> +	symbols__fixup_end(&dso->symbols);
> +	symbols__fixup_duplicate(&dso->symbols);
> +	dso->adjust_symbols = 1;
> +
> +	err = 0;
> +out_free:
> +	free(symbols);
> +out_close:
> +	bfd_close(abfd);
> +	return err;
> +}
> +#endif
> +
>  static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,
>  					   enum dso_binary_type type)
>  {
> @@ -1695,6 +1816,7 @@ int dso__load(struct dso *dso, struct map *map)
>  		bool next_slot = false;
>  		bool is_reg;
>  		bool nsexit;
> +		int bfdrc = -1;
>  		int sirc = -1;
>  
>  		enum dso_binary_type symtab_type = binary_type_symtab[i];
> @@ -1713,12 +1835,19 @@ int dso__load(struct dso *dso, struct map *map)
>  			nsinfo__mountns_exit(&nsc);
>  
>  		is_reg = is_regular_file(name);
> +#ifdef HAVE_LIBBFD_SUPPORT
>  		if (is_reg)
> +			bfdrc = dso__load_bfd_symbols(dso, name);
> +#endif

so the comment says that we try bfd when the libelf fails,
but the code seems to do the oposite.. starts with bfd
and skip libelf if it's ok

jirka

> +		if (is_reg && bfdrc < 0)
>  			sirc = symsrc__init(ss, dso, name, symtab_type);
>  
>  		if (nsexit)
>  			nsinfo__mountns_enter(dso->nsinfo, &nsc);
>  
> +		if (bfdrc == 0)
> +			break;
> +
>  		if (!is_reg || sirc < 0)
>  			continue;
>  
> diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
> index ff4f4c47e148..11fe71f46d14 100644
> --- a/tools/perf/util/symbol.h
> +++ b/tools/perf/util/symbol.h
> @@ -175,6 +175,10 @@ int symbol__config_symfs(const struct option *opt __maybe_unused,
>  
>  struct symsrc;
>  
> +#ifdef HAVE_LIBBFD_SUPPORT
> +int dso__load_bfd_symbols(struct dso *dso, const char *debugfile);
> +#endif
> +
>  int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
>  		  struct symsrc *runtime_ss, int kmodule);
>  int dso__synthesize_plt_symbols(struct dso *dso, struct symsrc *ss);
> -- 
> 2.27.0
>