Commit e89c928b authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: Fix host-programmed guest events in nVHE 



Programming PMU events in the host that count during guest execution is
a feature supported by perf, e.g.

  perf stat -e cpu_cycles:G ./lkvm run

While this works for VHE, the guest/host event bitmaps are not carried
through to the hypervisor in the nVHE configuration. Make
kvm_pmu_update_vcpu_events() conditional on whether or not _hardware_
supports PMUv3 rather than if the vCPU as vPMU enabled.

Cc: stable@vger.kernel.org
Fixes: 84d751a0 ("KVM: arm64: Pass pmu events to hyp via vcpu")
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240305184840.636212-3-oliver.upton@linux.dev


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 4cece764

include/kvm/arm_pmu.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void kvm_vcpu_pmu_resync_el0(void); 
 */

#define kvm_pmu_update_vcpu_events(vcpu)				\

	do {								\

		if (!has_vhe() && kvm_vcpu_has_pmu(vcpu))		\

		if (!has_vhe() && kvm_arm_support_pmu_v3())		\

			vcpu->arch.pmu.events = *kvm_get_pmu_events();	\

	} while (0)