On Tue, 05 Mar 2024 18:48:39 +0000,
Oliver Upton <oliver.upton@xxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxxxx
> Fixes: 84d751a019a9 ("KVM: arm64: Pass pmu events to hyp via vcpu")
> Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
> ---
> include/kvm/arm_pmu.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h
> index 4b9d8fb393a8..df32355e3e38 100644
> --- a/include/kvm/arm_pmu.h
> +++ b/include/kvm/arm_pmu.h
> @@ -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)
>
Reviewed-by: Marc Zyngier <maz@xxxxxxxxxx>
M.
--
Without deviation from the norm, progress is not possible.
