Changes in kernel/genarch/src/mm/page_pt.c [346b12a2:de73242] in mainline

File:

• kernel/genarch/src/mm/page_pt.c (modified) (12 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -53 +53 @@
 static void pt_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 static void pt_mapping_remove(as_t *, uintptr_t);
-static bool pt_mapping_find(as_t *, uintptr_t, bool, pte_t *pte);
-static void pt_mapping_update(as_t *, uintptr_t, bool, pte_t *pte);
+static pte_t *pt_mapping_find(as_t *, uintptr_t, bool);
 static void pt_mapping_make_global(uintptr_t, size_t);
 
@@ -61 +60 @@
         .mapping_remove = pt_mapping_remove,
         .mapping_find = pt_mapping_find,
-        .mapping_update = pt_mapping_update,
         .mapping_make_global = pt_mapping_make_global
 };
@@ -84 +82 @@
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL1_FRAMES, FRAME_LOWMEM, PTL1_SIZE - 1));
-                memsetb(newpt, PTL1_SIZE, 0);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL1_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
+                memsetb(newpt, FRAME_SIZE << PTL1_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
@@ -103 +101 @@
         
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL2_FRAMES, FRAME_LOWMEM, PTL2_SIZE - 1));
-                memsetb(newpt, PTL2_SIZE, 0);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL2_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
+                memsetb(newpt, FRAME_SIZE << PTL2_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
@@ -114 +112 @@
                  */
                 write_barrier();
-                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));
+                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
         }
         
@@ -120 +118 @@
         
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *)
-                    PA2KA(frame_alloc(PTL3_FRAMES, FRAME_LOWMEM, PTL2_SIZE - 1));
-                memsetb(newpt, PTL2_SIZE, 0);
+                pte_t *newpt = (pte_t *) frame_alloc(PTL3_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
+                memsetb(newpt, FRAME_SIZE << PTL3_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
@@ -182 +180 @@
          * Destroy the mapping.
          * Setting to PAGE_NOT_PRESENT is not sufficient.
-         * But we need SET_FRAME for possible PT coherence maintenance.
-         * At least on ARM.
-         */
-        //TODO: Fix this inconsistency
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), PAGE_NOT_PRESENT);
+         */
         memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
         
@@ -221 +215 @@
                 memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
 #endif
-                frame_free(KA2PA((uintptr_t) ptl3), PTL3_FRAMES);
+                frame_free(KA2PA((uintptr_t) ptl3));
         } else {
                 /*
@@ -255 +249 @@
                 memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
 #endif
-                frame_free(KA2PA((uintptr_t) ptl2), PTL2_FRAMES);
+                frame_free(KA2PA((uintptr_t) ptl2));
         } else {
                 /*
@@ -286 +280 @@
 
                 memsetb(&ptl0[PTL0_INDEX(page)], sizeof(pte_t), 0);
-                frame_free(KA2PA((uintptr_t) ptl1), PTL1_FRAMES);
+                frame_free(KA2PA((uintptr_t) ptl1));
         }
 #endif /* PTL1_ENTRIES != 0 */
 }
 
-static pte_t *pt_mapping_find_internal(as_t *as, uintptr_t page, bool nolock)
+/** Find mapping for virtual page in hierarchical page tables.
+ *
+ * @param as     Address space to which page belongs.
+ * @param page   Virtual page.
+ * @param nolock True if the page tables need not be locked.
+ *
+ * @return NULL if there is no such mapping; entry from PTL3 describing
+ *         the mapping otherwise.
+ *
+ */
+pte_t *pt_mapping_find(as_t *as, uintptr_t page, bool nolock)
 {
         ASSERT(nolock || page_table_locked(as));
@@ -326 +330 @@
         
         return &ptl3[PTL3_INDEX(page)];
-}
-
-/** Find mapping for virtual page in hierarchical page tables.
- *
- * @param as       Address space to which page belongs.
- * @param page     Virtual page.
- * @param nolock   True if the page tables need not be locked.
- * @param[out] pte Structure that will receive a copy of the found PTE.
- *
- * @return True if the mapping was found, false otherwise.
- */
-bool pt_mapping_find(as_t *as, uintptr_t page, bool nolock, pte_t *pte)
-{
-        pte_t *t = pt_mapping_find_internal(as, page, nolock);
-        if (t)
-                *pte = *t;
-        return t != NULL;
-}
-
-/** Update mapping for virtual page in hierarchical page tables.
- *
- * @param as       Address space to which page belongs.
- * @param page     Virtual page.
- * @param nolock   True if the page tables need not be locked.
- * @param[in] pte  New PTE.
- */
-void pt_mapping_update(as_t *as, uintptr_t page, bool nolock, pte_t *pte)
-{
-        pte_t *t = pt_mapping_find_internal(as, page, nolock);
-        if (!t)
-                panic("Updating non-existent PTE");     
-
-        ASSERT(PTE_VALID(t) == PTE_VALID(pte));
-        ASSERT(PTE_PRESENT(t) == PTE_PRESENT(pte));
-        ASSERT(PTE_GET_FRAME(t) == PTE_GET_FRAME(pte));
-        ASSERT(PTE_WRITABLE(t) == PTE_WRITABLE(pte));
-        ASSERT(PTE_EXECUTABLE(t) == PTE_EXECUTABLE(pte));
-
-        *t = *pte;
 }
 
@@ -394 +359 @@
  * @param size Size in bytes defining the range of PTL0 entries that will be
  *             altered by this function.
- *
  */
 void pt_mapping_make_global(uintptr_t base, size_t size)
 {
-        ASSERT(size > 0);
-        
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
         uintptr_t ptl0_step = ptl0_step_get();
-        size_t frames;
-        
+        size_t order;
+        uintptr_t addr;
+
 #if (PTL1_ENTRIES != 0)
-        frames = PTL1_FRAMES;
+        order = PTL1_SIZE;
 #elif (PTL2_ENTRIES != 0)
-        frames = PTL2_FRAMES;
+        order = PTL2_SIZE;
 #else
-        frames = PTL3_FRAMES;
-#endif
-        
-        for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step);
-            addr - 1 < base + size - 1;
+        order = PTL3_SIZE;
+#endif
+
+        ASSERT(size > 0);
+
+        for (addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1;
             addr += ptl0_step) {
-                if (GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr))) {
-                        ASSERT(overlaps(addr, ptl0_step,
-                            config.identity_base, config.identity_size));
-
-                        /*
-                         * This PTL0 entry also maps the kernel identity region,
-                         * so it is already global and initialized.
-                         */
-                        continue;
-                }
-
-                uintptr_t l1 = PA2KA(frame_alloc(frames, FRAME_LOWMEM, 0));
-                memsetb((void *) l1, FRAMES2SIZE(frames), 0);
+                uintptr_t l1;
+
+                l1 = (uintptr_t) frame_alloc(order, FRAME_KA | FRAME_LOWMEM);
+                memsetb((void *) l1, FRAME_SIZE << order, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),