Commit 42223fb1 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: Refactor PMU attribute error handling 



The PMU emulation error handling is pretty messy when dealing with
attributes. Let's refactor it so that we have less duplication,
and that it is easy to extend later on.

A functional change is that kvm_arm_pmu_v3_init() used to return
-ENXIO when the PMU feature wasn't set. The error is now reported
as -ENODEV, matching the documentation. -ENXIO is still returned
when the interrupt isn't properly configured.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent f4d51dff

arch/arm64/kvm/pmu-emul.c

+7 −12
Original line number Diff line number Diff line
@@ -735,15 +735,6 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu) 


static int kvm_arm_pmu_v3_init(struct kvm_vcpu *vcpu)

{

	if (!kvm_arm_support_pmu_v3())

		return -ENODEV;



	if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features))

		return -ENXIO;



	if (vcpu->arch.pmu.created)

		return -EBUSY;



	if (irqchip_in_kernel(vcpu->kvm)) {

		int ret;
@@ -796,6 +787,13 @@ static bool pmu_irq_is_valid(struct kvm *kvm, int irq) 


int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)

{

	if (!kvm_arm_support_pmu_v3() ||

	    !test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features))

		return -ENODEV;



	if (vcpu->arch.pmu.created)

		return -EBUSY;



	switch (attr->attr) {

	case KVM_ARM_VCPU_PMU_V3_IRQ: {

		int __user *uaddr = (int __user *)(long)attr->addr;
@@ -804,9 +802,6 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 
		if (!irqchip_in_kernel(vcpu->kvm))

			return -EINVAL;



		if (!test_bit(KVM_ARM_VCPU_PMU_V3, vcpu->arch.features))

			return -ENODEV;



		if (get_user(irq, uaddr))

			return -EFAULT;