powerpc/perf: Add kernel support for new MSR[HV PR] bits in trace-imc
Madhavan Srinivasan
maintainerPATCH v2 1/1 powerpc/perf: Add kernel support for new MSR[HV PR] bits in trace-imc
From: Anju T Sudhakar <[email protected]>
IMC trace-mode record has MSR[HV PR] bits added in the third DW. These bits can be used to set the cpumode for the instruction pointer captured in each sample.
Add support in kernel to use these bits to set the cpumode for each sample.
---
Changelog v1:
- Changed check to use CPU_FTR_ARCH_31
arch/powerpc/include/asm/imc-pmu.h | 5 +++++ arch/powerpc/perf/imc-pmu.c | 29 ++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-)
arch/powerpc/include/asm/imc-pmu.h +5 -0
@@ -99,6 +99,11 @@ struct trace_imc_data {*/ #define IMC_TRACE_RECORD_TB1_MASK 0x3ffffffffffULL +/* +* Bit 0:1 in third DW of IMC trace record +* specifies the MSR[HV PR] values. +*/ +#define IMC_TRACE_RECORD_VAL_HVPR (x) ((x) >> 62)/* * Device tree parser code detects IMC pmu support and
arch/powerpc/perf/imc-pmu.c +24 -5
@@ -1288,11 +1288,30 @@ static int trace_imc_prepare_sample(struct trace_imc_data *mem, header->size =sizeof (*header) + event->header_size; header->misc =0 ; -if (is_kernel_addr (data->ip)) - header->misc |=PERF_RECORD_MISC_KERNEL ; -else - header->misc |=PERF_RECORD_MISC_USER ; - +if (cpu_has_feature (CPU_FTR_ARCH_31 )) { +switch (IMC_TRACE_RECORD_VAL_HVPR (mem->val)) { +case 0 :/* when MSR HV and PR not set in the trace-record */ + header->misc |=PERF_RECORD_MISC_GUEST_KERNEL ; +break ; +case 1 :/* MSR HV is 0 and PR is 1 */ + header->misc |=PERF_RECORD_MISC_GUEST_USER ; +break ; +case 2 :/* MSR HV is 1 and PR is 0 */ + header->misc |=PERF_RECORD_MISC_HYPERVISOR ; +break ; +case 3 :/* MSR HV is 1 and PR is 1 */ + header->misc |=PERF_RECORD_MISC_USER ; +break ; +default : +pr_info ("IMC: Unable to set the flag based on MSR bits\n" ); +break ; + } + }else { +if (is_kernel_addr (data->ip)) + header->misc |=PERF_RECORD_MISC_KERNEL ; +else + header->misc |=PERF_RECORD_MISC_USER ; + }perf_event_header__init_id (header, data, event);return 0 ;
Signature · 1 line
2.26.2
Michael Ellerman
AppliedQuoted 6 lines · Madhavan Srinivasan
IMC trace-mode record has MSR[HV PR] bits added in the third DW. These bits can be used to set the cpumode for the instruction pointer captured in each sample.
Add support in kernel to use these bits to set the cpumode for each sample.
Applied to powerpc/next.
[1/1] powerpc/perf: Add kernel support for new MSR[HV PR] bits in trace-imc
https://git.kernel.org/powerpc/c/77ca3951cc37727ae8361d583a30da7a1b84e427
cheers