Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git] / arch / x86 / kvm / paging_tmpl.h
index d07f48a..cd7a833 100644 (file)
@@ -7,7 +7,7 @@
  * MMU support
  *
  * Copyright (C) 2006 Qumranet, Inc.
- * Copyright 2010 Red Hat, Inc. and/or its affilates.
+ * Copyright 2010 Red Hat, Inc. and/or its affiliates.
  *
  * Authors:
  *   Yaniv Kamay  <yaniv@qumranet.com>
@@ -105,7 +105,7 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte)
 
        access = (gpte & (PT_WRITABLE_MASK | PT_USER_MASK)) | ACC_EXEC_MASK;
 #if PTTYPE == 64
-       if (is_nx(vcpu))
+       if (vcpu->arch.mmu.nx)
                access &= ~(gpte >> PT64_NX_SHIFT);
 #endif
        return access;
@@ -114,26 +114,32 @@ static unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, pt_element_t gpte)
 /*
  * Fetch a guest pte for a guest virtual address
  */
-static int FNAME(walk_addr)(struct guest_walker *walker,
-                           struct kvm_vcpu *vcpu, gva_t addr,
-                           int write_fault, int user_fault, int fetch_fault)
+static int FNAME(walk_addr_generic)(struct guest_walker *walker,
+                                   struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
+                                   gva_t addr, u32 access)
 {
        pt_element_t pte;
        gfn_t table_gfn;
        unsigned index, pt_access, uninitialized_var(pte_access);
        gpa_t pte_gpa;
        bool eperm, present, rsvd_fault;
+       int offset, write_fault, user_fault, fetch_fault;
+
+       write_fault = access & PFERR_WRITE_MASK;
+       user_fault = access & PFERR_USER_MASK;
+       fetch_fault = access & PFERR_FETCH_MASK;
 
        trace_kvm_mmu_pagetable_walk(addr, write_fault, user_fault,
                                     fetch_fault);
 walk:
        present = true;
        eperm = rsvd_fault = false;
-       walker->level = vcpu->arch.mmu.root_level;
-       pte = vcpu->arch.mmu.get_cr3(vcpu);
+       walker->level = mmu->root_level;
+       pte           = mmu->get_cr3(vcpu);
+
 #if PTTYPE == 64
-       if (vcpu->arch.mmu.root_level == PT32E_ROOT_LEVEL) {
-               pte = kvm_pdptr_read(vcpu, (addr >> 30) & 3);
+       if (walker->level == PT32E_ROOT_LEVEL) {
+               pte = kvm_pdptr_read_mmu(vcpu, mmu, (addr >> 30) & 3);
                trace_kvm_mmu_paging_element(pte, walker->level);
                if (!is_present_gpte(pte)) {
                        present = false;
@@ -143,7 +149,7 @@ walk:
        }
 #endif
        ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
-              (vcpu->arch.mmu.get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
+              (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
 
        pt_access = ACC_ALL;
 
@@ -151,12 +157,14 @@ walk:
                index = PT_INDEX(addr, walker->level);
 
                table_gfn = gpte_to_gfn(pte);
-               pte_gpa = gfn_to_gpa(table_gfn);
-               pte_gpa += index * sizeof(pt_element_t);
+               offset    = index * sizeof(pt_element_t);
+               pte_gpa   = gfn_to_gpa(table_gfn) + offset;
                walker->table_gfn[walker->level - 1] = table_gfn;
                walker->pte_gpa[walker->level - 1] = pte_gpa;
 
-               if (kvm_read_guest(vcpu->kvm, pte_gpa, &pte, sizeof(pte))) {
+               if (kvm_read_guest_page_mmu(vcpu, mmu, table_gfn, &pte,
+                                           offset, sizeof(pte),
+                                           PFERR_USER_MASK|PFERR_WRITE_MASK)) {
                        present = false;
                        break;
                }
@@ -205,17 +213,28 @@ walk:
                                (PTTYPE == 64 || is_pse(vcpu))) ||
                    ((walker->level == PT_PDPE_LEVEL) &&
                                is_large_pte(pte) &&
-                               vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL)) {
+                               mmu->root_level == PT64_ROOT_LEVEL)) {
                        int lvl = walker->level;
+                       gpa_t real_gpa;
+                       gfn_t gfn;
+                       u32 ac;
 
-                       walker->gfn = gpte_to_gfn_lvl(pte, lvl);
-                       walker->gfn += (addr & PT_LVL_OFFSET_MASK(lvl))
-                                       >> PAGE_SHIFT;
+                       gfn = gpte_to_gfn_lvl(pte, lvl);
+                       gfn += (addr & PT_LVL_OFFSET_MASK(lvl)) >> PAGE_SHIFT;
 
                        if (PTTYPE == 32 &&
                            walker->level == PT_DIRECTORY_LEVEL &&
                            is_cpuid_PSE36())
-                               walker->gfn += pse36_gfn_delta(pte);
+                               gfn += pse36_gfn_delta(pte);
+
+                       ac = write_fault | fetch_fault | user_fault;
+
+                       real_gpa = mmu->translate_gpa(vcpu, gfn_to_gpa(gfn),
+                                                     ac);
+                       if (real_gpa == UNMAPPED_GVA)
+                               return 0;
+
+                       walker->gfn = real_gpa >> PAGE_SHIFT;
 
                        break;
                }
@@ -250,11 +269,10 @@ error:
        walker->error_code = 0;
        if (present)
                walker->error_code |= PFERR_PRESENT_MASK;
-       if (write_fault)
-               walker->error_code |= PFERR_WRITE_MASK;
-       if (user_fault)
-               walker->error_code |= PFERR_USER_MASK;
-       if (fetch_fault && is_nx(vcpu))
+
+       walker->error_code |= write_fault | user_fault;
+
+       if (fetch_fault && mmu->nx)
                walker->error_code |= PFERR_FETCH_MASK;
        if (rsvd_fault)
                walker->error_code |= PFERR_RSVD_MASK;
@@ -266,6 +284,21 @@ error:
        return 0;
 }
 
+static int FNAME(walk_addr)(struct guest_walker *walker,
+                           struct kvm_vcpu *vcpu, gva_t addr, u32 access)
+{
+       return FNAME(walk_addr_generic)(walker, vcpu, &vcpu->arch.mmu, addr,
+                                       access);
+}
+
+static int FNAME(walk_addr_nested)(struct guest_walker *walker,
+                                  struct kvm_vcpu *vcpu, gva_t addr,
+                                  u32 access)
+{
+       return FNAME(walk_addr_generic)(walker, vcpu, &vcpu->arch.nested_mmu,
+                                       addr, access);
+}
+
 static void FNAME(update_pte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
                              u64 *spte, const void *pte)
 {
@@ -499,7 +532,6 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
 {
        int write_fault = error_code & PFERR_WRITE_MASK;
        int user_fault = error_code & PFERR_USER_MASK;
-       int fetch_fault = error_code & PFERR_FETCH_MASK;
        struct guest_walker walker;
        u64 *sptep;
        int write_pt = 0;
@@ -517,8 +549,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
        /*
         * Look up the guest pte for the faulting address.
         */
-       r = FNAME(walk_addr)(&walker, vcpu, addr, write_fault, user_fault,
-                            fetch_fault);
+       r = FNAME(walk_addr)(&walker, vcpu, addr, error_code);
 
        /*
         * The page is not mapped by the guest.  Let the guest handle it.
@@ -636,10 +667,25 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,
        gpa_t gpa = UNMAPPED_GVA;
        int r;
 
-       r = FNAME(walk_addr)(&walker, vcpu, vaddr,
-                            !!(access & PFERR_WRITE_MASK),
-                            !!(access & PFERR_USER_MASK),
-                            !!(access & PFERR_FETCH_MASK));
+       r = FNAME(walk_addr)(&walker, vcpu, vaddr, access);
+
+       if (r) {
+               gpa = gfn_to_gpa(walker.gfn);
+               gpa |= vaddr & ~PAGE_MASK;
+       } else if (error)
+               *error = walker.error_code;
+
+       return gpa;
+}
+
+static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr,
+                                     u32 access, u32 *error)
+{
+       struct guest_walker walker;
+       gpa_t gpa = UNMAPPED_GVA;
+       int r;
+
+       r = FNAME(walk_addr_nested)(&walker, vcpu, vaddr, access);
 
        if (r) {
                gpa = gfn_to_gpa(walker.gfn);