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

Commit 8f0b1ab6 authored by Joerg Roedel's avatar Joerg Roedel Committed by Marcelo Tosatti
Browse files

KVM: Introduce kvm_host_page_size 



This patch introduces a generic function to find out the
host page size for a given gfn. This function is needed by
the kvm iommu code. This patch also simplifies the x86
host_mapping_level function.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c45b4fd4

arch/x86/kvm/mmu.c

+2 −16
Original line number Diff line number Diff line
@@ -468,24 +468,10 @@ static int has_wrprotected_page(struct kvm *kvm, 


static int host_mapping_level(struct kvm *kvm, gfn_t gfn)

{

	unsigned long page_size = PAGE_SIZE;

	struct vm_area_struct *vma;

	unsigned long addr;

	unsigned long page_size;

	int i, ret = 0;



	addr = gfn_to_hva(kvm, gfn);

	if (kvm_is_error_hva(addr))

		return PT_PAGE_TABLE_LEVEL;



	down_read(&current->mm->mmap_sem);

	vma = find_vma(current->mm, addr);

	if (!vma)

		goto out;



	page_size = vma_kernel_pagesize(vma);



out:

	up_read(&current->mm->mmap_sem);

	page_size = kvm_host_page_size(kvm, gfn);



	for (i = PT_PAGE_TABLE_LEVEL;

	     i < (PT_PAGE_TABLE_LEVEL + KVM_NR_PAGE_SIZES); ++i) {

include/linux/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len); 
int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);

struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);

int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);

unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);

void mark_page_dirty(struct kvm *kvm, gfn_t gfn);



void kvm_vcpu_block(struct kvm_vcpu *vcpu);

virt/kvm/kvm_main.c

+25 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/spinlock.h>

#include <linux/compat.h>

#include <linux/srcu.h>

#include <linux/hugetlb.h>



#include <asm/processor.h>

#include <asm/io.h>
@@ -867,6 +868,30 @@ int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn) 
}

EXPORT_SYMBOL_GPL(kvm_is_visible_gfn);



unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn)

{

	struct vm_area_struct *vma;

	unsigned long addr, size;



	size = PAGE_SIZE;



	addr = gfn_to_hva(kvm, gfn);

	if (kvm_is_error_hva(addr))

		return PAGE_SIZE;



	down_read(&current->mm->mmap_sem);

	vma = find_vma(current->mm, addr);

	if (!vma)

		goto out;



	size = vma_kernel_pagesize(vma);



out:

	up_read(&current->mm->mmap_sem);



	return size;

}



int memslot_id(struct kvm *kvm, gfn_t gfn)

{

	int i;