Changeset 560b81c in mainline

Timestamp:

2016-09-17T15:09:40Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ae66564

Parents:

97b8ca9

Message:

Make sure to test the present bit of the found PTE

By design, page_mapping_find() can return true and a copy of a PTE
which is not present. It is therefore necessary to test the found PTE
by PTE_PRESENT() macro.

Location:

kernel

Files:

• arch/ia64/src/mm/tlb.c (modified) (2 diffs)
• arch/sparc64/src/mm/sun4u/tlb.c (modified) (3 diffs)
• arch/sparc64/src/mm/sun4v/tlb.c (modified) (3 diffs)
• generic/src/ipc/ops/pagein.c (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)
• generic/src/mm/page.c (modified) (1 diff)

kernel/arch/ia64/src/mm/tlb.c

@@ -492 +492 @@
         bool found = page_mapping_find(AS, va, true, &t);
         if (found) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in software page hash table.
@@ -603 +605 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table.

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -201 +201 @@
         bool found = page_mapping_find(AS, istate->tpc, true, &t);
         if (found && PTE_EXECUTABLE(&t)) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table.
@@ -256 +258 @@
         bool found = page_mapping_find(as, page_16k, true, &t);
         if (found) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table.
@@ -297 +301 @@
         bool found = page_mapping_find(as, page_16k, true, &t);
         if (found && PTE_WRITABLE(&t)) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table and is

kernel/arch/sparc64/src/mm/sun4v/tlb.c

@@ -215 +215 @@
         bool found = page_mapping_find(AS, va, true, &t);
         if (found && PTE_EXECUTABLE(&t)) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table.
@@ -263 +265 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table.
@@ -299 +303 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found && PTE_WRITABLE(&t)) {
+                ASSERT(t.p);
+
                 /*
                  * The mapping was found in the software page hash table and is

kernel/generic/src/ipc/ops/pagein.c

@@ -53 +53 @@
                 bool found = page_mapping_find(AS, IPC_GET_ARG1(answer->data),
                     false, &pte);
-                if (found) {
+                if (found & PTE_PRESENT(&pte)) {
                         frame = PTE_GET_FRAME(&pte);
                         pfn_t pfn = ADDR2PFN(frame);

kernel/generic/src/mm/as.c

@@ -1457 +1457 @@
         pte_t pte;
         bool found = page_mapping_find(AS, page, false, &pte);
-        if (found) {
-                if (PTE_PRESENT(&pte)) {
-                        if (((access == PF_ACCESS_READ) && PTE_READABLE(&pte)) ||
-                            (access == PF_ACCESS_WRITE && PTE_WRITABLE(&pte)) ||
-                            (access == PF_ACCESS_EXEC && PTE_EXECUTABLE(&pte))) {
-                                page_table_unlock(AS, false);
-                                mutex_unlock(&area->lock);
-                                mutex_unlock(&AS->lock);
-                                return AS_PF_OK;
-                        }
+        if (found && PTE_PRESENT(&pte)) {
+                if (((access == PF_ACCESS_READ) && PTE_READABLE(&pte)) ||
+                    (access == PF_ACCESS_WRITE && PTE_WRITABLE(&pte)) ||
+                    (access == PF_ACCESS_EXEC && PTE_EXECUTABLE(&pte))) {
+                        page_table_unlock(AS, false);
+                        mutex_unlock(&area->lock);
+                        mutex_unlock(&AS->lock);
+                        return AS_PF_OK;
                 }
         }

kernel/generic/src/mm/page.c

@@ -142 +142 @@
  * @param[out] pte Structure that will receive a copy of the found PTE.
  *
- * @return True if the mapping was found, false otherwise.
+ * @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,