Commit 16535d55 authored by Oliver Upton's avatar Oliver Upton
Browse files

KVM: arm64: nv: Honor MDCR_EL2.HLP 



Counters that fall in the hypervisor range (i.e. N >= HPMN) have a
separate control for enabling 64 bit overflow. Take it into account.

Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241025182354.3364124-17-oliver.upton@linux.dev


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

arch/arm64/kvm/pmu-emul.c

+5 −1
Original line number Diff line number Diff line
@@ -89,7 +89,11 @@ static bool kvm_pmc_is_64bit(struct kvm_pmc *pmc) 


static bool kvm_pmc_has_64bit_overflow(struct kvm_pmc *pmc)

{

	u64 val = kvm_vcpu_read_pmcr(kvm_pmc_to_vcpu(pmc));

	struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);

	u64 val = kvm_vcpu_read_pmcr(vcpu);



	if (kvm_pmu_counter_is_hyp(vcpu, pmc->idx))

		return __vcpu_sys_reg(vcpu, MDCR_EL2) & MDCR_EL2_HLP;



	return (pmc->idx < ARMV8_PMU_CYCLE_IDX && (val & ARMV8_PMU_PMCR_LP)) ||

	       (pmc->idx == ARMV8_PMU_CYCLE_IDX && (val & ARMV8_PMU_PMCR_LC));