Changes in kernel/generic/src/mm/page.c [560b81c:8cbf1c3] in mainline

File:

• kernel/generic/src/mm/page.c (modified) (3 diffs)

kernel/generic/src/mm/page.c

@@ -137 +137 @@
 /** Find mapping for virtual page.
  *
- * @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 a valid PTE is returned, false otherwise. Note that
- *         the PTE is not guaranteed to be present.
- */
-NO_TRACE bool page_mapping_find(as_t *as, uintptr_t page, bool nolock,
-    pte_t *pte)
+ * @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; requested mapping
+ *         otherwise.
+ *
+ */
+NO_TRACE pte_t *page_mapping_find(as_t *as, uintptr_t page, bool nolock)
 {
         ASSERT(nolock || page_table_locked(as));
@@ -154 +153 @@
         
         return page_mapping_operations->mapping_find(as,
-            ALIGN_DOWN(page, PAGE_SIZE), nolock, pte);
-}
-
-/** Update mapping for virtual page.
- *
- * Use only to update accessed and modified/dirty bits.
- *
- * @param as       Address space to which page belongs.
- * @param page     Virtual page.
- * @param nolock   True if the page tables need not be locked.
- * @param pte      New PTE.
- */
-NO_TRACE void page_mapping_update(as_t *as, uintptr_t page, bool nolock,
-    pte_t *pte)
-{
-        ASSERT(nolock || page_table_locked(as));
-        
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_find);
-        
-        page_mapping_operations->mapping_update(as,
-            ALIGN_DOWN(page, PAGE_SIZE), nolock, pte);
+            ALIGN_DOWN(page, PAGE_SIZE), nolock);
 }
 
@@ -195 +173 @@
         page_table_lock(AS, true);
         
-        pte_t pte;
-        bool found = page_mapping_find(AS, virt, false, &pte);
-        if (!found || !PTE_VALID(&pte) || !PTE_PRESENT(&pte)) {
+        pte_t *pte = page_mapping_find(AS, virt, false);
+        if ((!PTE_VALID(pte)) || (!PTE_PRESENT(pte))) {
                 page_table_unlock(AS, true);
                 return ENOENT;
         }
         
-        *phys = PTE_GET_FRAME(&pte) +
+        *phys = PTE_GET_FRAME(pte) +
             (virt - ALIGN_DOWN(virt, PAGE_SIZE));