perf/x86/intel: Enable PEBS format 5
Subsystems (4)
PATCH 1/3 perf/x86/intel: Enable PEBS format 5
From: Kan Liang <[email protected]>
The new PEBS Record Format 5 is similar to the PEBS Record Format 4. The only difference is the layout of the Counter Reset fields of the PEBS Config Buffer in the DS area. For the PEBS format 4, the Counter Reset fields allocation is for 8 general-purpose counters followed by 4 fixed-function counters. For the PEBS format 5, the Counter Reset fields allocation is for 32 general-purpose counters followed by 16 fixed-function counters.
Extend the MAX_PEBS_EVENTS to 32. Add MAX_PEBS_EVENTS_FMT4 for the previous platform. Except for the DS auto-reload code, other places already assume 32 counters. Only check the PEBS_FMT in the DS auto-reload code.
Extend the MAX_FIXED_PEBS_EVENTS to 16, which only impacts the size of struct debug_store and some local temporary variables. The size of struct debug_store increases 288B, which is small and should be acceptable.
--- arch/x86/events/intel/ds.c | 14 +++++++++++--- arch/x86/include/asm/intel_ds.h | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-)
arch/x86/events/intel/ds.c +11 -3
@@ -1203,7 +1203,10 @@ static void intel_pmu_pebs_via_pt_enable(struct perf_event *event)if (hwc->idx >=INTEL_PMC_IDX_FIXED ) { base =MSR_RELOAD_FIXED_CTR0 ; idx = hwc->idx -INTEL_PMC_IDX_FIXED ; - value = ds->pebs_event_reset[MAX_PEBS_EVENTS + idx]; +if (x86_pmu.intel_cap.pebs_format <5 ) + value = ds->pebs_event_reset[MAX_PEBS_EVENTS_FMT4 + idx]; +else + value = ds->pebs_event_reset[MAX_PEBS_EVENTS + idx]; }wrmsrl (base + idx, value); }
@@ -1232,8 +1235,12 @@ void intel_pmu_pebs_enable(struct perf_event *event) } } -if (idx >=INTEL_PMC_IDX_FIXED ) - idx =MAX_PEBS_EVENTS + (idx -INTEL_PMC_IDX_FIXED ); +if (idx >=INTEL_PMC_IDX_FIXED ) { +if (x86_pmu.intel_cap.pebs_format <5 ) + idx =MAX_PEBS_EVENTS_FMT4 + (idx -INTEL_PMC_IDX_FIXED ); +else + idx =MAX_PEBS_EVENTS + (idx -INTEL_PMC_IDX_FIXED ); + }/* * Use auto-reload if possible to save a MSR write in the PMI.
@@ -2204,6 +2211,7 @@ void __init intel_ds_init(void)break ;case 4 : +case 5 : x86_pmu.drain_pebs = intel_pmu_drain_pebs_icl; x86_pmu.pebs_record_size =sizeof (struct pebs_basic );if (x86_pmu.intel_cap.pebs_baseline) {
arch/x86/include/asm/intel_ds.h +3 -2
@@ -7,8 +7,9 @@#define PEBS_BUFFER_SIZE (PAGE_SIZE << 4)/* The maximal number of PEBS events: */ -#define MAX_PEBS_EVENTS 8 -#define MAX_FIXED_PEBS_EVENTS 4 +#define MAX_PEBS_EVENTS_FMT4 8 +#define MAX_PEBS_EVENTS 32 +#define MAX_FIXED_PEBS_EVENTS 16/* * A debug store configuration.
Signature · 1 line
2.7.4
PATCH 2/3 KVM: x86: use the KVM side max supported fixed counter
From: Wei Wang <[email protected]>
KVM vPMU doesn't support to emulate all the fixed counters that the host PMU driver has supported, e.g. the fixed counter 3 used by Topdown metrics hasn't been supported by KVM so far.
Rename MAX_FIXED_COUNTERS to KVM_PMC_MAX_FIXED to have a more straightforward naming convention as INTEL_PMC_MAX_FIXED used by the host PMU driver, and fix vPMU to use the KVM side KVM_PMC_MAX_FIXED for the virtual fixed counter emulation, instead of the host side INTEL_PMC_MAX_FIXED.
--- arch/x86/include/asm/kvm_host.h | 3 ++- arch/x86/kvm/cpuid.c | 3 ++- arch/x86/kvm/pmu.h | 2 -- arch/x86/kvm/vmx/pmu_intel.c | 4 ++-- arch/x86/kvm/x86.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -1
@@ -498,6 +498,7 @@ struct kvm_pmc {bool intr; }; +#define KVM_PMC_MAX_FIXED 3struct kvm_pmu {unsigned nr_arch_gp_counters;unsigned nr_arch_fixed_counters;
@@ -511,7 +512,7 @@ struct kvm_pmu {u64 reserved_bits;u8 version;struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ]; -struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED ]; +struct kvm_pmc fixed_counters[KVM_PMC_MAX_FIXED ];struct irq_work irq_work;DECLARE_BITMAP (reprogram_pmi,X86_PMC_IDX_MAX );DECLARE_BITMAP (all_valid_pmc_idx,X86_PMC_IDX_MAX );
arch/x86/kvm/cpuid.c +2 -1
@@ -856,7 +856,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) eax.split.bit_width = cap.bit_width_gp; eax.split.mask_length = cap.events_mask_len; - edx.split.num_counters_fixed =min (cap.num_counters_fixed,MAX_FIXED_COUNTERS ); + edx.split.num_counters_fixed = +min (cap.num_counters_fixed,KVM_PMC_MAX_FIXED ); edx.split.bit_width_fixed = cap.bit_width_fixed;if (cap.version) edx.split.anythread_deprecated =1 ;
arch/x86/kvm/pmu.h +0 -2
@@ -15,8 +15,6 @@#define VMWARE_BACKDOOR_PMC_REAL_TIME 0x10001#define VMWARE_BACKDOOR_PMC_APPARENT_TIME 0x10002 -#define MAX_FIXED_COUNTERS 3 -struct kvm_event_hw_type_mapping {u8 eventsel;u8 unit_mask;
arch/x86/kvm/vmx/pmu_intel.c +2 -2
@@ -565,7 +565,7 @@ static void intel_pmu_init(struct kvm_vcpu *vcpu) pmu->gp_counters[i].current_config =0 ; } -for (i =0 ; i <INTEL_PMC_MAX_FIXED ; i++) { +for (i =0 ; i <KVM_PMC_MAX_FIXED ; i++) { pmu->fixed_counters[i].type =KVM_PMC_FIXED ; pmu->fixed_counters[i].vcpu = vcpu; pmu->fixed_counters[i].idx = i +INTEL_PMC_IDX_FIXED ;
@@ -591,7 +591,7 @@ static void intel_pmu_reset(struct kvm_vcpu *vcpu) pmc->counter = pmc->eventsel =0 ; } -for (i =0 ; i <INTEL_PMC_MAX_FIXED ; i++) { +for (i =0 ; i <KVM_PMC_MAX_FIXED ; i++) { pmc = &pmu->fixed_counters[i];pmc_stop_counter (pmc);
arch/x86/kvm/x86.c +1 -1
@@ -6452,7 +6452,7 @@ static void kvm_init_msr_list(void)u32 dummy[2 ];unsigned i; -BUILD_BUG_ON_MSG (INTEL_PMC_MAX_FIXED !=4 , +BUILD_BUG_ON_MSG (KVM_PMC_MAX_FIXED !=3 ,"Please update the fixed PMCs in msrs_to_saved_all[]" );perf_get_x86_pmu_capability (&x86_pmu);
Signature · 1 line
2.7.4
[tip: perf/core] KVM: x86: use the KVM side max supported fixed counter
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 0144ba0c5bd3176647bb4d49a697d231610c78b7 Gitweb: https://git.kernel.org/tip/0144ba0c5bd3176647bb4d49a697d231610c78b7 Author: Wei Wang <[email protected]> AuthorDate: Tue, 01 Feb 2022 13:23:22 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 02 Feb 2022 13:11:44 +01:00
KVM: x86: use the KVM side max supported fixed counter
KVM vPMU doesn't support to emulate all the fixed counters that the host PMU driver has supported, e.g. the fixed counter 3 used by Topdown metrics hasn't been supported by KVM so far.
Rename MAX_FIXED_COUNTERS to KVM_PMC_MAX_FIXED to have a more straightforward naming convention as INTEL_PMC_MAX_FIXED used by the host PMU driver, and fix vPMU to use the KVM side KVM_PMC_MAX_FIXED for the virtual fixed counter emulation, instead of the host side INTEL_PMC_MAX_FIXED.
--- arch/x86/include/asm/kvm_host.h | 3 ++- arch/x86/kvm/cpuid.c | 3 ++- arch/x86/kvm/pmu.h | 2 -- arch/x86/kvm/vmx/pmu_intel.c | 4 ++-- arch/x86/kvm/x86.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -1
@@ -498,6 +498,7 @@ struct kvm_pmc {bool intr; }; +#define KVM_PMC_MAX_FIXED 3struct kvm_pmu {unsigned nr_arch_gp_counters;unsigned nr_arch_fixed_counters;
@@ -511,7 +512,7 @@ struct kvm_pmu {u64 reserved_bits;u8 version;struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC ]; -struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED ]; +struct kvm_pmc fixed_counters[KVM_PMC_MAX_FIXED ];struct irq_work irq_work;DECLARE_BITMAP (reprogram_pmi,X86_PMC_IDX_MAX );DECLARE_BITMAP (all_valid_pmc_idx,X86_PMC_IDX_MAX );
arch/x86/kvm/cpuid.c +2 -1
@@ -875,7 +875,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) eax.split.bit_width = cap.bit_width_gp; eax.split.mask_length = cap.events_mask_len; - edx.split.num_counters_fixed =min (cap.num_counters_fixed,MAX_FIXED_COUNTERS ); + edx.split.num_counters_fixed = +min (cap.num_counters_fixed,KVM_PMC_MAX_FIXED ); edx.split.bit_width_fixed = cap.bit_width_fixed;if (cap.version) edx.split.anythread_deprecated =1 ;
arch/x86/kvm/pmu.h +0 -2
@@ -15,8 +15,6 @@#define VMWARE_BACKDOOR_PMC_REAL_TIME 0x10001#define VMWARE_BACKDOOR_PMC_APPARENT_TIME 0x10002 -#define MAX_FIXED_COUNTERS 3 -struct kvm_event_hw_type_mapping {u8 eventsel;u8 unit_mask;
arch/x86/kvm/vmx/pmu_intel.c +2 -2
@@ -565,7 +565,7 @@ static void intel_pmu_init(struct kvm_vcpu *vcpu) pmu->gp_counters[i].current_config =0 ; } -for (i =0 ; i <INTEL_PMC_MAX_FIXED ; i++) { +for (i =0 ; i <KVM_PMC_MAX_FIXED ; i++) { pmu->fixed_counters[i].type =KVM_PMC_FIXED ; pmu->fixed_counters[i].vcpu = vcpu; pmu->fixed_counters[i].idx = i +INTEL_PMC_IDX_FIXED ;
@@ -591,7 +591,7 @@ static void intel_pmu_reset(struct kvm_vcpu *vcpu) pmc->counter = pmc->eventsel =0 ; } -for (i =0 ; i <INTEL_PMC_MAX_FIXED ; i++) { +for (i =0 ; i <KVM_PMC_MAX_FIXED ; i++) { pmc = &pmu->fixed_counters[i];pmc_stop_counter (pmc);
arch/x86/kvm/x86.c +1 -1
@@ -6514,7 +6514,7 @@ static void kvm_init_msr_list(void)u32 dummy[2 ];unsigned i; -BUILD_BUG_ON_MSG (INTEL_PMC_MAX_FIXED !=4 , +BUILD_BUG_ON_MSG (KVM_PMC_MAX_FIXED !=3 ,"Please update the fixed PMCs in msrs_to_saved_all[]" );perf_get_x86_pmu_capability (&x86_pmu);
PATCH 3/3 perf/x86/intel: Increase max number of the fixed counters
In reply to [email protected]From: Kan Liang <[email protected]>
The new PEBS format 5 implies that the number of the fixed counters can be up to 16. The current INTEL_PMC_MAX_FIXED is still 4. If the current kernel runs on a future platform which has more than 4 fixed counters, a warning will be triggered. The number of the fixed counters will be clipped to 4. Users have to upgrade the kernel to access the new fixed counters.
Add a new default constraint for PerfMon v5 and up, which can support up to 16 fixed counters. The pseudo-encoding is applied for the fixed counters 4 and later. The user can have generic support for the new fixed counters on the future platfroms without updating the kernel.
Increase the INTEL_PMC_MAX_FIXED to 16.
--- arch/x86/events/intel/core.c | 40 ++++++++++++++++++++++++++++++++++++++- arch/x86/include/asm/perf_event.h | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-)
arch/x86/events/intel/core.c +39 -1
@@ -181,6 +181,27 @@ static struct event_constraint intel_gen_event_constraints[] __read_mostly =EVENT_CONSTRAINT_END }; +static struct event_constraint intel_v5_gen_event_constraints[]__read_mostly = +{ +FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ),/* INST_RETIRED.ANY */ +FIXED_EVENT_CONSTRAINT (0x003c ,1 ),/* CPU_CLK_UNHALTED.CORE */ +FIXED_EVENT_CONSTRAINT (0x0300 ,2 ),/* CPU_CLK_UNHALTED.REF */ +FIXED_EVENT_CONSTRAINT (0x0400 ,3 ),/* SLOTS */ +FIXED_EVENT_CONSTRAINT (0x0500 ,4 ), +FIXED_EVENT_CONSTRAINT (0x0600 ,5 ), +FIXED_EVENT_CONSTRAINT (0x0700 ,6 ), +FIXED_EVENT_CONSTRAINT (0x0800 ,7 ), +FIXED_EVENT_CONSTRAINT (0x0900 ,8 ), +FIXED_EVENT_CONSTRAINT (0x0a00 ,9 ), +FIXED_EVENT_CONSTRAINT (0x0b00 ,10 ), +FIXED_EVENT_CONSTRAINT (0x0c00 ,11 ), +FIXED_EVENT_CONSTRAINT (0x0d00 ,12 ), +FIXED_EVENT_CONSTRAINT (0x0e00 ,13 ), +FIXED_EVENT_CONSTRAINT (0x0f00 ,14 ), +FIXED_EVENT_CONSTRAINT (0x1000 ,15 ), +EVENT_CONSTRAINT_END +}; +static struct event_constraint intel_slm_event_constraints[]__read_mostly = {FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ),/* INST_RETIRED.ANY */
@@ -6296,7 +6317,9 @@ __init int intel_pmu_init(void)pr_cont ("generic architected perfmon v1, " ); name ="generic_arch_v1" ;break ; -default : +case 2 : +case 3 : +case 4 :/* * default constraints for v2 and up */
@@ -6304,6 +6327,21 @@ __init int intel_pmu_init(void)pr_cont ("generic architected perfmon, " ); name ="generic_arch_v2+" ;break ; +default : +/* +* The default constraints for v5 and up can support up to +* 16 fixed counters. For the fixed counters 4 and later, +* the pseudo-encoding is applied. +* The constraints may be cut according to the CPUID enumeration +* by inserting the EVENT_CONSTRAINT_END. +*/ +if (x86_pmu.num_counters_fixed >INTEL_PMC_MAX_FIXED ) + x86_pmu.num_counters_fixed =INTEL_PMC_MAX_FIXED ; + intel_v5_gen_event_constraints[x86_pmu.num_counters_fixed].weight =-1 ; + x86_pmu.event_constraints = intel_v5_gen_event_constraints; +pr_cont ("generic architected perfmon, " ); + name ="generic_arch_v5+" ; +break ; } }
arch/x86/include/asm/perf_event.h +1 -1
@@ -7,7 +7,7 @@*/ #define INTEL_PMC_MAX_GENERIC 32 -#define INTEL_PMC_MAX_FIXED 4 +#define INTEL_PMC_MAX_FIXED 16#define INTEL_PMC_IDX_FIXED 32#define X86_PMC_IDX_MAX 64
Signature · 1 line
2.7.4
[tip: perf/core] perf/x86/intel: Increase max number of the fixed counters
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: ee28855a54493ce83bc2a3fbe30210be61b57bc7 Gitweb: https://git.kernel.org/tip/ee28855a54493ce83bc2a3fbe30210be61b57bc7 Author: Kan Liang <[email protected]> AuthorDate: Tue, 01 Feb 2022 13:23:23 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 02 Feb 2022 13:11:44 +01:00
perf/x86/intel: Increase max number of the fixed counters
The new PEBS format 5 implies that the number of the fixed counters can be up to 16. The current INTEL_PMC_MAX_FIXED is still 4. If the current kernel runs on a future platform which has more than 4 fixed counters, a warning will be triggered. The number of the fixed counters will be clipped to 4. Users have to upgrade the kernel to access the new fixed counters.
Add a new default constraint for PerfMon v5 and up, which can support up to 16 fixed counters. The pseudo-encoding is applied for the fixed counters 4 and later. The user can have generic support for the new fixed counters on the future platfroms without updating the kernel.
Increase the INTEL_PMC_MAX_FIXED to 16.
--- arch/x86/events/intel/core.c | 40 +++++++++++++++++++++++++++++- arch/x86/include/asm/perf_event.h | 2 +- 2 files changed, 40 insertions(+), 2 deletions(-)
arch/x86/events/intel/core.c +39 -1
@@ -181,6 +181,27 @@ static struct event_constraint intel_gen_event_constraints[] __read_mostly =EVENT_CONSTRAINT_END }; +static struct event_constraint intel_v5_gen_event_constraints[]__read_mostly = +{ +FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ),/* INST_RETIRED.ANY */ +FIXED_EVENT_CONSTRAINT (0x003c ,1 ),/* CPU_CLK_UNHALTED.CORE */ +FIXED_EVENT_CONSTRAINT (0x0300 ,2 ),/* CPU_CLK_UNHALTED.REF */ +FIXED_EVENT_CONSTRAINT (0x0400 ,3 ),/* SLOTS */ +FIXED_EVENT_CONSTRAINT (0x0500 ,4 ), +FIXED_EVENT_CONSTRAINT (0x0600 ,5 ), +FIXED_EVENT_CONSTRAINT (0x0700 ,6 ), +FIXED_EVENT_CONSTRAINT (0x0800 ,7 ), +FIXED_EVENT_CONSTRAINT (0x0900 ,8 ), +FIXED_EVENT_CONSTRAINT (0x0a00 ,9 ), +FIXED_EVENT_CONSTRAINT (0x0b00 ,10 ), +FIXED_EVENT_CONSTRAINT (0x0c00 ,11 ), +FIXED_EVENT_CONSTRAINT (0x0d00 ,12 ), +FIXED_EVENT_CONSTRAINT (0x0e00 ,13 ), +FIXED_EVENT_CONSTRAINT (0x0f00 ,14 ), +FIXED_EVENT_CONSTRAINT (0x1000 ,15 ), +EVENT_CONSTRAINT_END +}; +static struct event_constraint intel_slm_event_constraints[]__read_mostly = {FIXED_EVENT_CONSTRAINT (0x00c0 ,0 ),/* INST_RETIRED.ANY */
@@ -6295,7 +6316,9 @@ __init int intel_pmu_init(void)pr_cont ("generic architected perfmon v1, " ); name ="generic_arch_v1" ;break ; -default : +case 2 : +case 3 : +case 4 :/* * default constraints for v2 and up */
@@ -6303,6 +6326,21 @@ __init int intel_pmu_init(void)pr_cont ("generic architected perfmon, " ); name ="generic_arch_v2+" ;break ; +default : +/* +* The default constraints for v5 and up can support up to +* 16 fixed counters. For the fixed counters 4 and later, +* the pseudo-encoding is applied. +* The constraints may be cut according to the CPUID enumeration +* by inserting the EVENT_CONSTRAINT_END. +*/ +if (x86_pmu.num_counters_fixed >INTEL_PMC_MAX_FIXED ) + x86_pmu.num_counters_fixed =INTEL_PMC_MAX_FIXED ; + intel_v5_gen_event_constraints[x86_pmu.num_counters_fixed].weight =-1 ; + x86_pmu.event_constraints = intel_v5_gen_event_constraints; +pr_cont ("generic architected perfmon, " ); + name ="generic_arch_v5+" ; +break ; } }
arch/x86/include/asm/perf_event.h +1 -1
@@ -7,7 +7,7 @@*/ #define INTEL_PMC_MAX_GENERIC 32 -#define INTEL_PMC_MAX_FIXED 4 +#define INTEL_PMC_MAX_FIXED 16#define INTEL_PMC_IDX_FIXED 32#define X86_PMC_IDX_MAX 64
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 2145e77fecfb3965b1dc299bac203b167238bd0b Gitweb: https://git.kernel.org/tip/2145e77fecfb3965b1dc299bac203b167238bd0b Author: Kan Liang <[email protected]> AuthorDate: Tue, 01 Feb 2022 13:23:21 -08:00 Committer: Peter Zijlstra <[email protected]> CommitterDate: Wed, 02 Feb 2022 13:11:43 +01:00
perf/x86/intel: Enable PEBS format 5
The new PEBS Record Format 5 is similar to the PEBS Record Format 4. The only difference is the layout of the Counter Reset fields of the PEBS Config Buffer in the DS area. For the PEBS format 4, the Counter Reset fields allocation is for 8 general-purpose counters followed by 4 fixed-function counters. For the PEBS format 5, the Counter Reset fields allocation is for 32 general-purpose counters followed by 16 fixed-function counters.
Extend the MAX_PEBS_EVENTS to 32. Add MAX_PEBS_EVENTS_FMT4 for the previous platform. Except for the DS auto-reload code, other places already assume 32 counters. Only check the PEBS_FMT in the DS auto-reload code.
Extend the MAX_FIXED_PEBS_EVENTS to 16, which only impacts the size of struct debug_store and some local temporary variables. The size of struct debug_store increases 288B, which is small and should be acceptable.
--- arch/x86/events/intel/ds.c | 14 +++++++++++--- arch/x86/include/asm/intel_ds.h | 5 +++-- 2 files changed, 14 insertions(+), 5 deletions(-)
arch/x86/events/intel/ds.c +11 -3
@@ -1203,7 +1203,10 @@ static void intel_pmu_pebs_via_pt_enable(struct perf_event *event)if (hwc->idx >=INTEL_PMC_IDX_FIXED ) { base =MSR_RELOAD_FIXED_CTR0 ; idx = hwc->idx -INTEL_PMC_IDX_FIXED ; - value = ds->pebs_event_reset[MAX_PEBS_EVENTS + idx]; +if (x86_pmu.intel_cap.pebs_format <5 ) + value = ds->pebs_event_reset[MAX_PEBS_EVENTS_FMT4 + idx]; +else + value = ds->pebs_event_reset[MAX_PEBS_EVENTS + idx]; }wrmsrl (base + idx, value); }
@@ -1232,8 +1235,12 @@ void intel_pmu_pebs_enable(struct perf_event *event) } } -if (idx >=INTEL_PMC_IDX_FIXED ) - idx =MAX_PEBS_EVENTS + (idx -INTEL_PMC_IDX_FIXED ); +if (idx >=INTEL_PMC_IDX_FIXED ) { +if (x86_pmu.intel_cap.pebs_format <5 ) + idx =MAX_PEBS_EVENTS_FMT4 + (idx -INTEL_PMC_IDX_FIXED ); +else + idx =MAX_PEBS_EVENTS + (idx -INTEL_PMC_IDX_FIXED ); + }/* * Use auto-reload if possible to save a MSR write in the PMI.
@@ -2204,6 +2211,7 @@ void __init intel_ds_init(void)break ;case 4 : +case 5 : x86_pmu.drain_pebs = intel_pmu_drain_pebs_icl; x86_pmu.pebs_record_size =sizeof (struct pebs_basic );if (x86_pmu.intel_cap.pebs_baseline) {
arch/x86/include/asm/intel_ds.h +3 -2
@@ -7,8 +7,9 @@#define PEBS_BUFFER_SIZE (PAGE_SIZE << 4)/* The maximal number of PEBS events: */ -#define MAX_PEBS_EVENTS 8 -#define MAX_FIXED_PEBS_EVENTS 4 +#define MAX_PEBS_EVENTS_FMT4 8 +#define MAX_PEBS_EVENTS 32 +#define MAX_FIXED_PEBS_EVENTS 16/* * A debug store configuration.