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

KVM: PPC: Move kvm_vcpu_init() invocation to common code 



Move the kvm_cpu_{un}init() calls to common PPC code as an intermediate
step towards removing kvm_cpu_{un}init() altogether.

No functional change intended.

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

arch/powerpc/include/asm/kvm_ppc.h

+2 −4
Original line number Diff line number Diff line
@@ -119,8 +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 int kvmppc_core_vcpu_create(struct kvm *kvm, struct kvm_vcpu *vcpu,

				   unsigned int id);

extern int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu);

extern void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu);

extern int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu);

extern int kvmppc_core_check_processor_compat(void);
@@ -274,8 +273,7 @@ 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);

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

			   unsigned int id);

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

	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

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

}



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

			    unsigned int id)

int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu)

{

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

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

}



void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)

arch/powerpc/kvm/book3s_hv.c

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

#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */



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

				      unsigned int id)

static int kvmppc_core_vcpu_create_hv(struct kvm_vcpu *vcpu)

{

	int err;

	int core;

	struct kvmppc_vcore *vcore;

	struct kvm *kvm;

	unsigned int id;



	err = kvm_vcpu_init(vcpu, kvm, id);

	if (err)

		return err;

	kvm = vcpu->kvm;

	id = vcpu->vcpu_id;



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

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -2362,7 +2362,7 @@ static int kvmppc_core_vcpu_create_hv(struct kvm *kvm, struct kvm_vcpu *vcpu, 
	mutex_unlock(&kvm->lock);



	if (!vcore)

		goto uninit_vcpu;

		return err;



	spin_lock(&vcore->lock);

	++vcore->num_threads;
@@ -2378,10 +2378,6 @@ static int kvmppc_core_vcpu_create_hv(struct kvm *kvm, struct kvm_vcpu *vcpu, 
	debugfs_vcpu_init(vcpu, id);



	return 0;



uninit_vcpu:

	kvm_vcpu_uninit(vcpu);

	return err;

}



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

	unpin_vpa(vcpu->kvm, &vcpu->arch.vpa);

	spin_unlock(&vcpu->arch.vpa_update_lock);

	kvm_vcpu_uninit(vcpu);

}



static int kvmppc_core_check_requests_hv(struct kvm_vcpu *vcpu)

arch/powerpc/kvm/book3s_pr.c

+3 −10
Original line number Diff line number Diff line
@@ -1744,22 +1744,17 @@ static int kvmppc_set_one_reg_pr(struct kvm_vcpu *vcpu, u64 id, 
	return r;

}



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

				      unsigned int id)

static int kvmppc_core_vcpu_create_pr(struct kvm_vcpu *vcpu)

{

	struct kvmppc_vcpu_book3s *vcpu_book3s;

	unsigned long p;

	int err;



	err = kvm_vcpu_init(vcpu, kvm, id);

	if (err)

		return err;



	err = -ENOMEM;



	vcpu_book3s = vzalloc(sizeof(struct kvmppc_vcpu_book3s));

	if (!vcpu_book3s)

		goto uninit_vcpu;

		goto out;

	vcpu->arch.book3s = vcpu_book3s;



#ifdef CONFIG_KVM_BOOK3S_32_HANDLER
@@ -1814,8 +1809,7 @@ static int kvmppc_core_vcpu_create_pr(struct kvm *kvm, struct kvm_vcpu *vcpu, 
free_vcpu3s:

#endif

	vfree(vcpu_book3s);

uninit_vcpu:

	kvm_vcpu_uninit(vcpu);

out:

	return err;

}
@@ -1824,7 +1818,6 @@ static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu) 
	struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);



	free_page((unsigned long)vcpu->arch.shared & PAGE_MASK);

	kvm_vcpu_uninit(vcpu);

#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

	kfree(vcpu->arch.shadow_vcpu);

#endif

arch/powerpc/kvm/booke.c

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

}



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

			    unsigned int id)

int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu)

{

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

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

}



void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)