Commit 83869019 authored by German Gomez's avatar German Gomez Committed by Arnaldo Carvalho de Melo
Browse files

perf arch: Support register names from all archs 



When reading a perf.data file with register values, there is a mismatch
between the names and the values of the registers because the tool is
built using only the register names from the local architecture.

Reading a perf.data file that was recorded on ARM64, gives the following
erroneous output on an X86 machine:

  # perf report -i perf_arm64.data -D
  [...]
  24661932634451 0x698 [0x21d0]: PERF_RECORD_SAMPLE(IP, 0x1): 43239/43239: 0xffffc5be8f100f98 period: 1 addr: 0
  ... user regs: mask 0x1ffffffff ABI 64-bit
  .... AX    0x0000ffffd1515817
  .... BX    0x0000ffffd1515480
  .... CX    0x0000aaaadabf6c80
  .... DX    0x000000000000002e
  .... SI    0x0000000040100401
  .... DI    0x0040600200000080
  .... BP    0x0000ffffd1510e10
  .... SP    0x0000000000000000
  .... IP    0x00000000000000dd
  .... FLAGS 0x0000ffffd1510cd0
  .... CS    0x0000000000000000
  .... SS    0x0000000000000030
  .... DS    0x0000ffffa569a208
  .... ES    0x0000000000000000
  .... FS    0x0000000000000000
  .... GS    0x0000000000000000
  .... R8    0x0000aaaad3de9650
  .... R9    0x0000ffffa57397f0
  .... R10   0x0000000000000001
  .... R11   0x0000ffffa57fd000
  .... R12   0x0000ffffd1515817
  .... R13   0x0000ffffd1515480
  .... R14   0x0000aaaadabf6c80
  .... R15   0x0000000000000000
  .... unknown 0x0000000000000001
  .... unknown 0x0000000000000000
  .... unknown 0x0000000000000000
  .... unknown 0x0000000000000000
  .... unknown 0x0000000000000000
  .... unknown 0x0000ffffd1510d90
  .... unknown 0x0000ffffa5739b90
  .... unknown 0x0000ffffd1510d80
  .... XMM0  0x0000ffffa57392c8
   ... thread: perf-exec:43239
   ...... dso: [kernel.kallsyms]

As can be seen, the register names correspond to X86 registers, even
though the perf.data file was recorded on an ARM64 system. After this
patch, the output of the command displays the correct register names:

  # perf report -i perf_arm64.data -D
  [...]
  24661932634451 0x698 [0x21d0]: PERF_RECORD_SAMPLE(IP, 0x1): 43239/43239: 0xffffc5be8f100f98 period: 1 addr: 0
  ... user regs: mask 0x1ffffffff ABI 64-bit
  .... x0    0x0000ffffd1515817
  .... x1    0x0000ffffd1515480
  .... x2    0x0000aaaadabf6c80
  .... x3    0x000000000000002e
  .... x4    0x0000000040100401
  .... x5    0x0040600200000080
  .... x6    0x0000ffffd1510e10
  .... x7    0x0000000000000000
  .... x8    0x00000000000000dd
  .... x9    0x0000ffffd1510cd0
  .... x10   0x0000000000000000
  .... x11   0x0000000000000030
  .... x12   0x0000ffffa569a208
  .... x13   0x0000000000000000
  .... x14   0x0000000000000000
  .... x15   0x0000000000000000
  .... x16   0x0000aaaad3de9650
  .... x17   0x0000ffffa57397f0
  .... x18   0x0000000000000001
  .... x19   0x0000ffffa57fd000
  .... x20   0x0000ffffd1515817
  .... x21   0x0000ffffd1515480
  .... x22   0x0000aaaadabf6c80
  .... x23   0x0000000000000000
  .... x24   0x0000000000000001
  .... x25   0x0000000000000000
  .... x26   0x0000000000000000
  .... x27   0x0000000000000000
  .... x28   0x0000000000000000
  .... x29   0x0000ffffd1510d90
  .... lr    0x0000ffffa5739b90
  .... sp    0x0000ffffd1510d80
  .... pc    0x0000ffffa57392c8
   ... thread: perf-exec:43239
   ...... dso: [kernel.kallsyms]

Tester comments:

Athira reports:

"Looks good to me. Tested this patchset in powerpc by capturing regs in
powerpc and doing perf report to read the data from x86."

Reported-by: default avatarAlexandre Truong <alexandre.truong@arm.com>
Reviewed-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Signed-off-by: default avatarGerman Gomez <german.gomez@arm.com>
Tested-by: default avatarAthira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-csky@vger.kernel.org
Cc: linux-riscv@lists.infradead.org
Link: https://lore.kernel.org/r/20211207180653.1147374-4-german.gomez@arm.com


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

tools/perf/arch/arm/include/perf_regs.h

+0 −42
Original line number Diff line number Diff line
@@ -15,46 +15,4 @@ void perf_regs_load(u64 *regs); 
#define PERF_REG_IP	PERF_REG_ARM_PC

#define PERF_REG_SP	PERF_REG_ARM_SP



static inline const char *__perf_reg_name(int id)

{

	switch (id) {

	case PERF_REG_ARM_R0:

		return "r0";

	case PERF_REG_ARM_R1:

		return "r1";

	case PERF_REG_ARM_R2:

		return "r2";

	case PERF_REG_ARM_R3:

		return "r3";

	case PERF_REG_ARM_R4:

		return "r4";

	case PERF_REG_ARM_R5:

		return "r5";

	case PERF_REG_ARM_R6:

		return "r6";

	case PERF_REG_ARM_R7:

		return "r7";

	case PERF_REG_ARM_R8:

		return "r8";

	case PERF_REG_ARM_R9:

		return "r9";

	case PERF_REG_ARM_R10:

		return "r10";

	case PERF_REG_ARM_FP:

		return "fp";

	case PERF_REG_ARM_IP:

		return "ip";

	case PERF_REG_ARM_SP:

		return "sp";

	case PERF_REG_ARM_LR:

		return "lr";

	case PERF_REG_ARM_PC:

		return "pc";

	default:

		return NULL;

	}



	return NULL;

}



#endif /* ARCH_PERF_REGS_H */

tools/perf/arch/arm64/include/perf_regs.h

+0 −76
Original line number Diff line number Diff line
@@ -17,80 +17,4 @@ void perf_regs_load(u64 *regs); 
#define PERF_REG_IP	PERF_REG_ARM64_PC

#define PERF_REG_SP	PERF_REG_ARM64_SP



static inline const char *__perf_reg_name(int id)

{

	switch (id) {

	case PERF_REG_ARM64_X0:

		return "x0";

	case PERF_REG_ARM64_X1:

		return "x1";

	case PERF_REG_ARM64_X2:

		return "x2";

	case PERF_REG_ARM64_X3:

		return "x3";

	case PERF_REG_ARM64_X4:

		return "x4";

	case PERF_REG_ARM64_X5:

		return "x5";

	case PERF_REG_ARM64_X6:

		return "x6";

	case PERF_REG_ARM64_X7:

		return "x7";

	case PERF_REG_ARM64_X8:

		return "x8";

	case PERF_REG_ARM64_X9:

		return "x9";

	case PERF_REG_ARM64_X10:

		return "x10";

	case PERF_REG_ARM64_X11:

		return "x11";

	case PERF_REG_ARM64_X12:

		return "x12";

	case PERF_REG_ARM64_X13:

		return "x13";

	case PERF_REG_ARM64_X14:

		return "x14";

	case PERF_REG_ARM64_X15:

		return "x15";

	case PERF_REG_ARM64_X16:

		return "x16";

	case PERF_REG_ARM64_X17:

		return "x17";

	case PERF_REG_ARM64_X18:

		return "x18";

	case PERF_REG_ARM64_X19:

		return "x19";

	case PERF_REG_ARM64_X20:

		return "x20";

	case PERF_REG_ARM64_X21:

		return "x21";

	case PERF_REG_ARM64_X22:

		return "x22";

	case PERF_REG_ARM64_X23:

		return "x23";

	case PERF_REG_ARM64_X24:

		return "x24";

	case PERF_REG_ARM64_X25:

		return "x25";

	case PERF_REG_ARM64_X26:

		return "x26";

	case PERF_REG_ARM64_X27:

		return "x27";

	case PERF_REG_ARM64_X28:

		return "x28";

	case PERF_REG_ARM64_X29:

		return "x29";

	case PERF_REG_ARM64_SP:

		return "sp";

	case PERF_REG_ARM64_LR:

		return "lr";

	case PERF_REG_ARM64_PC:

		return "pc";

	default:

		return NULL;

	}



	return NULL;

}



#endif /* ARCH_PERF_REGS_H */

tools/perf/arch/csky/include/perf_regs.h

+0 −82
Original line number Diff line number Diff line
@@ -15,86 +15,4 @@ 
#define PERF_REG_IP	PERF_REG_CSKY_PC

#define PERF_REG_SP	PERF_REG_CSKY_SP



static inline const char *__perf_reg_name(int id)

{

	switch (id) {

	case PERF_REG_CSKY_A0:

		return "a0";

	case PERF_REG_CSKY_A1:

		return "a1";

	case PERF_REG_CSKY_A2:

		return "a2";

	case PERF_REG_CSKY_A3:

		return "a3";

	case PERF_REG_CSKY_REGS0:

		return "regs0";

	case PERF_REG_CSKY_REGS1:

		return "regs1";

	case PERF_REG_CSKY_REGS2:

		return "regs2";

	case PERF_REG_CSKY_REGS3:

		return "regs3";

	case PERF_REG_CSKY_REGS4:

		return "regs4";

	case PERF_REG_CSKY_REGS5:

		return "regs5";

	case PERF_REG_CSKY_REGS6:

		return "regs6";

	case PERF_REG_CSKY_REGS7:

		return "regs7";

	case PERF_REG_CSKY_REGS8:

		return "regs8";

	case PERF_REG_CSKY_REGS9:

		return "regs9";

	case PERF_REG_CSKY_SP:

		return "sp";

	case PERF_REG_CSKY_LR:

		return "lr";

	case PERF_REG_CSKY_PC:

		return "pc";

#if defined(__CSKYABIV2__)

	case PERF_REG_CSKY_EXREGS0:

		return "exregs0";

	case PERF_REG_CSKY_EXREGS1:

		return "exregs1";

	case PERF_REG_CSKY_EXREGS2:

		return "exregs2";

	case PERF_REG_CSKY_EXREGS3:

		return "exregs3";

	case PERF_REG_CSKY_EXREGS4:

		return "exregs4";

	case PERF_REG_CSKY_EXREGS5:

		return "exregs5";

	case PERF_REG_CSKY_EXREGS6:

		return "exregs6";

	case PERF_REG_CSKY_EXREGS7:

		return "exregs7";

	case PERF_REG_CSKY_EXREGS8:

		return "exregs8";

	case PERF_REG_CSKY_EXREGS9:

		return "exregs9";

	case PERF_REG_CSKY_EXREGS10:

		return "exregs10";

	case PERF_REG_CSKY_EXREGS11:

		return "exregs11";

	case PERF_REG_CSKY_EXREGS12:

		return "exregs12";

	case PERF_REG_CSKY_EXREGS13:

		return "exregs13";

	case PERF_REG_CSKY_EXREGS14:

		return "exregs14";

	case PERF_REG_CSKY_TLS:

		return "tls";

	case PERF_REG_CSKY_HI:

		return "hi";

	case PERF_REG_CSKY_LO:

		return "lo";

#endif

	default:

		return NULL;

	}



	return NULL;

}



#endif /* ARCH_PERF_REGS_H */

tools/perf/arch/mips/include/perf_regs.h

+0 −69
Original line number Diff line number Diff line
@@ -12,73 +12,4 @@ 


#define PERF_REGS_MASK ((1ULL << PERF_REG_MIPS_MAX) - 1)



static inline const char *__perf_reg_name(int id)

{

	switch (id) {

	case PERF_REG_MIPS_PC:

		return "PC";

	case PERF_REG_MIPS_R1:

		return "$1";

	case PERF_REG_MIPS_R2:

		return "$2";

	case PERF_REG_MIPS_R3:

		return "$3";

	case PERF_REG_MIPS_R4:

		return "$4";

	case PERF_REG_MIPS_R5:

		return "$5";

	case PERF_REG_MIPS_R6:

		return "$6";

	case PERF_REG_MIPS_R7:

		return "$7";

	case PERF_REG_MIPS_R8:

		return "$8";

	case PERF_REG_MIPS_R9:

		return "$9";

	case PERF_REG_MIPS_R10:

		return "$10";

	case PERF_REG_MIPS_R11:

		return "$11";

	case PERF_REG_MIPS_R12:

		return "$12";

	case PERF_REG_MIPS_R13:

		return "$13";

	case PERF_REG_MIPS_R14:

		return "$14";

	case PERF_REG_MIPS_R15:

		return "$15";

	case PERF_REG_MIPS_R16:

		return "$16";

	case PERF_REG_MIPS_R17:

		return "$17";

	case PERF_REG_MIPS_R18:

		return "$18";

	case PERF_REG_MIPS_R19:

		return "$19";

	case PERF_REG_MIPS_R20:

		return "$20";

	case PERF_REG_MIPS_R21:

		return "$21";

	case PERF_REG_MIPS_R22:

		return "$22";

	case PERF_REG_MIPS_R23:

		return "$23";

	case PERF_REG_MIPS_R24:

		return "$24";

	case PERF_REG_MIPS_R25:

		return "$25";

	case PERF_REG_MIPS_R28:

		return "$28";

	case PERF_REG_MIPS_R29:

		return "$29";

	case PERF_REG_MIPS_R30:

		return "$30";

	case PERF_REG_MIPS_R31:

		return "$31";

	default:

		break;

	}

	return NULL;

}



#endif /* ARCH_PERF_REGS_H */

tools/perf/arch/powerpc/include/perf_regs.h

+0 −66
Original line number Diff line number Diff line
@@ -19,70 +19,4 @@ void perf_regs_load(u64 *regs); 
#define PERF_REG_IP     PERF_REG_POWERPC_NIP

#define PERF_REG_SP     PERF_REG_POWERPC_R1



static const char *reg_names[] = {

	[PERF_REG_POWERPC_R0] = "r0",

	[PERF_REG_POWERPC_R1] = "r1",

	[PERF_REG_POWERPC_R2] = "r2",

	[PERF_REG_POWERPC_R3] = "r3",

	[PERF_REG_POWERPC_R4] = "r4",

	[PERF_REG_POWERPC_R5] = "r5",

	[PERF_REG_POWERPC_R6] = "r6",

	[PERF_REG_POWERPC_R7] = "r7",

	[PERF_REG_POWERPC_R8] = "r8",

	[PERF_REG_POWERPC_R9] = "r9",

	[PERF_REG_POWERPC_R10] = "r10",

	[PERF_REG_POWERPC_R11] = "r11",

	[PERF_REG_POWERPC_R12] = "r12",

	[PERF_REG_POWERPC_R13] = "r13",

	[PERF_REG_POWERPC_R14] = "r14",

	[PERF_REG_POWERPC_R15] = "r15",

	[PERF_REG_POWERPC_R16] = "r16",

	[PERF_REG_POWERPC_R17] = "r17",

	[PERF_REG_POWERPC_R18] = "r18",

	[PERF_REG_POWERPC_R19] = "r19",

	[PERF_REG_POWERPC_R20] = "r20",

	[PERF_REG_POWERPC_R21] = "r21",

	[PERF_REG_POWERPC_R22] = "r22",

	[PERF_REG_POWERPC_R23] = "r23",

	[PERF_REG_POWERPC_R24] = "r24",

	[PERF_REG_POWERPC_R25] = "r25",

	[PERF_REG_POWERPC_R26] = "r26",

	[PERF_REG_POWERPC_R27] = "r27",

	[PERF_REG_POWERPC_R28] = "r28",

	[PERF_REG_POWERPC_R29] = "r29",

	[PERF_REG_POWERPC_R30] = "r30",

	[PERF_REG_POWERPC_R31] = "r31",

	[PERF_REG_POWERPC_NIP] = "nip",

	[PERF_REG_POWERPC_MSR] = "msr",

	[PERF_REG_POWERPC_ORIG_R3] = "orig_r3",

	[PERF_REG_POWERPC_CTR] = "ctr",

	[PERF_REG_POWERPC_LINK] = "link",

	[PERF_REG_POWERPC_XER] = "xer",

	[PERF_REG_POWERPC_CCR] = "ccr",

	[PERF_REG_POWERPC_SOFTE] = "softe",

	[PERF_REG_POWERPC_TRAP] = "trap",

	[PERF_REG_POWERPC_DAR] = "dar",

	[PERF_REG_POWERPC_DSISR] = "dsisr",

	[PERF_REG_POWERPC_SIER] = "sier",

	[PERF_REG_POWERPC_MMCRA] = "mmcra",

	[PERF_REG_POWERPC_MMCR0] = "mmcr0",

	[PERF_REG_POWERPC_MMCR1] = "mmcr1",

	[PERF_REG_POWERPC_MMCR2] = "mmcr2",

	[PERF_REG_POWERPC_MMCR3] = "mmcr3",

	[PERF_REG_POWERPC_SIER2] = "sier2",

	[PERF_REG_POWERPC_SIER3] = "sier3",

	[PERF_REG_POWERPC_PMC1] = "pmc1",

	[PERF_REG_POWERPC_PMC2] = "pmc2",

	[PERF_REG_POWERPC_PMC3] = "pmc3",

	[PERF_REG_POWERPC_PMC4] = "pmc4",

	[PERF_REG_POWERPC_PMC5] = "pmc5",

	[PERF_REG_POWERPC_PMC6] = "pmc6",

	[PERF_REG_POWERPC_SDAR] = "sdar",

	[PERF_REG_POWERPC_SIAR] = "siar",

};



static inline const char *__perf_reg_name(int id)

{

	return reg_names[id];

}

#endif /* ARCH_PERF_REGS_H */