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

Commit 503bfcbe authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Paul Mackerras
Browse files

KVM: PPC: Pass kvm* to kvmppc_find_table() 



The guest view TCE tables are per KVM anyway (not per VCPU) so pass kvm*
there. This will be used in the following patches where we will be
attaching VFIO containers to LIOBNs via ioctl() to KVM (rather than
to VCPU).

Signed-off-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent e91aa8e6

arch/powerpc/include/asm/kvm_ppc.h

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ extern int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu); 
extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,

				struct kvm_create_spapr_tce_64 *args);

extern struct kvmppc_spapr_tce_table *kvmppc_find_table(

		struct kvm_vcpu *vcpu, unsigned long liobn);

		struct kvm *kvm, unsigned long liobn);

extern long kvmppc_ioba_validate(struct kvmppc_spapr_tce_table *stt,

		unsigned long ioba, unsigned long npages);

extern long kvmppc_tce_validate(struct kvmppc_spapr_tce_table *tt,

arch/powerpc/kvm/book3s_64_vio.c

+4 −3
Original line number Diff line number Diff line
@@ -214,12 +214,13 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm, 
long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

		      unsigned long ioba, unsigned long tce)

{

	struct kvmppc_spapr_tce_table *stt = kvmppc_find_table(vcpu, liobn);

	struct kvmppc_spapr_tce_table *stt;

	long ret;



	/* udbg_printf("H_PUT_TCE(): liobn=0x%lx ioba=0x%lx, tce=0x%lx\n", */

	/* 	    liobn, ioba, tce); */



	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;
@@ -247,7 +248,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
	u64 __user *tces;

	u64 tce;



	stt = kvmppc_find_table(vcpu, liobn);

	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;
@@ -301,7 +302,7 @@ long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu, 
	struct kvmppc_spapr_tce_table *stt;

	long i, ret;



	stt = kvmppc_find_table(vcpu, liobn);

	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;

arch/powerpc/kvm/book3s_64_vio_hv.c

+7 −6
Original line number Diff line number Diff line
@@ -48,10 +48,9 @@ 
 * WARNING: This will be called in real or virtual mode on HV KVM and virtual

 *          mode on PR KVM

 */

struct kvmppc_spapr_tce_table *kvmppc_find_table(struct kvm_vcpu *vcpu,

struct kvmppc_spapr_tce_table *kvmppc_find_table(struct kvm *kvm,

		unsigned long liobn)

{

	struct kvm *kvm = vcpu->kvm;

	struct kvmppc_spapr_tce_table *stt;



	list_for_each_entry_lockless(stt, &kvm->arch.spapr_tce_tables, list)
@@ -182,12 +181,13 @@ EXPORT_SYMBOL_GPL(kvmppc_gpa_to_ua); 
long kvmppc_rm_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

		unsigned long ioba, unsigned long tce)

{

	struct kvmppc_spapr_tce_table *stt = kvmppc_find_table(vcpu, liobn);

	struct kvmppc_spapr_tce_table *stt;

	long ret;



	/* udbg_printf("H_PUT_TCE(): liobn=0x%lx ioba=0x%lx, tce=0x%lx\n", */

	/* 	    liobn, ioba, tce); */



	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;
@@ -240,7 +240,7 @@ long kvmppc_rm_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
	unsigned long tces, entry, ua = 0;

	unsigned long *rmap = NULL;



	stt = kvmppc_find_table(vcpu, liobn);

	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;
@@ -301,7 +301,7 @@ long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu, 
	struct kvmppc_spapr_tce_table *stt;

	long i, ret;



	stt = kvmppc_find_table(vcpu, liobn);

	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;
@@ -322,12 +322,13 @@ long kvmppc_rm_h_stuff_tce(struct kvm_vcpu *vcpu, 
long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

		      unsigned long ioba)

{

	struct kvmppc_spapr_tce_table *stt = kvmppc_find_table(vcpu, liobn);

	struct kvmppc_spapr_tce_table *stt;

	long ret;

	unsigned long idx;

	struct page *page;

	u64 *tbl;



	stt = kvmppc_find_table(vcpu->kvm, liobn);

	if (!stt)

		return H_TOO_HARD;