| Message ID | 20231211161331.1277825-1-james.clark@arm.com |
|---|---|
| Headers | show |
| Series | arm64: perf: Add support for event counting threshold | expand |
On Mon, 11 Dec 2023 16:13:12 +0000, James Clark wrote: > Changes since v6: > > * Remove inlines from arm_pmuv3.c > * Use format attribute mechanism from SPE > * Re-arrange attributes so that threshold comes last and can > potentially be extended > * Emit an error if the max threshold is exceeded rather than clamping > * Convert all register fields to GENMASK > > [...] Thanks for respinning, James. This looks really good now. Applied to will (for-next/perf), thanks! [01/11] arm: perf: Remove inlines from arm_pmuv3.c https://git.kernel.org/will/c/9343c790e6de [02/11] arm: perf/kvm: Use GENMASK for ARMV8_PMU_PMCR_N https://git.kernel.org/will/c/62e1f212e5fe [03/11] arm: perf: Use GENMASK for PMMIR fields https://git.kernel.org/will/c/2f6a00f30600 [04/11] arm: perf: Convert remaining fields to use GENMASK https://git.kernel.org/will/c/d30f09b6d7de [05/11] arm64: perf: Include threshold control fields in PMEVTYPER mask https://git.kernel.org/will/c/3115ee021bfb [06/11] arm: pmu: Share user ABI format mechanism with SPE https://git.kernel.org/will/c/f6da86969a3c [07/11] perf/arm_dmc620: Remove duplicate format attribute #defines https://git.kernel.org/will/c/a5f4ca68f348 [08/11] KVM: selftests: aarch64: Update tools copy of arm_pmuv3.h https://git.kernel.org/will/c/c7b98bf0fc79 [09/11] arm: pmu: Move error message and -EOPNOTSUPP to individual PMUs https://git.kernel.org/will/c/186c91aaf549 [10/11] arm64: perf: Add support for event counting threshold https://git.kernel.org/will/c/816c26754447 [11/11] Documentation: arm64: Document the PMU event counting threshold feature https://git.kernel.org/will/c/bd690638e2c2 Cheers,
Changes since v6: * Remove inlines from arm_pmuv3.c * Use format attribute mechanism from SPE * Re-arrange attributes so that threshold comes last and can potentially be extended * Emit an error if the max threshold is exceeded rather than clamping * Convert all register fields to GENMASK Changes since v5: * Restructure the docs and add some more explanations * PMMIR.WIDTH -> PMMIR.THWIDTH in one comment * Don't write EVTYPER.TC if TH is 0. Doesn't have any functional effect but it might be a bit easier to understand the code. * Expand the format field #define names Changes since v4: * Rebase onto v6.7-rc1, it no longer depends on kvmarm/next * Remove change that moved ARMV8_PMU_EVTYPE_MASK to the asm files. This actually depended on those files being included in a certain order with arm_pmuv3.h to avoid circular includes. Now the definition is done programmatically in arm_pmuv3.c instead. Changes since v3: * Drop #include changes to KVM source files because since commit bc512d6a9b92 ("KVM: arm64: Make PMEVTYPER<n>_EL0.NSH RES0 if EL2 isn't advertised"), KVM doesn't use ARMV8_PMU_EVTYPE_MASK anymore Changes since v2: * Split threshold_control attribute into two, threshold_compare and threshold_count so that it's easier to use * Add some notes to the first commit message and the cover letter about the behavior in KVM * Update the docs commit with regards to the split attribute Changes since v1: * Fix build on aarch32 by disabling FEAT_PMUv3_TH and splitting event type mask between the platforms * Change armv8pmu_write_evtype() to take unsigned long instead of u64 so it isn't unnecessarily wide on aarch32 * Add UL suffix to aarch64 event type mask definition ---- FEAT_PMUv3_TH (Armv8.8) is a new feature that allows conditional counting of PMU events depending on how much the event increments on a single cycle. Two new config fields for perf_event_open have been added, and a PMU cap file for reading the max_threshold. See the second commit message and the docs in the last commit for more details. The feature is not currently supported on KVM guests, and PMMIR is set to read as zero, so it's not advertised as available. But it can be added at a later time. Writes to PMEVTYPER.TC and TH from guests are already RES0. The change has been validated on the Arm FVP model: # Zero values, works as expected (as before). $ perf stat -e dtlb_walk/threshold=0,threshold_compare=0/ -- true 5962 dtlb_walk/threshold=0,threshold_compare=0/ # Threshold >= 255 causes count to be 0 because dtlb_walk doesn't # increase by more than 1 per cycle. $ perf stat -e dtlb_walk/threshold=255,threshold_compare=2/ -- true 0 dtlb_walk/threshold=255,threshold_compare=2/ # Keeping comparison as >= but lowering the threshold to 1 makes the # count return. $ perf stat -e dtlb_walk/threshold=1,threshold_compare=2/ -- true 6329 dtlb_walk/threshold=1,threshold_compare=2/ James Clark (11): arm: perf: Remove inlines from arm_pmuv3.c arm: perf/kvm: Use GENMASK for ARMV8_PMU_PMCR_N arm: perf: Use GENMASK for PMMIR fields arm: perf: Convert remaining fields to use GENMASK arm64: perf: Include threshold control fields in PMEVTYPER mask arm: pmu: Share user ABI format mechanism with SPE perf/arm_dmc620: Remove duplicate format attribute #defines KVM: selftests: aarch64: Update tools copy of arm_pmuv3.h arm: pmu: Move error message and -EOPNOTSUPP to individual PMUs arm64: perf: Add support for event counting threshold Documentation: arm64: Document the PMU event counting threshold feature Documentation/arch/arm64/perf.rst | 72 +++++++ arch/arm/kernel/perf_event_v7.c | 6 +- arch/arm64/kvm/pmu-emul.c | 8 +- arch/arm64/kvm/sys_regs.c | 4 +- drivers/perf/apple_m1_cpu_pmu.c | 6 +- drivers/perf/arm_dmc620_pmu.c | 22 +-- drivers/perf/arm_pmu.c | 11 +- drivers/perf/arm_pmuv3.c | 175 ++++++++++++++---- drivers/perf/arm_spe_pmu.c | 22 --- include/linux/perf/arm_pmu.h | 22 +++ include/linux/perf/arm_pmuv3.h | 34 ++-- tools/include/perf/arm_pmuv3.h | 43 +++-- .../kvm/aarch64/vpmu_counter_access.c | 5 +- 13 files changed, 296 insertions(+), 134 deletions(-)