Commit 897cc38e authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Add kvm_arch_vcpu_precreate() to handle pre-allocation issues 



Add a pre-allocation arch hook to handle checks that are currently done
by arch specific code prior to allocating the vCPU object.  This paves
the way for moving the allocation to common KVM code.

Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent fe931f12

arch/mips/kvm/mips.c

+5 −0
Original line number Diff line number Diff line
@@ -280,6 +280,11 @@ static inline void dump_handler(const char *symbol, void *start, void *end) 
	pr_debug("\tEND(%s)\n", symbol);

}



int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

{

	return 0;

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)

{

	int err, size;

arch/powerpc/kvm/powerpc.c

+5 −0
Original line number Diff line number Diff line
@@ -720,6 +720,11 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm, 
	kvmppc_core_flush_memslot(kvm, slot);

}



int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

{

	return 0;

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)

{

	struct kvm_vcpu *vcpu;

arch/s390/kvm/kvm-s390.c

+8 −4
Original line number Diff line number Diff line
@@ -3035,15 +3035,19 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	return rc;

}



int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

{

	if (!kvm_is_ucontrol(kvm) && !sca_can_add_vcpu(kvm, id))

		return -EINVAL;

	return 0;

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,

				      unsigned int id)

{

	struct kvm_vcpu *vcpu;

	struct sie_page *sie_page;

	int rc = -EINVAL;



	if (!kvm_is_ucontrol(kvm) && !sca_can_add_vcpu(kvm, id))

		goto out;

	int rc;



	rc = -ENOMEM;

arch/x86/kvm/x86.c

+9 −5
Original line number Diff line number Diff line
@@ -9170,17 +9170,21 @@ static void fx_init(struct kvm_vcpu *vcpu) 
	vcpu->arch.cr0 |= X86_CR0_ET;

}



int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)

{

	if (kvm_check_tsc_unstable() && atomic_read(&kvm->online_vcpus) != 0)

		pr_warn_once("kvm: SMP vm created on host with unstable TSC; "

			     "guest TSC will not be reliable\n");



	return 0;

}



struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,

						unsigned int id)

{

	struct kvm_vcpu *vcpu;

	int r;



	if (kvm_check_tsc_unstable() && atomic_read(&kvm->online_vcpus) != 0)

		printk_once(KERN_WARNING

		"kvm: SMP vm created on host with unstable TSC; "

		"guest TSC will not be reliable\n");



	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL_ACCOUNT);

	if (!vcpu)

		return ERR_PTR(-ENOMEM);

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -874,6 +874,7 @@ void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu); 


void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu);

void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu);

int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id);

struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id);

int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE