Commit 42d7a910 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Fix arch specific ->init() failure errors 



They are called from symbol__annotate() and to propagate errors that can
help understand the problem make them return what
symbol__strerror_disassemble() known, i.e. errno codes and other
annotation specific errors in a special, out of errnos, range.

Reported-by: default avatarRussell King - ARM Linux admin <linux@armlinux.org.uk>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Cc: Will Deacon <will@kernel.org>
Link: https://lkml.kernel.org/n/tip-pqx7srcv7tixgid251aeboj6@git.kernel.org


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

tools/perf/arch/arm/annotate/instructions.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int arm__annotate_init(struct arch *arch, char *cpuid __maybe_unused) 


	arm = zalloc(sizeof(*arm));

	if (!arm)

		return -1;

		return ENOMEM;



#define ARM_CONDS "(cc|cs|eq|ge|gt|hi|le|ls|lt|mi|ne|pl|vc|vs)"

	err = regcomp(&arm->call_insn, "^blx?" ARM_CONDS "?$", REG_EXTENDED);
@@ -59,5 +59,5 @@ out_free_call: 
	regfree(&arm->call_insn);

out_free_arm:

	free(arm);

	return -1;

	return SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP;

}

tools/perf/arch/arm64/annotate/instructions.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused) 


	arm = zalloc(sizeof(*arm));

	if (!arm)

		return -1;

		return ENOMEM;



	/* bl, blr */

	err = regcomp(&arm->call_insn, "^blr?$", REG_EXTENDED);
@@ -118,5 +118,5 @@ out_free_call: 
	regfree(&arm->call_insn);

out_free_arm:

	free(arm);

	return -1;

	return SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP;

}

tools/perf/arch/s390/annotate/instructions.c

+4 −2
Original line number Diff line number Diff line
@@ -164,8 +164,10 @@ static int s390__annotate_init(struct arch *arch, char *cpuid __maybe_unused) 
	if (!arch->initialized) {

		arch->initialized = true;

		arch->associate_instruction_ops = s390__associate_ins_ops;

		if (cpuid)

			err = s390__cpuid_parse(arch, cpuid);

		if (cpuid) {

			if (s390__cpuid_parse(arch, cpuid))

				err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING;

		}

	}



	return err;

tools/perf/arch/x86/annotate/instructions.c

+4 −2
Original line number Diff line number Diff line
@@ -196,8 +196,10 @@ static int x86__annotate_init(struct arch *arch, char *cpuid) 
	if (arch->initialized)

		return 0;



	if (cpuid)

		err = x86__cpuid_parse(arch, cpuid);

	if (cpuid) {

		if (x86__cpuid_parse(arch, cpuid))

			err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING;

	}



	arch->initialized = true;

	return err;

tools/perf/util/annotate.c

+6 −0
Original line number Diff line number Diff line
@@ -1631,6 +1631,12 @@ int symbol__strerror_disassemble(struct symbol *sym __maybe_unused, struct map * 
	case SYMBOL_ANNOTATE_ERRNO__NO_LIBOPCODES_FOR_BPF:

		scnprintf(buf, buflen, "Please link with binutils's libopcode to enable BPF annotation");

		break;

	case SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP:

		scnprintf(buf, buflen, "Problems with arch specific instruction name regular expressions.");

		break;

	case SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING:

		scnprintf(buf, buflen, "Problems while parsing the CPUID in the arch specific initialization.");

		break;

	default:

		scnprintf(buf, buflen, "Internal error: Invalid %d error code\n", errnum);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE