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

KVM: PPC: Allocate vcpu struct in common PPC code 



Move allocation of all flavors of PPC vCPUs to common PPC code.  All
variants either allocate 'struct kvm_vcpu' directly, or require that
the embedded 'struct kvm_vcpu' member be located at offset 0, i.e.
guarantee that the allocation can be directly interpreted as a 'struct
kvm_vcpu' object.

Remove the message from the build-time assertion regarding placement of
the struct, as compatibility with the arch usercopy region is no longer
the sole dependent on 'struct kvm_vcpu' being at offset zero.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3ec8ca29

arch/powerpc/include/asm/kvm_ppc.h

+4 −3
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ extern int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr, 
			enum xlate_instdata xlid, enum xlate_readwrite xlrw,

			struct kvmppc_pte *pte);



extern struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm,

extern int kvmppc_core_vcpu_create(struct kvm *kvm, struct kvm_vcpu *vcpu,

				   unsigned int id);

extern void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu);

extern int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu);
@@ -274,7 +274,8 @@ struct kvmppc_ops { 
	void (*inject_interrupt)(struct kvm_vcpu *vcpu, int vec, u64 srr1_flags);

	void (*set_msr)(struct kvm_vcpu *vcpu, u64 msr);

	int (*vcpu_run)(struct kvm_run *run, struct kvm_vcpu *vcpu);

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

	int (*vcpu_create)(struct kvm *kvm, struct kvm_vcpu *vcpu,

			   unsigned int id);

	void (*vcpu_free)(struct kvm_vcpu *vcpu);

	int (*check_requests)(struct kvm_vcpu *vcpu);

	int (*get_dirty_log)(struct kvm *kvm, struct kvm_dirty_log *log);

arch/powerpc/kvm/book3s.c

+3 −2
Original line number Diff line number Diff line
@@ -789,9 +789,10 @@ void kvmppc_decrementer_func(struct kvm_vcpu *vcpu) 
	kvm_vcpu_kick(vcpu);

}



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

int kvmppc_core_vcpu_create(struct kvm *kvm, struct kvm_vcpu *vcpu,

			    unsigned int id)

{

	return kvm->arch.kvm_ops->vcpu_create(kvm, id);

	return kvm->arch.kvm_ops->vcpu_create(kvm, vcpu, id);

}



void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)

arch/powerpc/kvm/book3s_hv.c

+5 −15
Original line number Diff line number Diff line
@@ -2271,22 +2271,16 @@ static void debugfs_vcpu_init(struct kvm_vcpu *vcpu, unsigned int id) 
}

#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */



static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm,

static int kvmppc_core_vcpu_create_hv(struct kvm *kvm, struct kvm_vcpu *vcpu,

				      unsigned int id)

{

	struct kvm_vcpu *vcpu;

	int err;

	int core;

	struct kvmppc_vcore *vcore;



	err = -ENOMEM;

	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu)

		goto out;



	err = kvm_vcpu_init(vcpu, kvm, id);

	if (err)

		goto free_vcpu;

		return err;



	vcpu->arch.shared = &vcpu->arch.shregs;

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -2383,14 +2377,11 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_hv(struct kvm *kvm, 


	debugfs_vcpu_init(vcpu, id);



	return vcpu;

	return 0;



uninit_vcpu:

	kvm_vcpu_uninit(vcpu);

free_vcpu:

	kmem_cache_free(kvm_vcpu_cache, vcpu);

out:

	return ERR_PTR(err);

	return err;

}



static int kvmhv_set_smt_mode(struct kvm *kvm, unsigned long smt_mode,
@@ -2445,7 +2436,6 @@ static void kvmppc_core_vcpu_free_hv(struct kvm_vcpu *vcpu) 
	unpin_vpa(vcpu->kvm, &vcpu->arch.vpa);

	spin_unlock(&vcpu->arch.vpa_update_lock);

	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



static int kvmppc_core_check_requests_hv(struct kvm_vcpu *vcpu)

arch/powerpc/kvm/book3s_pr.c

+5 −13
Original line number Diff line number Diff line
@@ -1744,21 +1744,16 @@ static int kvmppc_set_one_reg_pr(struct kvm_vcpu *vcpu, u64 id, 
	return r;

}



static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm,

static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu,

				      unsigned int id)

{

	struct kvmppc_vcpu_book3s *vcpu_book3s;

	struct kvm_vcpu *vcpu;

	int err = -ENOMEM;

	unsigned long p;



	vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);

	if (!vcpu)

		goto out;



	vcpu_book3s = vzalloc(sizeof(struct kvmppc_vcpu_book3s));

	if (!vcpu_book3s)

		goto free_vcpu;

		goto out;

	vcpu->arch.book3s = vcpu_book3s;



#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
@@ -1808,7 +1803,7 @@ static struct kvm_vcpu *kvmppc_core_vcpu_create_pr(struct kvm *kvm, 
	if (err < 0)

		goto free_shared_page;



	return vcpu;

	return 0;



free_shared_page:

	free_page((unsigned long)vcpu->arch.shared);
@@ -1820,10 +1815,8 @@ free_shadow_vcpu: 
free_vcpu3s:

#endif

	vfree(vcpu_book3s);

free_vcpu:

	kmem_cache_free(kvm_vcpu_cache, vcpu);

out:

	return ERR_PTR(err);

	return err;

}



static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu)
@@ -1836,7 +1829,6 @@ static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu) 
	kfree(vcpu->arch.shadow_vcpu);

#endif

	vfree(vcpu_book3s);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}



static int kvmppc_vcpu_run_pr(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)

arch/powerpc/kvm/booke.c

+3 −2
Original line number Diff line number Diff line
@@ -2114,9 +2114,10 @@ int kvmppc_core_init_vm(struct kvm *kvm) 
	return kvm->arch.kvm_ops->init_vm(kvm);

}



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

int kvmppc_core_vcpu_create(struct kvm *kvm, struct kvm_vcpu *vcpu,

			    unsigned int id)

{

	return kvm->arch.kvm_ops->vcpu_create(kvm, id);

	return kvm->arch.kvm_ops->vcpu_create(kvm, vcpu, id);

}



void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)

CRA Git | Maintained and supported by SUSTech CRA and CCSE