[PATCH V2 2/3] perf symbols: improve abi compliance in arm mapping symbols handling

[Russell King - ARM Linux]

On Wed, Jan 21, 2015 at 08:52:57PM -0800, Victor Kamensky wrote:
> Both Arm and Aarch64 ELF ABI allow mapping symbols be in from
> either "$d" or "$d.<any>". But current code that handles mapping
> symbols only deals with the first, dollar character and a single
> letter, case.
> 
> The patch adds handling of the second case with period
> followed by any characters.
> 
> Suggested-by: Russell King <linux at arm.linux.org.uk>
> Suggested-by: Will Deacon <will.deacon at arm.com>
> Signed-off-by: Victor Kamensky <victor.kamensky at linaro.org>
> Acked-by: Will Deacon <will.deacon at arm.com>
> Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
> Cc: Paul Mackerras <paulus at samba.org>
> Cc: Ingo Molnar <mingo at redhat.com>
> Cc: Arnaldo Carvalho de Melo <acme at kernel.org>
> Cc: Adrian Hunter <adrian.hunter at intel.com>
> Cc: Jiri Olsa <jolsa at redhat.com>
> Cc: Namhyung Kim <namhyung at kernel.org>
> Cc: Avi Kivity <avi at cloudius-systems.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt at hitachi.com>
> Cc: Anton Blanchard <anton at samba.org>
> Cc: David Ahern <dsahern at gmail.com>
> Cc: Dave Martin <Dave.Martin at arm.com>
> ---
>  tools/perf/util/symbol-elf.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
> index 1e188dd..7fd35d6 100644
> --- a/tools/perf/util/symbol-elf.c
> +++ b/tools/perf/util/symbol-elf.c
> @@ -857,17 +857,16 @@ int dso__load_sym(struct dso *dso, struct map *map,
>  		 * don't identify functions, so will confuse the profile
>  		 * output: */
>  		if (ehdr.e_machine == EM_ARM) {
> -			if (!strcmp(elf_name, "$a") ||
> -			    !strcmp(elf_name, "$d") ||
> -			    !strcmp(elf_name, "$t"))
> +			if (elf_name[0] == '$' && strchr("adt", elf_name[1])
> +			    && (elf_name[2] == '\0' || elf_name[2] == '.'))
>  				continue;
>  		}
>  		/* Reject Aarch64 ELF "mapping symbols": these aren't unique and
>  		 * don't identify functions, so will confuse the profile
>  		 * output: */
>  		if (ehdr.e_machine == EM_AARCH64) {
> -			if (!strcmp(elf_name, "$x") ||
> -			    !strcmp(elf_name, "$d"))
> +			if (elf_name[0] == '$' && strchr("dx", elf_name[1])
> +			    && (elf_name[2] == '\0' || elf_name[2] == '.'))
>  				continue;
>  		}

Why not fix this first?  Then, all you'd need to do would be to change
the test for EM_ARM to EM_ARM or EM_AARCH64, and add the 'x' into the
strchr() string.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.