Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42c8870f authored by Andre Przywara's avatar Andre Przywara Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Check return value for kvm_register_vgic_device 



kvm_register_device_ops() can return an error, so lets check its return
value and propagate this up the call chain.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Tested-by: default avatarEric Auger <eric.auger@redhat.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 8f6cdc1c

virt/kvm/arm/vgic/vgic-kvm-device.c

+9 −6
Original line number Diff line number Diff line
@@ -210,20 +210,24 @@ static void vgic_destroy(struct kvm_device *dev) 
	kfree(dev);

}



void kvm_register_vgic_device(unsigned long type)

int kvm_register_vgic_device(unsigned long type)

{

	int ret = -ENODEV;



	switch (type) {

	case KVM_DEV_TYPE_ARM_VGIC_V2:

		kvm_register_device_ops(&kvm_arm_vgic_v2_ops,

		ret = kvm_register_device_ops(&kvm_arm_vgic_v2_ops,

					      KVM_DEV_TYPE_ARM_VGIC_V2);

		break;

#ifdef CONFIG_KVM_ARM_VGIC_V3

	case KVM_DEV_TYPE_ARM_VGIC_V3:

		kvm_register_device_ops(&kvm_arm_vgic_v3_ops,

		ret = kvm_register_device_ops(&kvm_arm_vgic_v3_ops,

					      KVM_DEV_TYPE_ARM_VGIC_V3);

		break;

#endif

	}



	return ret;

}



/** vgic_attr_regs_access: allows user space to read/write VGIC registers
@@ -428,4 +432,3 @@ struct kvm_device_ops kvm_arm_vgic_v3_ops = { 
};



#endif /* CONFIG_KVM_ARM_VGIC_V3 */

virt/kvm/arm/vgic/vgic-v2.c

+8 −3
Original line number Diff line number Diff line
@@ -332,20 +332,25 @@ int vgic_v2_probe(const struct gic_kvm_info *info) 
	vtr = readl_relaxed(kvm_vgic_global_state.vctrl_base + GICH_VTR);

	kvm_vgic_global_state.nr_lr = (vtr & 0x3f) + 1;



	ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);

	if (ret) {

		kvm_err("Cannot register GICv2 KVM device\n");

		iounmap(kvm_vgic_global_state.vctrl_base);

		return ret;

	}



	ret = create_hyp_io_mappings(kvm_vgic_global_state.vctrl_base,

				     kvm_vgic_global_state.vctrl_base +

					 resource_size(&info->vctrl),

				     info->vctrl.start);



	if (ret) {

		kvm_err("Cannot map VCTRL into hyp\n");

		kvm_unregister_device_ops(KVM_DEV_TYPE_ARM_VGIC_V2);

		iounmap(kvm_vgic_global_state.vctrl_base);

		return ret;

	}



	kvm_vgic_global_state.can_emulate_gicv2 = true;

	kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);



	kvm_vgic_global_state.vcpu_base = info->vcpu.start;

	kvm_vgic_global_state.type = VGIC_V2;

	kvm_vgic_global_state.max_gic_vcpus = VGIC_V2_MAX_CPUS;

virt/kvm/arm/vgic/vgic-v3.c

+13 −2
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ int vgic_v3_map_resources(struct kvm *kvm) 
int vgic_v3_probe(const struct gic_kvm_info *info)

{

	u32 ich_vtr_el2 = kvm_call_hyp(__vgic_v3_get_ich_vtr_el2);

	int ret;



	/*

	 * The ListRegs field is 5 bits, but there is a architectural
@@ -319,12 +320,22 @@ int vgic_v3_probe(const struct gic_kvm_info *info) 
	} else {

		kvm_vgic_global_state.vcpu_base = info->vcpu.start;

		kvm_vgic_global_state.can_emulate_gicv2 = true;

		kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);

		ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V2);

		if (ret) {

			kvm_err("Cannot register GICv2 KVM device.\n");

			return ret;

		}

		kvm_info("vgic-v2@%llx\n", info->vcpu.start);

	}

	ret = kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V3);

	if (ret) {

		kvm_err("Cannot register GICv3 KVM device.\n");

		kvm_unregister_device_ops(KVM_DEV_TYPE_ARM_VGIC_V2);

		return ret;

	}



	if (kvm_vgic_global_state.vcpu_base == 0)

		kvm_info("disabling GICv2 emulation\n");

	kvm_register_vgic_device(KVM_DEV_TYPE_ARM_VGIC_V3);



	kvm_vgic_global_state.vctrl_base = NULL;

	kvm_vgic_global_state.type = VGIC_V3;

virt/kvm/arm/vgic/vgic.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static inline int vgic_register_redist_iodevs(struct kvm *kvm, 
}

#endif



void kvm_register_vgic_device(unsigned long type);

int kvm_register_vgic_device(unsigned long type);

int vgic_lazy_init(struct kvm *kvm);

int vgic_init(struct kvm *kvm);