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

KVM: Let/force architectures to deal with arch specific memslot data 



Pass the "old" slot to kvm_arch_prepare_memory_region() and force arch
code to handle propagating arch specific data from "new" to "old" when
necessary.  This is a baby step towards dynamically allocating "new" from
the get go, and is a (very) minor performance boost on x86 due to not
unnecessarily copying arch data.

For PPC HV, copy the rmap in the !CREATE and !DELETE paths, i.e. for MOVE
and FLAGS_ONLY.  This is functionally a nop as the previous behavior
would overwrite the pointer for CREATE, and eventually discard/ignore it
for DELETE.

For x86, copy the arch data only for FLAGS_ONLY changes.  Unlike PPC HV,
x86 needs to reallocate arch data in the MOVE case as the size of x86's
allocations depend on the alignment of the memslot's gfn.

Opportunistically tweak kvm_arch_prepare_memory_region()'s param order to
match the "commit" prototype.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMaciej S. Szmigiero <maciej.szmigiero@oracle.com>
[mss: add missing RISCV kvm_arch_prepare_memory_region() change]
Signed-off-by: default avatarMaciej S. Szmigiero <maciej.szmigiero@oracle.com>
Message-Id: <67dea5f11bbcfd71e3da5986f11e87f5dd4013f9.1638817639.git.maciej.szmigiero@oracle.com>
parent ce5f0215

arch/arm64/kvm/mmu.c

+4 −3
Original line number Diff line number Diff line
@@ -1486,8 +1486,9 @@ void kvm_arch_commit_memory_region(struct kvm *kvm, 
}



int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

				   const struct kvm_userspace_memory_region *mem,

				   const struct kvm_memory_slot *old,

				   struct kvm_memory_slot *new,

				   enum kvm_mr_change change)

{

	hva_t hva = mem->userspace_addr;
@@ -1502,7 +1503,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 
	 * Prevent userspace from creating a memory region outside of the IPA

	 * space addressable by the KVM guest IPA space.

	 */

	if ((memslot->base_gfn + memslot->npages) > (kvm_phys_size(kvm) >> PAGE_SHIFT))

	if ((new->base_gfn + new->npages) > (kvm_phys_size(kvm) >> PAGE_SHIFT))

		return -EFAULT;



	mmap_read_lock(current->mm);
@@ -1536,7 +1537,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, 


		if (vma->vm_flags & VM_PFNMAP) {

			/* IO region dirty page logging not allowed */

			if (memslot->flags & KVM_MEM_LOG_DIRTY_PAGES) {

			if (new->flags & KVM_MEM_LOG_DIRTY_PAGES) {

				ret = -EINVAL;

				break;

			}

arch/mips/kvm/mips.c

+2 −1
Original line number Diff line number Diff line
@@ -214,8 +214,9 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm, 
}



int kvm_arch_prepare_memory_region(struct kvm *kvm,

				   struct kvm_memory_slot *memslot,

				   const struct kvm_userspace_memory_region *mem,

				   const struct kvm_memory_slot *old,

				   struct kvm_memory_slot *new,

				   enum kvm_mr_change change)

{

	return 0;

arch/powerpc/include/asm/kvm_ppc.h

+6 −4
Original line number Diff line number Diff line
@@ -200,12 +200,13 @@ extern void kvmppc_core_destroy_vm(struct kvm *kvm); 
extern void kvmppc_core_free_memslot(struct kvm *kvm,

				     struct kvm_memory_slot *slot);

extern int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				struct kvm_memory_slot *new,

				enum kvm_mr_change change);

extern void kvmppc_core_commit_memory_region(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change);

extern int kvm_vm_ioctl_get_smmu_info(struct kvm *kvm,
@@ -274,12 +275,13 @@ struct kvmppc_ops { 
	int (*get_dirty_log)(struct kvm *kvm, struct kvm_dirty_log *log);

	void (*flush_memslot)(struct kvm *kvm, struct kvm_memory_slot *memslot);

	int (*prepare_memory_region)(struct kvm *kvm,

				     struct kvm_memory_slot *memslot,

				     const struct kvm_userspace_memory_region *mem,

				     const struct kvm_memory_slot *old,

				     struct kvm_memory_slot *new,

				     enum kvm_mr_change change);

	void (*commit_memory_region)(struct kvm *kvm,

				     const struct kvm_userspace_memory_region *mem,

				     const struct kvm_memory_slot *old,

				     struct kvm_memory_slot *old,

				     const struct kvm_memory_slot *new,

				     enum kvm_mr_change change);

	bool (*unmap_gfn_range)(struct kvm *kvm, struct kvm_gfn_range *range);

arch/powerpc/kvm/book3s.c

+6 −6
Original line number Diff line number Diff line
@@ -847,17 +847,17 @@ void kvmppc_core_flush_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot) 
}



int kvmppc_core_prepare_memory_region(struct kvm *kvm,

				struct kvm_memory_slot *memslot,

				      const struct kvm_userspace_memory_region *mem,

				      const struct kvm_memory_slot *old,

				      struct kvm_memory_slot *new,

				      enum kvm_mr_change change)

{

	return kvm->arch.kvm_ops->prepare_memory_region(kvm, memslot, mem,

							change);

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

}



void kvmppc_core_commit_memory_region(struct kvm *kvm,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

arch/powerpc/kvm/book3s_hv.c

+10 −7
Original line number Diff line number Diff line
@@ -4854,17 +4854,20 @@ static void kvmppc_core_free_memslot_hv(struct kvm_memory_slot *slot) 
}



static int kvmppc_core_prepare_memory_region_hv(struct kvm *kvm,

					struct kvm_memory_slot *slot,

				const struct kvm_userspace_memory_region *mem,

				const struct kvm_memory_slot *old,

				struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{

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



	if (change == KVM_MR_CREATE) {

		slot->arch.rmap = vzalloc(array_size(npages,

					  sizeof(*slot->arch.rmap)));

		if (!slot->arch.rmap)

		new->arch.rmap = vzalloc(array_size(npages,

					  sizeof(*new->arch.rmap)));

		if (!new->arch.rmap)

			return -ENOMEM;

	} else if (change != KVM_MR_DELETE) {

		new->arch.rmap = old->arch.rmap;

	}



	return 0;
@@ -4872,7 +4875,7 @@ 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,

				struct kvm_memory_slot *old,

				const struct kvm_memory_slot *new,

				enum kvm_mr_change change)

{