Skip to content

Commit 0a55615

Browse files
Kan LiangPeter Zijlstra
authored andcommitted
perf/x86/intel: Clean up PEBS-via-PT on hybrid
The PEBS-via-PT feature is exposed for the e-core of some hybrid platforms, e.g., ADL and MTL. But it never works. $ dmesg | grep PEBS [ 1.793888] core: cpu_atom PMU driver: PEBS-via-PT $ perf record -c 1000 -e '{intel_pt/branch=0/, cpu_atom/cpu-cycles,aux-output/pp}' -C8 Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (cpu_atom/cpu-cycles,aux-output/pp). "dmesg | grep -i perf" may provide additional information. The "PEBS-via-PT" is printed if the corresponding bit of per-PMU capabilities is set. Since the feature is supported by the e-core HW, perf sets the bit for e-core. However, for Intel PT, if a feature is not supported on all CPUs, it is not supported at all. The PEBS-via-PT event cannot be created successfully. The PEBS-via-PT is no longer enumerated on the latest hybrid platform. It will be deprecated on future platforms with Arch PEBS. Let's remove it from the existing hybrid platforms. Fixes: d9977c4 ("perf/x86: Register hybrid PMUs") Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20250129154820.3755948-2-kan.liang@linux.intel.com
1 parent 469c76a commit 0a55615

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

arch/x86/events/intel/core.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4941,11 +4941,6 @@ static void intel_pmu_check_hybrid_pmus(struct x86_hybrid_pmu *pmu)
49414941
else
49424942
pmu->intel_ctrl &= ~(1ULL << GLOBAL_CTRL_EN_PERF_METRICS);
49434943

4944-
if (pmu->intel_cap.pebs_output_pt_available)
4945-
pmu->pmu.capabilities |= PERF_PMU_CAP_AUX_OUTPUT;
4946-
else
4947-
pmu->pmu.capabilities &= ~PERF_PMU_CAP_AUX_OUTPUT;
4948-
49494944
intel_pmu_check_event_constraints(pmu->event_constraints,
49504945
pmu->cntr_mask64,
49514946
pmu->fixed_cntr_mask64,
@@ -5023,9 +5018,6 @@ static bool init_hybrid_pmu(int cpu)
50235018

50245019
pr_info("%s PMU driver: ", pmu->name);
50255020

5026-
if (pmu->intel_cap.pebs_output_pt_available)
5027-
pr_cont("PEBS-via-PT ");
5028-
50295021
pr_cont("\n");
50305022

50315023
x86_pmu_show_pmu_cap(&pmu->pmu);
@@ -6370,11 +6362,9 @@ static __always_inline int intel_pmu_init_hybrid(enum hybrid_pmu_type pmus)
63706362
pmu->intel_cap.capabilities = x86_pmu.intel_cap.capabilities;
63716363
if (pmu->pmu_type & hybrid_small_tiny) {
63726364
pmu->intel_cap.perf_metrics = 0;
6373-
pmu->intel_cap.pebs_output_pt_available = 1;
63746365
pmu->mid_ack = true;
63756366
} else if (pmu->pmu_type & hybrid_big) {
63766367
pmu->intel_cap.perf_metrics = 1;
6377-
pmu->intel_cap.pebs_output_pt_available = 0;
63786368
pmu->late_ack = true;
63796369
}
63806370
}

arch/x86/events/intel/ds.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2578,7 +2578,15 @@ void __init intel_ds_init(void)
25782578
}
25792579
pr_cont("PEBS fmt4%c%s, ", pebs_type, pebs_qual);
25802580

2581-
if (!is_hybrid() && x86_pmu.intel_cap.pebs_output_pt_available) {
2581+
/*
2582+
* The PEBS-via-PT is not supported on hybrid platforms,
2583+
* because not all CPUs of a hybrid machine support it.
2584+
* The global x86_pmu.intel_cap, which only contains the
2585+
* common capabilities, is used to check the availability
2586+
* of the feature. The per-PMU pebs_output_pt_available
2587+
* in a hybrid machine should be ignored.
2588+
*/
2589+
if (x86_pmu.intel_cap.pebs_output_pt_available) {
25822590
pr_cont("PEBS-via-PT, ");
25832591
x86_get_pmu(smp_processor_id())->capabilities |= PERF_PMU_CAP_AUX_OUTPUT;
25842592
}

0 commit comments

Comments
 (0)