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

KVM: arm64: nv: Honor MDCR_EL2.HPME 



When the PMU is configured with split counter ranges, HPME becomes the
enable bit for the counters reserved for EL2.

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


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

arch/arm64/kvm/pmu-emul.c

+9 −2
Original line number Diff line number Diff line
@@ -620,8 +620,15 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val) 
static bool kvm_pmu_counter_is_enabled(struct kvm_pmc *pmc)

{

	struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);

	return (kvm_vcpu_read_pmcr(vcpu) & ARMV8_PMU_PMCR_E) &&

	       (__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(pmc->idx));

	unsigned int mdcr = __vcpu_sys_reg(vcpu, MDCR_EL2);



	if (!(__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(pmc->idx)))

		return false;



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

		return mdcr & MDCR_EL2_HPME;



	return kvm_vcpu_read_pmcr(vcpu) & ARMV8_PMU_PMCR_E;

}



static bool kvm_pmc_counts_at_el0(struct kvm_pmc *pmc)