perf: honoring the architectural performance monitoring version
Subsystems (2)
PATCH v2 1/1 perf: honoring the architectural performance monitoring version
From: "Palik, Imre" <[email protected]>
Architectural performance monitoring version 1 doesn't support fixed counters. Currently, even if a hypervisor advertises support for architectural performance monitoring version 1, perf may still tries to use the fixed counters, as the constraints are set up based on the CPU model.
This patch ensures that perf honors the architectural performance monitoring version returned by CPUID, and it only uses the fixed counters for version two and above.
Some of the ideas in this patch are coming from Peter Zijlstra.
--- arch/x86/kernel/cpu/perf_event_intel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +6 -6
@@ -2604,13 +2604,13 @@ __init int intel_pmu_init(void)* counter, so do not extend mask to generic counters */ for_each_event_constraint (c, x86_pmu.event_constraints) { -if (c->cmask !=FIXED_EVENT_FLAGS - || c->idxmsk64 ==INTEL_PMC_MSK_FIXED_REF_CYCLES ) { -continue ; +if (c->cmask ==FIXED_EVENT_FLAGS + && c->idxmsk64 !=INTEL_PMC_MSK_FIXED_REF_CYCLES ) { + c->idxmsk64 |= (1ULL << x86_pmu.num_counters) -1 ; } - - c->idxmsk64 |= (1ULL << x86_pmu.num_counters) -1 ; - c->weight += x86_pmu.num_counters; + c->idxmsk64 &= + ~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); + c->weight =hweight64 (c->idxmsk64); } }
Signature · 1 line
1.7.9.5
tip-bot for Palik, Imre
merge bot[tip:perf/urgent] perf/x86: Honor the architectural performance monitoring version
perf/x86: Honor the architectural performance monitoring version
Commit-ID: 2c33645d366d13b969d936b68b9f4875b1fdddea Gitweb: http://git.kernel.org/tip/2c33645d366d13b969d936b68b9f4875b1fdddea Author: Palik, Imre <[email protected]> AuthorDate: Mon, 8 Jun 2015 14:46:49 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 19 Jun 2015 09:38:48 +0200
perf/x86: Honor the architectural performance monitoring version
Architectural performance monitoring, version 1, doesn't support fixed counters.
Currently, even if a hypervisor advertises support for architectural performance monitoring version 1, perf may still try to use the fixed counters, as the constraints are set up based on the CPU model.
This patch ensures that perf honors the architectural performance monitoring version returned by CPUID, and it only uses the fixed counters for version 2 and above.
(Some of the ideas in this patch came from Peter Zijlstra.)
--- arch/x86/kernel/cpu/perf_event_intel.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/kernel/cpu/perf_event_intel.c +6 -6
@@ -3324,13 +3324,13 @@ __init int intel_pmu_init(void)* counter, so do not extend mask to generic counters */ for_each_event_constraint (c, x86_pmu.event_constraints) { -if (c->cmask !=FIXED_EVENT_FLAGS - || c->idxmsk64 ==INTEL_PMC_MSK_FIXED_REF_CYCLES ) { -continue ; +if (c->cmask ==FIXED_EVENT_FLAGS + && c->idxmsk64 !=INTEL_PMC_MSK_FIXED_REF_CYCLES ) { + c->idxmsk64 |= (1ULL << x86_pmu.num_counters) -1 ; } - - c->idxmsk64 |= (1ULL << x86_pmu.num_counters) -1 ; - c->weight += x86_pmu.num_counters; + c->idxmsk64 &= + ~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); + c->weight =hweight64 (c->idxmsk64); } }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/