Commit 9116db11 authored Sep 20, 2023 by Oliver Upton

KVM: arm64: Hoist PMUv3 check into KVM_ARM_VCPU_INIT ioctl handler



Test that the system supports PMUv3 before ever getting to
kvm_reset_vcpu().

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230920195036.1169791-3-oliver.upton@linux.dev


Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

parent ef150908

arch/arm64/kvm/arm.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,9 @@ static unsigned long system_supported_vcpu_features(void)
		if (!cpus_have_final_cap(ARM64_HAS_32BIT_EL1))
		clear_bit(KVM_ARM_VCPU_EL1_32BIT, &features);

		if (!kvm_arm_support_pmu_v3())
		clear_bit(KVM_ARM_VCPU_PMU_V3, &features);

		return features;
		}

arch/arm64/kvm/reset.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -255,11 +255,6 @@ int kvm_reset_vcpu(struct kvm_vcpu *vcpu)
		else
		pstate = VCPU_RESET_PSTATE_EL1;

		if (kvm_vcpu_has_pmu(vcpu) && !kvm_arm_support_pmu_v3()) {
		ret = -EINVAL;
		goto out;
		}

		/* Reset core registers */
		memset(vcpu_gp_regs(vcpu), 0, sizeof(*vcpu_gp_regs(vcpu)));
		memset(&vcpu->arch.ctxt.fp_regs, 0, sizeof(vcpu->arch.ctxt.fp_regs));