arch-PEBS enabling for Intel platforms
Subsystems (2)
v6 cover arch-PEBS enabling for Intel platforms
Changes:
v5 -> v6:
* Rebase code to last tip perf/core tree + "x86 perf bug fixes and optimization" patchset
v4 -> v5:
* Rebase code to 6.16-rc3
* Allocate/free arch-PEBS buffer in callbacks *prepare_cpu/*dead_cpu
(patch 07/10, Peter)
* Code and comments refine (patch 09/10, Peter)
Please notice this patch set is based on tip perf/core tree (448f97fba901)
+ the patch series "x86 perf bug fixes and optimization"[1].
This patchset introduces architectural PEBS support for Intel platforms like Clearwater Forest (CWF) and Panther Lake (PTL). The detailed information about arch-PEBS can be found in chapter 11 "architectural PEBS" of "Intel Architecture Instruction Set Extensions and Future Features".
This patch set doesn't include the SSP and SIMD regs (OPMASK/YMM/ZMM) sampling support for arch-PEBS to avoid the dependency for the basic SIMD regs sampling support patch series[2]. Once the basic SIMD regs sampling is supported, the arch-PEBS based SSP and SIMD regs (OPMASK/YMM/ZMM) sampling would be supported in a later patch set.
Tests:
Run below tests on Clearwater Forest and Pantherlake, no issue is found.
1. Basic perf counting case.
perf stat -e '{branches,branches,branches,branches,branches,branches,branches,branches,cycles,instructions,ref-cycles}' sleep 1
2. Basic PMI based perf sampling case.
perf record -e '{branches,branches,branches,branches,branches,branches,branches,branches,cycles,instructions,ref-cycles}' sleep 1
3. Basic PEBS based perf sampling case.
perf record -e '{branches,branches,branches,branches,branches,branches,branches,branches,cycles,instructions,ref-cycles}:p' sleep 1
4. PEBS sampling case with basic, GPRs, vector-registers and LBR groups perf record -e branches:p -Iax,bx,ip,xmm0 -b -c 10000 sleep 1
5. User space PEBS sampling case with basic, GPRs and LBR groups
perf record -e branches:p --user-regs=ax,bx,ip -b -c 10000 sleep 1
6 PEBS sampling case with auxiliary (memory info) group
perf mem record sleep 1
7. PEBS sampling case with counter group
perf record -e '{branches:p,branches,cycles}:S' -c 10000 sleep 1
8. Perf stat and record test
perf test 96; perf test 125
History:
v4: https://lore.kernel.org/all/[email protected]/
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/
Ref:
[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/all/[email protected]/
Dapeng Mi (10):
perf/x86/intel: Replace x86_pmu.drain_pebs calling with static call perf/x86/intel: Correct large PEBS flag check perf/x86/intel: Initialize architectural PEBS perf/x86/intel/ds: Factor out PEBS record processing code to functions perf/x86/intel/ds: Factor out PEBS group processing code to functions perf/x86/intel: Process arch-PEBS records or record fragments perf/x86/intel: Allocate arch-PEBS buffer and initialize PEBS_BASE MSR perf/x86/intel: Update dyn_constranit base on PEBS event precise level perf/x86/intel: Setup PEBS data configuration and enable legacy groups perf/x86/intel: Add counter group support for arch-PEBS
arch/x86/events/core.c | 21 +- arch/x86/events/intel/core.c | 268 ++++++++++++- arch/x86/events/intel/ds.c | 615 ++++++++++++++++++++++++------ arch/x86/events/perf_event.h | 40 +- arch/x86/include/asm/intel_ds.h | 10 +- arch/x86/include/asm/msr-index.h | 20 + arch/x86/include/asm/perf_event.h | 116 +++++- 7 files changed, 940 insertions(+), 150 deletions(-)
Signature · 1 line
2.34.1
PATCH v6 1/10 perf/x86/intel: Replace x86_pmu.drain_pebs calling with static call
Use x86_pmu_drain_pebs static call to replace calling x86_pmu.drain_pebs function pointer.
--- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/intel/core.c +1 -1
@@ -3269,7 +3269,7 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status)* The PEBS buffer has to be drained before handling the A-PMI */ if (is_pebs_counter_event_group (event)) - x86_pmu.drain_pebs (regs, &data); +static_call (x86_pmu_drain_pebs)(regs, &data); last_period = event->hw.last_period;
Signature · 1 line
2.34.1
PATCH v6 2/10 perf/x86/intel: Correct large PEBS flag check
In reply to Dapeng Micurrent large PEBS flag check only checks if sample_regs_user contains unsupported GPRs but doesn't check if sample_regs_intr contains unsupported GPRs.
Of course, currently PEBS HW supports to sample all perf supported GPRs, the missed check doesn't cause real issue. But it won't be true any more after the subsequent patches support to sample SSP register. SSP sampling is not supported by adaptive PEBS HW and it would be supported until arch-PEBS HW. So correct this issue.
--- arch/x86/events/intel/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +3 -1
@@ -4029,7 +4029,9 @@ static unsigned long intel_pmu_large_pebs_flags(struct perf_event *event)if (!event->attr.exclude_kernel) flags &= ~PERF_SAMPLE_REGS_USER ;if (event->attr.sample_regs_user & ~PEBS_GP_REGS ) - flags &= ~(PERF_SAMPLE_REGS_USER |PERF_SAMPLE_REGS_INTR ); + flags &= ~PERF_SAMPLE_REGS_USER ; +if (event->attr.sample_regs_intr & ~PEBS_GP_REGS ) + flags &= ~PERF_SAMPLE_REGS_INTR ;return flags; }
Signature · 1 line
2.34.1
PATCH v6 3/10 perf/x86/intel: Initialize architectural PEBS
In reply to Dapeng Miarch-PEBS leverages CPUID.23H.4/5 sub-leaves enumerate arch-PEBS supported capabilities and counters bitmap. This patch parses these 2 sub-leaves and initializes arch-PEBS capabilities and corresponding structures.
Since IA32_PEBS_ENABLE and MSR_PEBS_DATA_CFG MSRs are no longer existed for arch-PEBS, arch-PEBS doesn't need to manipulate these MSRs. Thus add a simple pair of __intel_pmu_pebs_enable/disable() callbacks for arch-PEBS.
--- arch/x86/events/core.c | 21 +++++++++--- arch/x86/events/intel/core.c | 55 +++++++++++++++++++++++-------- arch/x86/events/intel/ds.c | 52 ++++++++++++++++++++++++----- arch/x86/events/perf_event.h | 25 ++++++++++++-- arch/x86/include/asm/perf_event.h | 7 +++- 5 files changed, 129 insertions(+), 31 deletions(-)
arch/x86/events/core.c +16 -5
@@ -554,14 +554,22 @@ static inline int precise_br_compat(struct perf_event *event)return m == b; } -int x86_pmu_max_precise (void ) +int x86_pmu_max_precise (struct pmu *pmu) {int precise =0 ; -/* Support for constant skid */ if (x86_pmu.pebs_active && !x86_pmu.pebs_broken) { - precise++; +/* arch PEBS */ +if (x86_pmu.arch_pebs) { + precise =2 ; +if (hybrid (pmu, arch_pebs_cap).pdists) + precise++; + +return precise; + } +/* legacy PEBS - support for constant skid */ + precise++;/* Support for IP fixup */ if (x86_pmu.lbr_nr || x86_pmu.intel_cap.pebs_format >=2 ) precise++;
@@ -569,13 +577,14 @@ int x86_pmu_max_precise(void)if (x86_pmu.pebs_prec_dist) precise++; } +return precise; }int x86_pmu_hw_config (struct perf_event *event) {if (event->attr.precise_ip) { -int precise =x86_pmu_max_precise (); +int precise =x86_pmu_max_precise (event->pmu);if (event->attr.precise_ip > precise)return -EOPNOTSUPP ;
@@ -2629,7 +2638,9 @@ static ssize_t max_precise_show(struct device *cdev,struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%d\n", x86_pmu_max_precise()); + struct pmu *pmu = dev_get_drvdata(cdev); + +return snprintf (buf,PAGE_SIZE ,"%d\n" ,x86_pmu_max_precise (pmu)); }static DEVICE_ATTR_RO (max_precise);
arch/x86/events/intel/core.c +41 -14
88 lines not on this page · raw message
arch/x86/events/intel/ds.c +44 -8
98 lines not on this page · raw message
arch/x86/events/perf_event.h +22 -3
@@ -708,6 +708,12 @@ enum hybrid_pmu_type { hybrid_big_small_tiny = hybrid_big | hybrid_small_tiny, }; +struct arch_pebs_cap { +u64 caps; +u64 counters; +u64 pdists; +}; +struct x86_hybrid_pmu {struct pmu pmu;const char *name;
@@ -752,6 +758,8 @@ struct x86_hybrid_pmu { mid_ack :1 , enabled_ack :1; +struct arch_pebs_cap arch_pebs_cap; +u64 pebs_data_source[PERF_PEBS_DATA_SOURCE_MAX ]; };
@@ -906,7 +914,7 @@ struct x86_pmu {union perf_capabilities intel_cap;/* -* Intel DebugStore bits +* Intel DebugStore and PEBS bits */ unsigned int bts :1, bts_active :1,
@@ -917,7 +925,8 @@ struct x86_pmu { pebs_no_tlb :1, pebs_no_isolation :1, pebs_block :1, - pebs_ept :1; + pebs_ept :1, + arch_pebs :1;int pebs_record_size;int pebs_buffer_size;u64 pebs_events_mask;
@@ -929,6 +938,11 @@ struct x86_pmu {u64 rtm_abort_event;u64 pebs_capable; +/* +* Intel Architectural PEBS +*/ +struct arch_pebs_cap arch_pebs_cap; +/* * Intel LBR */
@@ -1217,7 +1231,7 @@ int x86_reserve_hardware(void);void x86_release_hardware (void ); -int x86_pmu_max_precise (void ); +int x86_pmu_max_precise (struct pmu *pmu);void hw_perf_lbr_event_destroy (struct perf_event *event);
@@ -1792,6 +1806,11 @@ static inline int intel_pmu_max_num_pebs(struct pmu *pmu) return fls((u32)hybrid(pmu, pebs_events_mask)); } +static inline bool intel_pmu_has_pebs (void ) +{ +return x86_pmu.ds_pebs || x86_pmu.arch_pebs; +} +#else /* CONFIG_CPU_SUP_INTEL */ static inline void reserve_ds_buffers (void )
arch/x86/include/asm/perf_event.h +6 -1
@@ -200,6 +200,8 @@ union cpuid10_edx {#define ARCH_PERFMON_EXT_LEAF 0x00000023#define ARCH_PERFMON_NUM_COUNTER_LEAF 0x1#define ARCH_PERFMON_ACR_LEAF 0x2 +#define ARCH_PERFMON_PEBS_CAP_LEAF 0x4 +#define ARCH_PERFMON_PEBS_COUNTER_LEAF 0x5 union cpuid35_eax { struct {
@@ -210,7 +212,10 @@ union cpuid35_eax { unsigned int acr_subleaf:1;/* Events Sub-Leaf */ unsigned int events_subleaf:1; - unsigned int reserved:28; +/* arch-PEBS Sub-Leaves */ + unsigned int pebs_caps_subleaf:1; + unsigned int pebs_cnts_subleaf:1; + unsigned int reserved:26; } split;unsigned int full; };
Signature · 1 line
2.34.1
PATCH v6 4/10 perf/x86/intel/ds: Factor out PEBS record processing code to functions
In reply to Dapeng MiBeside some PEBS record layout difference, arch-PEBS can share most of PEBS record processing code with adaptive PEBS. Thus, factor out these common processing code to independent inline functions, so they can be reused by subsequent arch-PEBS handler.
--- arch/x86/events/intel/ds.c | 100 ++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 35 deletions(-)
arch/x86/events/intel/ds.c +65 -35
@@ -2614,6 +2614,64 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs, struct perf_sample_d } } +static inline void __intel_pmu_handle_pebs_record (struct pt_regs *iregs, +struct pt_regs *regs, +struct perf_sample_data *data, +void *at,u64 pebs_status, +short *counts,void **last, +setup_fn setup_sample) +{ +struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +struct perf_event *event; +int bit; + +for_each_set_bit (bit, (unsigned long *)&pebs_status,X86_PMC_IDX_MAX ) { + event = cpuc->events[bit]; + +if (WARN_ON_ONCE (!event) || +WARN_ON_ONCE (!event->attr.precise_ip)) +continue ; + +if (counts[bit]++) +__intel_pmu_pebs_event (event, iregs, regs, data, + last[bit], setup_sample); + + last[bit] = at; + } +} + +static inline void +__intel_pmu_handle_last_pebs_record (struct pt_regs *iregs,struct pt_regs *regs, +struct perf_sample_data *data,u64 mask, +short *counts,void **last, +setup_fn setup_sample) +{ +struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +struct perf_event *event; +int bit; + +for_each_set_bit (bit, (unsigned long *)&mask,X86_PMC_IDX_MAX ) { +if (!counts[bit]) +continue ; + + event = cpuc->events[bit]; +/* +* perf_event_overflow() called by below __intel_pmu_pebs_last_event() +* could trigger interrupt throttle and clear all event pointers of the +* group in cpuc->events[] to NULL. So need to re-check if cpuc->events[*] +* is NULL, if so it indicates the event has been throttled (stopped) and +* the corresponding last PEBS records have been processed in stopping +* event, don't need to process it again. +*/ +if (!event) +continue ; + +__intel_pmu_pebs_last_event (event, iregs, regs, data, last[bit], + counts[bit], setup_sample); + } + +} +static void intel_pmu_drain_pebs_icl (struct pt_regs *iregs,struct perf_sample_data *data) {short counts[INTEL_PMC_IDX_FIXED +MAX_FIXED_PEBS_EVENTS ] = {};
@@ -2623,9 +2681,7 @@ static void intel_pmu_drain_pebs_icl(struct pt_regs *iregs, struct perf_sample_dstruct x86_perf_regs perf_regs;struct pt_regs *regs = &perf_regs.regs;struct pebs_basic *basic; -struct perf_event *event;void *base, *at, *top; -int bit;u64 mask;if (!x86_pmu.pebs_active)
@@ -2638,6 +2694,7 @@ static void intel_pmu_drain_pebs_icl(struct pt_regs *iregs, struct perf_sample_d mask =hybrid (cpuc->pmu, pebs_events_mask) | (hybrid (cpuc->pmu, fixed_cntr_mask64) <<INTEL_PMC_IDX_FIXED ); + mask &= cpuc->pebs_enabled;if (unlikely (base >= top)) {intel_pmu_pebs_event_update_no_drain (cpuc, mask);
@@ -2655,41 +2712,14 @@ static void intel_pmu_drain_pebs_icl(struct pt_regs *iregs, struct perf_sample_dif (basic->format_size != cpuc->pebs_record_size)continue ; - pebs_status = basic->applicable_counters & cpuc->pebs_enabled & mask; -for_each_set_bit (bit, (unsigned long *)&pebs_status,X86_PMC_IDX_MAX ) { - event = cpuc->events[bit]; - -if (WARN_ON_ONCE (!event) || -WARN_ON_ONCE (!event->attr.precise_ip)) -continue ; - -if (counts[bit]++) { -__intel_pmu_pebs_event (event, iregs, regs, data, last[bit], - setup_pebs_adaptive_sample_data); - } - last[bit] = at; - } + pebs_status = mask & basic->applicable_counters; +__intel_pmu_handle_pebs_record (iregs, regs, data, at, + pebs_status, counts, last, + setup_pebs_adaptive_sample_data); } -for_each_set_bit (bit, (unsigned long *)&mask,X86_PMC_IDX_MAX ) { -if (!counts[bit]) -continue ; - - event = cpuc->events[bit]; -/* -* perf_event_overflow() called by below __intel_pmu_pebs_last_event() -* could trigger interrupt throttle and clear all event pointers of the -* group in cpuc->events[] to NULL. So need to re-check if cpuc->events[*] -* is NULL, if so it indicates the event has been throttled (stopped) and -* the corresponding last PEBS records have been processed in stopping -* event, don't need to process it again. -*/ -if (!event) -continue ; - -__intel_pmu_pebs_last_event (event, iregs, regs, data, last[bit], - counts[bit], setup_pebs_adaptive_sample_data); - } +__intel_pmu_handle_last_pebs_record (iregs, regs, data, mask, counts, last, + setup_pebs_adaptive_sample_data); }static void __init intel_arch_pebs_init (void )
Signature · 1 line
2.34.1
PATCH v6 5/10 perf/x86/intel/ds: Factor out PEBS group processing code to functions
In reply to Dapeng MiAdaptive PEBS and arch-PEBS share lots of same code to process these PEBS groups, like basic, GPR and meminfo groups. Extract these shared code to generic functions to avoid duplicated code.
--- arch/x86/events/intel/ds.c | 170 +++++++++++++++++++++++-------------- 1 file changed, 104 insertions(+), 66 deletions(-)
arch/x86/events/intel/ds.c +104 -66
@@ -2072,6 +2072,90 @@ static inline void __setup_pebs_counter_group(struct cpu_hw_events *cpuc,#define PEBS_LATENCY_MASK 0xffff +static inline void __setup_perf_sample_data (struct perf_event *event, +struct pt_regs *iregs, +struct perf_sample_data *data) +{ +perf_sample_data_init (data,0 , event->hw.last_period); + +/* +* We must however always use iregs for the unwinder to stay sane; the +* record BP,SP,IP can point into thin air when the record is from a +* previous PMI context or an (I)RET happened between the record and +* PMI. +*/ +perf_sample_save_callchain (data, event, iregs); +} + +static inline void __setup_pebs_basic_group (struct perf_event *event, +struct pt_regs *regs, +struct perf_sample_data *data, +u64 sample_type,u64 ip, +u64 tsc,u16 retire) +{ +/* The ip in basic is EventingIP */ +set_linear_ip (regs, ip); + regs->flags =PERF_EFLAGS_EXACT ; +setup_pebs_time (event, data, tsc); + +if (sample_type &PERF_SAMPLE_WEIGHT_STRUCT ) + data->weight.var3_w = retire; +} + +static inline void __setup_pebs_gpr_group (struct perf_event *event, +struct pt_regs *regs, +struct pebs_gprs *gprs, +u64 sample_type) +{ +if (event->attr.precise_ip <2 ) { +set_linear_ip (regs, gprs->ip); + regs->flags &= ~PERF_EFLAGS_EXACT ; + } + +if (sample_type & (PERF_SAMPLE_REGS_INTR |PERF_SAMPLE_REGS_USER )) +adaptive_pebs_save_regs (regs, gprs); +} + +static inline void __setup_pebs_meminfo_group (struct perf_event *event, +struct perf_sample_data *data, +u64 sample_type,u64 latency, +u16 instr_latency,u64 address, +u64 aux,u64 tsx_tuning,u64 ax) +{ +if (sample_type &PERF_SAMPLE_WEIGHT_TYPE ) { +u64 tsx_latency =intel_get_tsx_weight (tsx_tuning); + + data->weight.var2_w = instr_latency; + +/* +* Although meminfo::latency is defined as a u64, +* only the lower 32 bits include the valid data +* in practice on Ice Lake and earlier platforms. +*/ +if (sample_type &PERF_SAMPLE_WEIGHT ) + data->weight.full = latency ?: tsx_latency; +else + data->weight.var1_dw = (u32 )latency ?: tsx_latency; + + data->sample_flags |=PERF_SAMPLE_WEIGHT_TYPE ; + } + +if (sample_type &PERF_SAMPLE_DATA_SRC ) { + data->data_src.val =get_data_src (event, aux); + data->sample_flags |=PERF_SAMPLE_DATA_SRC ; + } + +if (sample_type &PERF_SAMPLE_ADDR_TYPE ) { + data->addr = address; + data->sample_flags |=PERF_SAMPLE_ADDR ; + } + +if (sample_type &PERF_SAMPLE_TRANSACTION ) { + data->txn =intel_get_tsx_transaction (tsx_tuning, ax); + data->sample_flags |=PERF_SAMPLE_TRANSACTION ; + } +} +/* * With adaptive PEBS the layout depends on what fields are configured. */
@@ -2081,12 +2165,14 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event, struct pt_regs *regs) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +u64 sample_type = event->attr.sample_type;struct pebs_basic *basic = __pebs;void *next_record = basic +1 ; -u64 sample_type, format_group;struct pebs_meminfo *meminfo =NULL ;struct pebs_gprs *gprs =NULL ;struct x86_perf_regs *perf_regs; +u64 format_group; +u16 retire;if (basic ==NULL )return ;
@@ -2094,31 +2180,17 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event, perf_regs = container_of(regs, struct x86_perf_regs, regs); perf_regs->xmm_regs =NULL ; - sample_type = event->attr.sample_type; format_group = basic->format_group; -perf_sample_data_init (data,0 , event->hw.last_period); -setup_pebs_time (event, data, basic->tsc); - -/* -* We must however always use iregs for the unwinder to stay sane; the -* record BP,SP,IP can point into thin air when the record is from a -* previous PMI context or an (I)RET happened between the record and -* PMI. -*/ -perf_sample_save_callchain (data, event, iregs); +__setup_perf_sample_data (event, iregs, data); *regs = *iregs; -/* The ip in basic is EventingIP */ -set_linear_ip (regs, basic->ip); - regs->flags =PERF_EFLAGS_EXACT ; -if (sample_type &PERF_SAMPLE_WEIGHT_STRUCT ) { -if (x86_pmu.flags &PMU_FL_RETIRE_LATENCY ) - data->weight.var3_w = basic->retire_latency; -else - data->weight.var3_w =0 ; - } +/* basic group */ + retire = x86_pmu.flags &PMU_FL_RETIRE_LATENCY ? + basic->retire_latency :0 ; +__setup_pebs_basic_group (event, regs, data, sample_type, + basic->ip, basic->tsc, retire);/* * The record for MEMINFO is in front of GP
@@ -2134,54 +2206,20 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event, gprs = next_record; next_record = gprs +1 ; -if (event->attr.precise_ip <2 ) { -set_linear_ip (regs, gprs->ip); - regs->flags &= ~PERF_EFLAGS_EXACT ; - } - -if (sample_type & (PERF_SAMPLE_REGS_INTR |PERF_SAMPLE_REGS_USER )) -adaptive_pebs_save_regs (regs, gprs); +__setup_pebs_gpr_group (event, regs, gprs, sample_type); }if (format_group &PEBS_DATACFG_MEMINFO ) { -if (sample_type &PERF_SAMPLE_WEIGHT_TYPE ) { -u64 latency = x86_pmu.flags &PMU_FL_INSTR_LATENCY ? - meminfo->cache_latency : meminfo->mem_latency; - -if (x86_pmu.flags &PMU_FL_INSTR_LATENCY ) - data->weight.var2_w = meminfo->instr_latency; - -/* -* Although meminfo::latency is defined as a u64, -* only the lower 32 bits include the valid data -* in practice on Ice Lake and earlier platforms. -*/ -if (sample_type &PERF_SAMPLE_WEIGHT ) { - data->weight.full = latency ?: -intel_get_tsx_weight (meminfo->tsx_tuning); - }else { - data->weight.var1_dw = (u32 )latency ?: -intel_get_tsx_weight (meminfo->tsx_tuning); - } - - data->sample_flags |=PERF_SAMPLE_WEIGHT_TYPE ; - } - -if (sample_type &PERF_SAMPLE_DATA_SRC ) { - data->data_src.val =get_data_src (event, meminfo->aux); - data->sample_flags |=PERF_SAMPLE_DATA_SRC ; - } - -if (sample_type &PERF_SAMPLE_ADDR_TYPE ) { - data->addr = meminfo->address; - data->sample_flags |=PERF_SAMPLE_ADDR ; - } - -if (sample_type &PERF_SAMPLE_TRANSACTION ) { - data->txn =intel_get_tsx_transaction (meminfo->tsx_tuning, - gprs ? gprs->ax :0 ); - data->sample_flags |=PERF_SAMPLE_TRANSACTION ; - } +u64 latency = x86_pmu.flags &PMU_FL_INSTR_LATENCY ? + meminfo->cache_latency : meminfo->mem_latency; +u64 instr_latency = x86_pmu.flags &PMU_FL_INSTR_LATENCY ? + meminfo->instr_latency :0 ; +u64 ax = gprs ? gprs->ax :0 ; + +__setup_pebs_meminfo_group (event, data, sample_type, latency, + instr_latency, meminfo->address, + meminfo->aux, meminfo->tsx_tuning, + ax); }if (format_group &PEBS_DATACFG_XMMS ) {
Signature · 1 line
2.34.1
PATCH v6 6/10 perf/x86/intel: Process arch-PEBS records or record fragments
In reply to Dapeng MiA significant difference with adaptive PEBS is that arch-PEBS record supports fragments which means an arch-PEBS record could be split into several independent fragments which have its own arch-PEBS header in each fragment.
This patch defines architectural PEBS record layout structures and add helpers to process arch-PEBS records or fragments. Only legacy PEBS groups like basic, GPR, XMM and LBR groups are supported in this patch, the new added YMM/ZMM/OPMASK vector registers capturing would be supported in the future.
--- arch/x86/events/intel/core.c | 13 +++ arch/x86/events/intel/ds.c | 180 ++++++++++++++++++++++++++++++ arch/x86/include/asm/msr-index.h | 6 + arch/x86/include/asm/perf_event.h | 96 ++++++++++++++++ 4 files changed, 295 insertions(+)
arch/x86/events/intel/core.c +13 -0
@@ -3215,6 +3215,19 @@ static int handle_pmi_common(struct pt_regs *regs, u64 status) status &= ~GLOBAL_STATUS_PERF_METRICS_OVF_BIT ; } +/* +* Arch PEBS sets bit 54 in the global status register +*/ +if (__test_and_clear_bit (GLOBAL_STATUS_ARCH_PEBS_THRESHOLD_BIT , + (unsigned long *)&status)) { + handled++; +static_call (x86_pmu_drain_pebs)(regs, &data); + +if (cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS ] && +is_pebs_counter_event_group (cpuc->events[INTEL_PMC_IDX_FIXED_SLOTS ])) + status &= ~GLOBAL_STATUS_PERF_METRICS_OVF_BIT ; + } +/* * Intel PT */
arch/x86/events/intel/ds.c +180 -0
198 lines not on this page · raw message
arch/x86/include/asm/msr-index.h +6 -0
@@ -324,6 +324,12 @@ PERF_CAP_PEBS_FORMAT | PERF_CAP_PEBS_BASELINE | \ PERF_CAP_PEBS_TIMING_INFO) +/* Arch PEBS */ +#define MSR_IA32_PEBS_BASE 0x000003f4 +#define MSR_IA32_PEBS_INDEX 0x000003f5 +#define ARCH_PEBS_OFFSET_MASK 0x7fffff +#define ARCH_PEBS_INDEX_WR_SHIFT 4 +#define MSR_IA32_RTIT_CTL 0x00000570#define RTIT_CTL_TRACEEN BIT(0)#define RTIT_CTL_CYCLEACC BIT(1)
arch/x86/include/asm/perf_event.h +96 -0
108 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v6 7/10 perf/x86/intel: Allocate arch-PEBS buffer and initialize PEBS_BASE MSR
In reply to Dapeng MiArch-PEBS introduces a new MSR IA32_PEBS_BASE to store the arch-PEBS buffer physical address. This patch allocates arch-PEBS buffer and then initialize IA32_PEBS_BASE MSR with the buffer physical address.
--- arch/x86/events/intel/core.c | 11 ++++- arch/x86/events/intel/ds.c | 82 ++++++++++++++++++++++++++++----- arch/x86/events/perf_event.h | 11 ++++- arch/x86/include/asm/intel_ds.h | 3 +- 4 files changed, 92 insertions(+), 15 deletions(-)
arch/x86/events/intel/core.c +10 -1
@@ -5227,7 +5227,13 @@ int intel_cpuc_prepare(struct cpu_hw_events *cpuc, int cpu)static int intel_pmu_cpu_prepare (int cpu) { -return intel_cpuc_prepare (&per_cpu (cpu_hw_events, cpu), cpu); +int ret; + + ret =intel_cpuc_prepare (&per_cpu (cpu_hw_events, cpu), cpu); +if (ret) +return ret; + +return alloc_arch_pebs_buf_on_cpu (cpu); }static void flip_smm_bit (void *data)
@@ -5457,6 +5463,7 @@ static void intel_pmu_cpu_starting(int cpu)return ;init_debug_store_on_cpu (cpu); +init_arch_pebs_on_cpu (cpu);/* * Deal with CPUs that don't clear their LBRs on power-up, and that may * even boot with LBRs enabled.
@@ -5554,6 +5561,7 @@ static void free_excl_cntrs(struct cpu_hw_events *cpuc)static void intel_pmu_cpu_dying (int cpu) {fini_debug_store_on_cpu (cpu); +fini_arch_pebs_on_cpu (cpu); }void intel_cpuc_finish (struct cpu_hw_events *cpuc)
@@ -5574,6 +5582,7 @@ static void intel_pmu_cpu_dead(int cpu) {struct cpu_hw_events *cpuc = &per_cpu (cpu_hw_events, cpu); +release_arch_pebs_buf_on_cpu (cpu);intel_cpuc_finish (cpuc);if (is_hybrid () && cpuc->pmu)
arch/x86/events/intel/ds.c +70 -12
121 lines not on this page · raw message
arch/x86/events/perf_event.h +10 -1
@@ -283,8 +283,9 @@ struct cpu_hw_events {* Intel DebugStore bits */ struct debug_store *ds; -void *ds_pebs_vaddr;void *ds_bts_vaddr; +/* DS based PEBS or arch-PEBS buffer address */ +void *pebs_vaddr;u64 pebs_enabled;int n_pebs;int n_large_pebs;
@@ -1618,6 +1619,14 @@ extern void intel_cpuc_finish(struct cpu_hw_events *cpuc);int intel_pmu_init (void ); +int alloc_arch_pebs_buf_on_cpu (int cpu); + +void release_arch_pebs_buf_on_cpu (int cpu); + +void init_arch_pebs_on_cpu (int cpu); + +void fini_arch_pebs_on_cpu (int cpu); +void init_debug_store_on_cpu (int cpu);void fini_debug_store_on_cpu (int cpu);
arch/x86/include/asm/intel_ds.h +2 -1
@@ -4,7 +4,8 @@#include <linux/percpu-defs.h> #define BTS_BUFFER_SIZE (PAGE_SIZE << 4) -#define PEBS_BUFFER_SIZE (PAGE_SIZE << 4) +#define PEBS_BUFFER_SHIFT 4 +#define PEBS_BUFFER_SIZE (PAGE_SIZE << PEBS_BUFFER_SHIFT)/* The maximal number of PEBS events: */ #define MAX_PEBS_EVENTS_FMT4 8
Signature · 1 line
2.34.1
PATCH v6 8/10 perf/x86/intel: Update dyn_constranit base on PEBS event precise level
In reply to Dapeng Miarch-PEBS provides CPUIDs to enumerate which counters support PEBS sampling and precise distribution PEBS sampling. Thus PEBS constraints should be dynamically configured base on these counter and precise distribution bitmap instead of defining them statically.
Update event dyn_constraint base on PEBS event precise level.
--- arch/x86/events/intel/core.c | 11 +++++++++++ arch/x86/events/intel/ds.c | 1 + 2 files changed, 12 insertions(+)
arch/x86/events/intel/core.c +11 -0
@@ -4252,6 +4252,8 @@ static int intel_pmu_hw_config(struct perf_event *event) }if (event->attr.precise_ip) { +struct arch_pebs_cap pebs_cap =hybrid (event->pmu, arch_pebs_cap); +if ((event->attr.config &INTEL_ARCH_EVENT_MASK ) ==INTEL_FIXED_VLBR_EVENT )return -EINVAL ;
@@ -4265,6 +4267,15 @@ static int intel_pmu_hw_config(struct perf_event *event) }if (x86_pmu.pebs_aliases) x86_pmu.pebs_aliases (event); + +if (x86_pmu.arch_pebs) { +u64 cntr_mask =hybrid (event->pmu, intel_ctrl) & + ~GLOBAL_CTRL_EN_PERF_METRICS ; +u64 pebs_mask = event->attr.precise_ip >=3 ? + pebs_cap.pdists : pebs_cap.counters; +if (cntr_mask != pebs_mask) + event->hw.dyn_constraint &= pebs_mask; + } }if (needs_branch_stack (event)) {
arch/x86/events/intel/ds.c +1 -0
@@ -3008,6 +3008,7 @@ static void __init intel_arch_pebs_init(void) x86_pmu.pebs_buffer_size =PEBS_BUFFER_SIZE ; x86_pmu.drain_pebs = intel_pmu_drain_arch_pebs; x86_pmu.pebs_capable = ~0ULL ; + x86_pmu.flags |=PMU_FL_PEBS_ALL ; x86_pmu.pebs_enable = __intel_pmu_pebs_enable; x86_pmu.pebs_disable = __intel_pmu_pebs_disable;
Signature · 1 line
2.34.1
PATCH v6 9/10 perf/x86/intel: Setup PEBS data configuration and enable legacy groups
In reply to Dapeng MiDifferent with legacy PEBS, arch-PEBS provides per-counter PEBS data configuration by programing MSR IA32_PMC_GPx/FXx_CFG_C MSRs.
This patch obtains PEBS data configuration from event attribute and then writes the PEBS data configuration to MSR IA32_PMC_GPx/FXx_CFG_C and enable corresponding PEBS groups.
Please notice this patch only enables XMM SIMD regs sampling for arch-PEBS, the other SIMD regs (OPMASK/YMM/ZMM) sampling on arch-PEBS would be supported after PMI based SIMD regs (OPMASK/YMM/ZMM) sampling is supported.
--- arch/x86/events/intel/core.c | 136 ++++++++++++++++++++++++++++++- arch/x86/events/intel/ds.c | 17 ++++ arch/x86/events/perf_event.h | 4 + arch/x86/include/asm/intel_ds.h | 7 ++ arch/x86/include/asm/msr-index.h | 8 ++ 5 files changed, 171 insertions(+), 1 deletion(-)
arch/x86/events/intel/core.c +135 -1
@@ -2563,6 +2563,45 @@ static void intel_pmu_disable_fixed(struct perf_event *event) cpuc->fixed_ctrl_val &= ~mask; } +static inline void __intel_pmu_update_event_ext (int idx,u64 ext) +{ +struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +u32 msr; + +if (idx <INTEL_PMC_IDX_FIXED ) { + msr =MSR_IA32_PMC_V6_GP0_CFG_C + + x86_pmu.addr_offset (idx, false); + }else { + msr =MSR_IA32_PMC_V6_FX0_CFG_C + + x86_pmu.addr_offset (idx -INTEL_PMC_IDX_FIXED , false); + } + + cpuc->cfg_c_val[idx] = ext; +wrmsrq (msr, ext); +} + +static void intel_pmu_disable_event_ext (struct perf_event *event) +{ +if (!x86_pmu.arch_pebs) +return ; + +/* +* Only clear CFG_C MSR for PEBS counter group events, +* it avoids the HW counter's value to be added into +* other PEBS records incorrectly after PEBS counter +* group events are disabled. +* +* For other events, it's unnecessary to clear CFG_C MSRs +* since CFG_C doesn't take effect if counter is in +* disabled state. That helps to reduce the WRMSR overhead +* in context switches. +*/ +if (!is_pebs_counter_event_group (event)) +return ; + +__intel_pmu_update_event_ext (event->hw.idx,0 ); +} +static void intel_pmu_disable_event (struct perf_event *event) {struct hw_perf_event *hwc = &event->hw;
@@ -2571,9 +2610,12 @@ static void intel_pmu_disable_event(struct perf_event *event)switch (idx) { case 0 ... INTEL_PMC_IDX_FIXED - 1:intel_clear_masks (event, idx); +intel_pmu_disable_event_ext (event);x86_pmu_disable_event (event);break ; case INTEL_PMC_IDX_FIXED ... INTEL_PMC_IDX_FIXED_BTS - 1: +intel_pmu_disable_event_ext (event); + fallthrough; case INTEL_PMC_IDX_METRIC_BASE ... INTEL_PMC_IDX_METRIC_END:intel_pmu_disable_fixed (event);break ;
@@ -2940,6 +2982,66 @@ static void intel_pmu_enable_acr(struct perf_event *event)DEFINE_STATIC_CALL_NULL (intel_pmu_enable_acr_event, intel_pmu_enable_acr); +static void intel_pmu_enable_event_ext (struct perf_event *event) +{ +struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events); +struct hw_perf_event *hwc = &event->hw; +union arch_pebs_index old, new; +struct arch_pebs_cap cap; +u64 ext =0 ; + +if (!x86_pmu.arch_pebs) +return ; + + cap =hybrid (cpuc->pmu, arch_pebs_cap); + +if (event->attr.precise_ip) { +u64 pebs_data_cfg =intel_get_arch_pebs_data_config (event); + + ext |=ARCH_PEBS_EN ; +if (hwc->flags &PERF_X86_EVENT_AUTO_RELOAD ) + ext |= (-hwc->sample_period) &ARCH_PEBS_RELOAD ; + +if (pebs_data_cfg && cap.caps) { +if (pebs_data_cfg &PEBS_DATACFG_MEMINFO ) + ext |=ARCH_PEBS_AUX & cap.caps; + +if (pebs_data_cfg &PEBS_DATACFG_GP ) + ext |=ARCH_PEBS_GPR & cap.caps; + +if (pebs_data_cfg &PEBS_DATACFG_XMMS ) + ext |=ARCH_PEBS_VECR_XMM & cap.caps; + +if (pebs_data_cfg &PEBS_DATACFG_LBRS ) + ext |=ARCH_PEBS_LBR & cap.caps; + } + +if (cpuc->n_pebs == cpuc->n_large_pebs) + new.thresh =ARCH_PEBS_THRESH_MULTI ; +else + new.thresh =ARCH_PEBS_THRESH_SINGLE ; + +rdmsrq (MSR_IA32_PEBS_INDEX , old.whole); +if (new.thresh != old.thresh || !old.en) { +if (old.thresh ==ARCH_PEBS_THRESH_MULTI && old.wr >0 ) { +/* +* Large PEBS was enabled. +* Drain PEBS buffer before applying the single PEBS. +*/ +intel_pmu_drain_pebs_buffer (); + }else { + new.wr =0 ; + new.full =0 ; + new.en =1 ; +wrmsrq (MSR_IA32_PEBS_INDEX , new.whole); + } + } + } + +if (cpuc->cfg_c_val[hwc->idx] != ext) +__intel_pmu_update_event_ext (hwc->idx, ext); +} +static void intel_pmu_enable_event (struct perf_event *event) {u64 enable_mask =ARCH_PERFMON_EVENTSEL_ENABLE ;
@@ -2955,10 +3057,12 @@ static void intel_pmu_enable_event(struct perf_event *event) enable_mask |=ARCH_PERFMON_EVENTSEL_BR_CNTR ;intel_set_masks (event, idx);static_call_cond (intel_pmu_enable_acr_event)(event); +intel_pmu_enable_event_ext (event);__x86_pmu_enable_event (hwc, enable_mask);break ; case INTEL_PMC_IDX_FIXED ... INTEL_PMC_IDX_FIXED_BTS - 1:static_call_cond (intel_pmu_enable_acr_event)(event); +intel_pmu_enable_event_ext (event); fallthrough; case INTEL_PMC_IDX_METRIC_BASE ... INTEL_PMC_IDX_METRIC_END:intel_pmu_enable_fixed (event);
@@ -5301,6 +5405,30 @@ static inline bool intel_pmu_broken_perf_cap(void)return false; } +static inline void __intel_update_pmu_caps (struct pmu *pmu) +{ +struct pmu *dest_pmu = pmu ? pmu :x86_get_pmu (smp_processor_id ()); + +if (hybrid (pmu, arch_pebs_cap).caps &ARCH_PEBS_VECR_XMM ) + dest_pmu->capabilities |=PERF_PMU_CAP_EXTENDED_REGS ; +} + +static inline void __intel_update_large_pebs_flags (struct pmu *pmu) +{ +u64 caps =hybrid (pmu, arch_pebs_cap).caps; + + x86_pmu.large_pebs_flags |=PERF_SAMPLE_TIME ; +if (caps &ARCH_PEBS_LBR ) + x86_pmu.large_pebs_flags |=PERF_SAMPLE_BRANCH_STACK ; + +if (!(caps &ARCH_PEBS_AUX )) + x86_pmu.large_pebs_flags &= ~PERF_SAMPLE_DATA_SRC ; +if (!(caps &ARCH_PEBS_GPR )) { + x86_pmu.large_pebs_flags &= + ~(PERF_SAMPLE_REGS_INTR |PERF_SAMPLE_REGS_USER ); + } +} +static void update_pmu_cap (struct pmu *pmu) {unsigned int eax, ebx, ecx, edx;
@@ -5348,8 +5476,12 @@ static void update_pmu_cap(struct pmu *pmu)hybrid (pmu, arch_pebs_cap).counters = pebs_mask;hybrid (pmu, arch_pebs_cap).pdists = pdists_mask; -if (WARN_ON ((pebs_mask | pdists_mask) & ~cntrs_mask)) +if (WARN_ON ((pebs_mask | pdists_mask) & ~cntrs_mask)) { x86_pmu.arch_pebs =0 ; + }else { +__intel_update_pmu_caps (pmu); +__intel_update_large_pebs_flags (pmu); + } }else {WARN_ON (x86_pmu.arch_pebs ==1 ); x86_pmu.arch_pebs =0 ;
@@ -5513,6 +5645,8 @@ static void intel_pmu_cpu_starting(int cpu) } } +__intel_update_pmu_caps (cpuc->pmu); +if (!cpuc->shared_regs)return ;
arch/x86/events/intel/ds.c +17 -0
@@ -1528,6 +1528,18 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc, } } +u64 intel_get_arch_pebs_data_config (struct perf_event *event) +{ +u64 pebs_data_cfg =0 ; + +if (WARN_ON (event->hw.idx <0 || event->hw.idx >=X86_PMC_IDX_MAX )) +return 0 ; + + pebs_data_cfg |=pebs_update_adaptive_cfg (event); + +return pebs_data_cfg; +} +void intel_pmu_pebs_add (struct perf_event *event) {struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);
@@ -2994,6 +3006,11 @@ static void intel_pmu_drain_arch_pebs(struct pt_regs *iregs, index.wr =0 ; index.full =0 ; + index.en =1 ; +if (cpuc->n_pebs == cpuc->n_large_pebs) + index.thresh =ARCH_PEBS_THRESH_MULTI ; +else + index.thresh =ARCH_PEBS_THRESH_SINGLE ;wrmsrq (MSR_IA32_PEBS_INDEX , index.whole); }
arch/x86/events/perf_event.h +4 -0
@@ -304,6 +304,8 @@ struct cpu_hw_events {/* Intel ACR configuration */ u64 acr_cfg_b[X86_PMC_IDX_MAX ];u64 acr_cfg_c[X86_PMC_IDX_MAX ]; +/* Cached CFG_C values */ +u64 cfg_c_val[X86_PMC_IDX_MAX ];/* * Intel LBR bits
@@ -1783,6 +1785,8 @@ void intel_pmu_pebs_data_source_cmt(void);void intel_pmu_pebs_data_source_lnl (void ); +u64 intel_get_arch_pebs_data_config (struct perf_event *event); +int intel_pmu_setup_lbr_filter (struct perf_event *event);void intel_pt_interrupt (void );
arch/x86/include/asm/intel_ds.h +7 -0
@@ -7,6 +7,13 @@#define PEBS_BUFFER_SHIFT 4#define PEBS_BUFFER_SIZE (PAGE_SIZE << PEBS_BUFFER_SHIFT) +/* +* The largest PEBS record could consume a page, ensure +* a record at least can be written after triggering PMI. +*/ +#define ARCH_PEBS_THRESH_MULTI ((PEBS_BUFFER_SIZE - PAGE_SIZE) >> PEBS_BUFFER_SHIFT) +#define ARCH_PEBS_THRESH_SINGLE 1 +/* The maximal number of PEBS events: */ #define MAX_PEBS_EVENTS_FMT4 8#define MAX_PEBS_EVENTS 32
arch/x86/include/asm/msr-index.h +8 -0
@@ -330,6 +330,14 @@#define ARCH_PEBS_OFFSET_MASK 0x7fffff#define ARCH_PEBS_INDEX_WR_SHIFT 4 +#define ARCH_PEBS_RELOAD 0xffffffff +#define ARCH_PEBS_LBR_SHIFT 40 +#define ARCH_PEBS_LBR (0x3ull << ARCH_PEBS_LBR_SHIFT) +#define ARCH_PEBS_VECR_XMM BIT_ULL(49) +#define ARCH_PEBS_GPR BIT_ULL(61) +#define ARCH_PEBS_AUX BIT_ULL(62) +#define ARCH_PEBS_EN BIT_ULL(63) +#define MSR_IA32_RTIT_CTL 0x00000570#define RTIT_CTL_TRACEEN BIT(0)#define RTIT_CTL_CYCLEACC BIT(1)
Signature · 1 line
2.34.1
PATCH v6 10/10 perf/x86/intel: Add counter group support for arch-PEBS
In reply to Dapeng MiBase on previous adaptive PEBS counter snapshot support, add counter group support for architectural PEBS. Since arch-PEBS shares same counter group layout with adaptive PEBS, directly reuse __setup_pebs_counter_group() helper to process arch-PEBS counter group.
--- arch/x86/events/intel/core.c | 38 ++++++++++++++++++++++++++++--- arch/x86/events/intel/ds.c | 29 ++++++++++++++++++++--- arch/x86/include/asm/msr-index.h | 6 +++++ arch/x86/include/asm/perf_event.h | 13 ++++++++--- 4 files changed, 77 insertions(+), 9 deletions(-)
arch/x86/events/intel/core.c +35 -3
@@ -3014,6 +3014,17 @@ static void intel_pmu_enable_event_ext(struct perf_event *event)if (pebs_data_cfg &PEBS_DATACFG_LBRS ) ext |=ARCH_PEBS_LBR & cap.caps; + +if (pebs_data_cfg & + (PEBS_DATACFG_CNTR_MASK <<PEBS_DATACFG_CNTR_SHIFT )) + ext |=ARCH_PEBS_CNTR_GP & cap.caps; + +if (pebs_data_cfg & + (PEBS_DATACFG_FIX_MASK <<PEBS_DATACFG_FIX_SHIFT )) + ext |=ARCH_PEBS_CNTR_FIXED & cap.caps; + +if (pebs_data_cfg &PEBS_DATACFG_METRICS ) + ext |=ARCH_PEBS_CNTR_METRICS & cap.caps; }if (cpuc->n_pebs == cpuc->n_large_pebs)
@@ -3038,6 +3049,9 @@ static void intel_pmu_enable_event_ext(struct perf_event *event) } } +if (is_pebs_counter_event_group (event)) + ext |=ARCH_PEBS_CNTR_ALLOW ; +if (cpuc->cfg_c_val[hwc->idx] != ext)__intel_pmu_update_event_ext (hwc->idx, ext); }
@@ -4323,6 +4337,20 @@ static bool intel_pmu_is_acr_group(struct perf_event *event)return false; } +static inline bool intel_pmu_has_pebs_counter_group (struct pmu *pmu) +{ +u64 caps; + +if (x86_pmu.intel_cap.pebs_format >=6 && x86_pmu.intel_cap.pebs_baseline) +return true; + + caps =hybrid (pmu, arch_pebs_cap).caps; +if (x86_pmu.arch_pebs && (caps &ARCH_PEBS_CNTR_MASK )) +return true; + +return false; +} +static inline void intel_pmu_set_acr_cntr_constr (struct perf_event *event,u64 *cause_mask,int *num) {
@@ -4471,8 +4499,7 @@ static int intel_pmu_hw_config(struct perf_event *event) }if ((event->attr.sample_type &PERF_SAMPLE_READ ) && - (x86_pmu.intel_cap.pebs_format >=6 ) && - x86_pmu.intel_cap.pebs_baseline && +intel_pmu_has_pebs_counter_group (event->pmu) &&is_sampling_event (event) && event->attr.precise_ip) event->group_leader->hw.flags |=PERF_X86_EVENT_PEBS_CNTR ;
@@ -5420,6 +5447,8 @@ static inline void __intel_update_large_pebs_flags(struct pmu *pmu) x86_pmu.large_pebs_flags |=PERF_SAMPLE_TIME ;if (caps &ARCH_PEBS_LBR ) x86_pmu.large_pebs_flags |=PERF_SAMPLE_BRANCH_STACK ; +if (caps &ARCH_PEBS_CNTR_MASK ) + x86_pmu.large_pebs_flags |=PERF_SAMPLE_READ ;if (!(caps &ARCH_PEBS_AUX )) x86_pmu.large_pebs_flags &= ~PERF_SAMPLE_DATA_SRC ;
@@ -7133,8 +7162,11 @@ __init int intel_pmu_init(void)* Many features on and after V6 require dynamic constraint, * e.g., Arch PEBS, ACR. */ -if (version >=6 ) +if (version >=6 ) { x86_pmu.flags |=PMU_FL_DYN_CONSTRAINT ; + x86_pmu.late_setup = intel_pmu_late_setup; + } +/* * Install the hw-cache-events table: */
arch/x86/events/intel/ds.c +26 -3
@@ -1530,13 +1530,20 @@ pebs_update_state(bool needed_cb, struct cpu_hw_events *cpuc,u64 intel_get_arch_pebs_data_config (struct perf_event *event) { +struct cpu_hw_events *cpuc =this_cpu_ptr (&cpu_hw_events);u64 pebs_data_cfg =0 ; +u64 cntr_mask;if (WARN_ON (event->hw.idx <0 || event->hw.idx >=X86_PMC_IDX_MAX ))return 0 ; pebs_data_cfg |=pebs_update_adaptive_cfg (event); + cntr_mask = (PEBS_DATACFG_CNTR_MASK <<PEBS_DATACFG_CNTR_SHIFT ) | + (PEBS_DATACFG_FIX_MASK <<PEBS_DATACFG_FIX_SHIFT ) | +PEBS_DATACFG_CNTR |PEBS_DATACFG_METRICS ; + pebs_data_cfg |= cpuc->pebs_data_cfg & cntr_mask; +return pebs_data_cfg; }
@@ -2441,6 +2448,24 @@ static void setup_arch_pebs_sample_data(struct perf_event *event, } } +if (header->cntr) { +struct arch_pebs_cntr_header *cntr = next_record; +unsigned int nr; + + next_record +=sizeof (struct arch_pebs_cntr_header ); + +if (is_pebs_counter_event_group (event)) { +__setup_pebs_counter_group (cpuc, event, + (struct pebs_cntr_header *)cntr, next_record); + data->sample_flags |=PERF_SAMPLE_READ ; + } + + nr =hweight32 (cntr->cntr) +hweight32 (cntr->fixed); +if (cntr->metrics ==INTEL_CNTR_METRICS ) + nr +=2 ; + next_record += nr *sizeof (u64); + } +/* Parse followed fragments if there are. */ if (arch_pebs_record_continued (header)) { at = at + header->size;
@@ -3097,10 +3122,8 @@ static void __init intel_ds_pebs_init(void)break ;case 6 : -if (x86_pmu.intel_cap.pebs_baseline) { +if (x86_pmu.intel_cap.pebs_baseline) x86_pmu.large_pebs_flags |=PERF_SAMPLE_READ ; - x86_pmu.late_setup = intel_pmu_late_setup; - } fallthrough;case 5 : x86_pmu.pebs_ept =1 ;
arch/x86/include/asm/msr-index.h +6 -0
@@ -331,12 +331,18 @@#define ARCH_PEBS_INDEX_WR_SHIFT 4#define ARCH_PEBS_RELOAD 0xffffffff +#define ARCH_PEBS_CNTR_ALLOW BIT_ULL(35) +#define ARCH_PEBS_CNTR_GP BIT_ULL(36) +#define ARCH_PEBS_CNTR_FIXED BIT_ULL(37) +#define ARCH_PEBS_CNTR_METRICS BIT_ULL(38)#define ARCH_PEBS_LBR_SHIFT 40#define ARCH_PEBS_LBR (0x3ull << ARCH_PEBS_LBR_SHIFT)#define ARCH_PEBS_VECR_XMM BIT_ULL(49)#define ARCH_PEBS_GPR BIT_ULL(61)#define ARCH_PEBS_AUX BIT_ULL(62)#define ARCH_PEBS_EN BIT_ULL(63) +#define ARCH_PEBS_CNTR_MASK (ARCH_PEBS_CNTR_GP | ARCH_PEBS_CNTR_FIXED | \ + ARCH_PEBS_CNTR_METRICS)#define MSR_IA32_RTIT_CTL 0x00000570#define RTIT_CTL_TRACEEN BIT(0)
arch/x86/include/asm/perf_event.h +10 -3
@@ -141,16 +141,16 @@#define ARCH_PERFMON_EVENTS_COUNT 7#define PEBS_DATACFG_MEMINFO BIT_ULL(0) -#define PEBS_DATACFG_GP BIT_ULL(1) +#define PEBS_DATACFG_GP BIT_ULL(1)#define PEBS_DATACFG_XMMS BIT_ULL(2)#define PEBS_DATACFG_LBRS BIT_ULL(3) -#define PEBS_DATACFG_LBR_SHIFT 24#define PEBS_DATACFG_CNTR BIT_ULL(4) +#define PEBS_DATACFG_METRICS BIT_ULL(5) +#define PEBS_DATACFG_LBR_SHIFT 24#define PEBS_DATACFG_CNTR_SHIFT 32#define PEBS_DATACFG_CNTR_MASK GENMASK_ULL(15, 0)#define PEBS_DATACFG_FIX_SHIFT 48#define PEBS_DATACFG_FIX_MASK GENMASK_ULL(7, 0) -#define PEBS_DATACFG_METRICS BIT_ULL(5)/* Steal the highest bit of pebs_data_cfg for SW usage */ #define PEBS_UPDATE_DS_SW BIT_ULL(63)
@@ -603,6 +603,13 @@ struct arch_pebs_lbr_header {u64 ler_info; }; +struct arch_pebs_cntr_header { +u32 cntr; +u32 fixed; +u32 metrics; +u32 reserved; +}; +/* * AMD Extended Performance Monitoring and Debug cpuid feature detection */
Signature · 1 line
2.34.1