summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-01-28 12:37:56 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2010-03-01 12:36:08 -0300
commit8f0b1ab6fb045a1324d9435ba00c2940783b0041 (patch)
tree34db9f9080cea014150249da16348ed3e3e01fc3 /arch/x86
parentc45b4fd416f5497b6b38dd70acc0e5b01399e5c9 (diff)
downloadlinux-3.10-8f0b1ab6fb045a1324d9435ba00c2940783b0041.tar.gz
linux-3.10-8f0b1ab6fb045a1324d9435ba00c2940783b0041.tar.bz2
linux-3.10-8f0b1ab6fb045a1324d9435ba00c2940783b0041.zip
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: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/mmu.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index dc4d954efac..913ef4b7939 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -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) {