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

Commit f032b734 authored by Bharata B Rao's avatar Bharata B Rao Committed by Paul Mackerras
Browse files

KVM: PPC: Pass change type down to memslot commit function 



Currently, kvm_arch_commit_memory_region() gets called with a
parameter indicating what type of change is being made to the memslot,
but it doesn't pass it down to the platform-specific memslot commit
functions.  This adds the `change' parameter to the lower-level
functions so that they can use it in future.

[paulus@ozlabs.org - fix book E also.]

Signed-off-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: default avatarSuraj Jitindar Singh <sjitindarsingh@gmail.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 6142236c

arch/powerpc/include/asm/kvm_ppc.h

+4 −2
Original line number Diff line number Diff line
@@ -224,7 +224,8 @@ extern int kvmppc_core_prepare_memory_region(struct kvm *kvm, 
extern void kvmppc_core_commit_memory_region(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new);

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change);

extern int kvm_vm_ioctl_get_smmu_info(struct kvm *kvm,

				      struct kvm_ppc_smmu_info *info);

extern void kvmppc_core_flush_memslot(struct kvm *kvm,
@@ -294,7 +295,8 @@ struct kvmppc_ops { 
	void (*commit_memory_region)(struct kvm *kvm,

				     const struct kvm_userspace_memory_region *mem,

				     const struct kvm_memory_slot *old,

				     const struct kvm_memory_slot *new);

				     const struct kvm_memory_slot *new,

				     enum kvm_mr_change change);

	int (*unmap_hva_range)(struct kvm *kvm, unsigned long start,

			   unsigned long end);

	int (*age_hva)(struct kvm *kvm, unsigned long start, unsigned long end);

arch/powerpc/kvm/book3s.c

+3 −2
Original line number Diff line number Diff line
@@ -830,9 +830,10 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm, 
void kvmppc_core_commit_memory_region(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new)

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new);

	kvm->arch.kvm_ops->commit_memory_region(kvm, mem, old, new, change);

}



int kvm_unmap_hva_range(struct kvm *kvm, unsigned long start, unsigned long end)

arch/powerpc/kvm/book3s_hv.c

+2 −1
Original line number Diff line number Diff line
@@ -4371,7 +4371,8 @@ static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm, 
static void kvmppc_core_commit_memory_region_hv(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new)

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

	unsigned long npages = mem->memory_size >> PAGE_SHIFT;

arch/powerpc/kvm/book3s_pr.c

+2 −1
Original line number Diff line number Diff line
@@ -1914,7 +1914,8 @@ static int kvmppc_core_prepare_memory_region_pr(struct kvm *kvm, 
static void kvmppc_core_commit_memory_region_pr(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new)

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

	return;

}

arch/powerpc/kvm/booke.c

+2 −1
Original line number Diff line number Diff line
@@ -1833,7 +1833,8 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm, 
void kvmppc_core_commit_memory_region(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new)

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

}