Skip to content

Commit 28c24de

Browse files
virtuosoPeter Zijlstra
authored andcommitted
perf/x86/intel/pt: Add a capability and config bit for event tracing
As of Intel SDM (https://www.intel.com/sdm) version 076, there is a new Intel PT feature called Event Trace which is enabled config bit 31. Event Trace exposes details about asynchronous events such as interrupts and VM-Entry/Exit. Add a capability and config bit for Event Trace. Signed-off-by: Alexander Shishkin <[email protected]> Signed-off-by: Adrian Hunter <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Adrian Hunter <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ee28855 commit 28c24de

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

arch/x86/events/intel/pt.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ static struct pt_cap_desc {
5959
PT_CAP(mtc, 0, CPUID_EBX, BIT(3)),
6060
PT_CAP(ptwrite, 0, CPUID_EBX, BIT(4)),
6161
PT_CAP(power_event_trace, 0, CPUID_EBX, BIT(5)),
62+
PT_CAP(event_trace, 0, CPUID_EBX, BIT(7)),
6263
PT_CAP(topa_output, 0, CPUID_ECX, BIT(0)),
6364
PT_CAP(topa_multiple_entries, 0, CPUID_ECX, BIT(1)),
6465
PT_CAP(single_range_output, 0, CPUID_ECX, BIT(2)),
@@ -110,6 +111,7 @@ PMU_FORMAT_ATTR(tsc, "config:10" );
110111
PMU_FORMAT_ATTR(noretcomp, "config:11" );
111112
PMU_FORMAT_ATTR(ptw, "config:12" );
112113
PMU_FORMAT_ATTR(branch, "config:13" );
114+
PMU_FORMAT_ATTR(event, "config:31" );
113115
PMU_FORMAT_ATTR(mtc_period, "config:14-17" );
114116
PMU_FORMAT_ATTR(cyc_thresh, "config:19-22" );
115117
PMU_FORMAT_ATTR(psb_period, "config:24-27" );
@@ -118,6 +120,7 @@ static struct attribute *pt_formats_attr[] = {
118120
&format_attr_pt.attr,
119121
&format_attr_cyc.attr,
120122
&format_attr_pwr_evt.attr,
123+
&format_attr_event.attr,
121124
&format_attr_fup_on_ptw.attr,
122125
&format_attr_mtc.attr,
123126
&format_attr_tsc.attr,
@@ -298,6 +301,7 @@ static int __init pt_pmu_hw_init(void)
298301
RTIT_CTL_CYC_PSB | \
299302
RTIT_CTL_MTC | \
300303
RTIT_CTL_PWR_EVT_EN | \
304+
RTIT_CTL_EVENT_EN | \
301305
RTIT_CTL_FUP_ON_PTW | \
302306
RTIT_CTL_PTW_EN)
303307

@@ -352,6 +356,10 @@ static bool pt_event_valid(struct perf_event *event)
352356
!intel_pt_validate_hw_cap(PT_CAP_power_event_trace))
353357
return false;
354358

359+
if (config & RTIT_CTL_EVENT_EN &&
360+
!intel_pt_validate_hw_cap(PT_CAP_event_trace))
361+
return false;
362+
355363
if (config & RTIT_CTL_PTW) {
356364
if (!intel_pt_validate_hw_cap(PT_CAP_ptwrite))
357365
return false;

arch/x86/include/asm/intel_pt.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ enum pt_capabilities {
1313
PT_CAP_mtc,
1414
PT_CAP_ptwrite,
1515
PT_CAP_power_event_trace,
16+
PT_CAP_event_trace,
1617
PT_CAP_topa_output,
1718
PT_CAP_topa_multiple_entries,
1819
PT_CAP_single_range_output,

arch/x86/include/asm/msr-index.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
#define RTIT_CTL_DISRETC BIT(11)
206206
#define RTIT_CTL_PTW_EN BIT(12)
207207
#define RTIT_CTL_BRANCH_EN BIT(13)
208+
#define RTIT_CTL_EVENT_EN BIT(31)
208209
#define RTIT_CTL_MTC_RANGE_OFFSET 14
209210
#define RTIT_CTL_MTC_RANGE (0x0full << RTIT_CTL_MTC_RANGE_OFFSET)
210211
#define RTIT_CTL_CYC_THRESH_OFFSET 19

0 commit comments

Comments
 (0)