Commit 3caa2d8c authored by Andre Przywara's avatar Andre Przywara Committed by Christoffer Dall
Browse files

arm/arm64: KVM: make the maximum number of vCPUs a per-VM value 



Currently the maximum number of vCPUs supported is a global value
limited by the used GIC model. GICv3 will lift this limit, but we
still need to observe it for guests using GICv2.
So the maximum number of vCPUs is per-VM value, depending on the
GIC model the guest uses.
Store and check the value in struct kvm_arch, but keep it down to
8 for now.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 4ce7ebdf

arch/arm/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ struct kvm_arch { 


	/* Interrupt controller */

	struct vgic_dist	vgic;

	int max_vcpus;

};



#define KVM_NR_MEM_OBJS     40

arch/arm/kvm/arm.c

+8 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	/* Mark the initial VMID generation invalid */

	kvm->arch.vmid_gen = 0;



	/* The maximum number of VCPUs is limited by the host's GIC model */

	kvm->arch.max_vcpus = kvm_vgic_get_max_vcpus();



	return ret;

out_free_stage2_pgd:

	kvm_free_stage2_pgd(kvm);
@@ -218,6 +221,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id) 
		goto out;

	}



	if (id >= kvm->arch.max_vcpus) {

		err = -EINVAL;

		goto out;

	}



	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu) {

		err = -ENOMEM;

arch/arm64/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ struct kvm_arch { 
	/* VTTBR value associated with above pgd and vmid */

	u64    vttbr;



	/* The maximum number of vCPUs depends on the used GIC model */

	int max_vcpus;



	/* Interrupt controller */

	struct vgic_dist	vgic;

include/kvm/arm_vgic.h

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#define VGIC_V2_MAX_LRS		(1 << 6)

#define VGIC_V3_MAX_LRS		16

#define VGIC_MAX_IRQS		1024

#define VGIC_V2_MAX_CPUS	8



/* Sanity checks... */

#if (KVM_MAX_VCPUS > 8)
@@ -132,6 +133,7 @@ struct vgic_params { 
	unsigned int	maint_irq;

	/* Virtual control interface base address */

	void __iomem	*vctrl_base;

	int		max_gic_vcpus;

};



struct vgic_vm_ops {
@@ -289,6 +291,7 @@ struct kvm_exit_mmio; 
int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write);

int kvm_vgic_hyp_init(void);

int kvm_vgic_map_resources(struct kvm *kvm);

int kvm_vgic_get_max_vcpus(void);

int kvm_vgic_create(struct kvm *kvm, u32 type);

void kvm_vgic_destroy(struct kvm *kvm);

void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu);
@@ -393,6 +396,11 @@ static inline bool vgic_ready(struct kvm *kvm) 
{

	return true;

}



static inline int kvm_vgic_get_max_vcpus(void)

{

	return KVM_MAX_VCPUS;

}

#endif



#endif

virt/kvm/arm/vgic-v2.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ int vgic_v2_probe(struct device_node *vgic_node, 
		 vctrl_res.start, vgic->maint_irq);



	vgic->type = VGIC_V2;

	vgic->max_gic_vcpus = VGIC_V2_MAX_CPUS;

	*ops = &vgic_v2_ops;

	*params = vgic;

	goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE