Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc/perf: Expose instruction and data address registers as part of extended regs

Patch adds support to include Sampled Instruction Address Register
(SIAR) and Sampled Data Address Register (SDAR) SPRs as part of extended
registers. Update the definition of PERF_REG_PMU_MASK_300/31 and
PERF_REG_EXTENDED_MAX to include these SPR's.

Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Reviewed-by: Kajol Jain<kjain@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211007065505.27809-4-atrajeev@linux.vnet.ibm.com

authored by

Athira Rajeev and committed by
Michael Ellerman
29908bbf 02b182e6

+11 -4
+7 -4
arch/powerpc/include/uapi/asm/perf_regs.h
··· 61 61 PERF_REG_POWERPC_PMC4, 62 62 PERF_REG_POWERPC_PMC5, 63 63 PERF_REG_POWERPC_PMC6, 64 + PERF_REG_POWERPC_SDAR, 65 + PERF_REG_POWERPC_SIAR, 64 66 /* Max mask value for interrupt regs w/o extended regs */ 65 67 PERF_REG_POWERPC_MAX = PERF_REG_POWERPC_MMCRA + 1, 66 68 /* Max mask value for interrupt regs including extended regs */ 67 - PERF_REG_EXTENDED_MAX = PERF_REG_POWERPC_PMC6 + 1, 69 + PERF_REG_EXTENDED_MAX = PERF_REG_POWERPC_SIAR + 1, 68 70 }; 69 71 70 72 #define PERF_REG_PMU_MASK ((1ULL << PERF_REG_POWERPC_MAX) - 1) 71 73 72 74 /* 73 75 * PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_300 74 - * includes 9 SPRS from MMCR0 to PMC6 excluding the 76 + * includes 11 SPRS from MMCR0 to SIAR excluding the 75 77 * unsupported SPRS MMCR3, SIER2 and SIER3. 76 78 */ 77 79 #define PERF_REG_PMU_MASK_300 \ ··· 81 79 (1ULL << PERF_REG_POWERPC_MMCR2) | (1ULL << PERF_REG_POWERPC_PMC1) | \ 82 80 (1ULL << PERF_REG_POWERPC_PMC2) | (1ULL << PERF_REG_POWERPC_PMC3) | \ 83 81 (1ULL << PERF_REG_POWERPC_PMC4) | (1ULL << PERF_REG_POWERPC_PMC5) | \ 84 - (1ULL << PERF_REG_POWERPC_PMC6)) 82 + (1ULL << PERF_REG_POWERPC_PMC6) | (1ULL << PERF_REG_POWERPC_SDAR) | \ 83 + (1ULL << PERF_REG_POWERPC_SIAR)) 85 84 86 85 /* 87 86 * PERF_REG_EXTENDED_MASK value for CPU_FTR_ARCH_31 88 - * includes 12 SPRs from MMCR0 to PMC6. 87 + * includes 14 SPRs from MMCR0 to SIAR. 89 88 */ 90 89 #define PERF_REG_PMU_MASK_31 \ 91 90 (PERF_REG_PMU_MASK_300 | (1ULL << PERF_REG_POWERPC_MMCR3) | \
+4
arch/powerpc/perf/perf_regs.c
··· 90 90 return mfspr(SPRN_SIER2); 91 91 case PERF_REG_POWERPC_SIER3: 92 92 return mfspr(SPRN_SIER3); 93 + case PERF_REG_POWERPC_SDAR: 94 + return mfspr(SPRN_SDAR); 93 95 #endif 96 + case PERF_REG_POWERPC_SIAR: 97 + return mfspr(SPRN_SIAR); 94 98 default: return 0; 95 99 } 96 100 }