[PATCH v2 00/14] KVM: arm64: Support FEAT_PMUv3 on Apple hardware

From: Oliver Upton
Date: Mon Feb 03 2025 - 13:32:03 EST


This series adds support for PMUv3 emulation on Apple hardware. See the
v1 cover letter for a more detailed explanation.

Tested on an M2 Pro Mac Mini w/ Debian + Windows guests. Also tested
using kvm-unit-tests, with a small test fix [*].

[*]: https://lore.kernel.org/kvmarm/20250203181026.159721-1-oliver.upton@xxxxxxxxx/

v1: https://lore.kernel.org/kvmarm/20241217212048.3709204-1-oliver.upton@xxxxxxxxx/

v1 -> v2:
- Rebase to 6.14-rc1
- Fix CONFIG_GUEST_PERF_EVENTS=n compilation error
- Enroll M1 parts for PMUv3 emulation (Janne)
- Collect Janne's Tested-by

Oliver Upton (14):
drivers/perf: apple_m1: Refactor event select/filter configuration
drivers/perf: apple_m1: Support host/guest event filtering
drivers/perf: apple_m1: Provide helper for mapping PMUv3 events
KVM: arm64: Compute PMCEID from arm_pmu's event bitmaps
KVM: arm64: Always support SW_INCR PMU event
KVM: arm64: Remap PMUv3 events onto hardware
KVM: arm64: Use a cpucap to determine if system supports FEAT_PMUv3
KVM: arm64: Drop kvm_arm_pmu_available static key
KVM: arm64: Use guard() to cleanup usage of arm_pmus_lock
KVM: arm64: Move PMUVer filtering into KVM code
KVM: arm64: Compute synthetic sysreg ESR for Apple PMUv3 traps
KVM: arm64: Advertise PMUv3 if IMPDEF traps are present
KVM: arm64: Provide 1 event counter on IMPDEF hardware
arm64: Enable IMP DEF PMUv3 traps on Apple M*

arch/arm64/include/asm/apple_m1_pmu.h | 1 +
arch/arm64/include/asm/cpufeature.h | 28 +-----
arch/arm64/kernel/cpu_errata.c | 44 ++++++++
arch/arm64/kernel/cpufeature.c | 19 ++++
arch/arm64/kernel/image-vars.h | 5 -
arch/arm64/kvm/arm.c | 4 +-
arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +-
arch/arm64/kvm/hyp/vhe/switch.c | 22 ++++
arch/arm64/kvm/pmu-emul.c | 127 +++++++++++++++++-------
arch/arm64/kvm/pmu.c | 10 +-
arch/arm64/tools/cpucaps | 2 +
drivers/perf/apple_m1_cpu_pmu.c | 101 +++++++++++++++----
include/kvm/arm_pmu.h | 12 +--
include/linux/perf/arm_pmu.h | 1 +
14 files changed, 276 insertions(+), 104 deletions(-)


base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
--
2.39.5