Changeset c868e2d in mainline

Timestamp:

2011-12-19T23:42:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

398e33be

Parents:

7aaed09

Message:

Add and apply page_mapping_make_global() on each span added to the
kernel non-identity. This ensures that the kernel non-identity will use
the same set of page tables in all address spaces.

Location:

kernel

Files:

• genarch/src/mm/page_ht.c (modified) (3 diffs)
• genarch/src/mm/page_pt.c (modified) (4 diffs)
• generic/include/mm/page.h (modified) (2 diffs)
• generic/src/mm/km.c (modified) (2 diffs)
• generic/src/mm/page.c (modified) (1 diff)

kernel/genarch/src/mm/page_ht.c

@@ -59 +59 @@
 static void ht_mapping_remove(as_t *, uintptr_t);
 static pte_t *ht_mapping_find(as_t *, uintptr_t, bool);
+static void ht_mapping_make_global(uintptr_t, size_t);
 
 slab_cache_t *pte_cache = NULL;
@@ -88 +89 @@
         .mapping_insert = ht_mapping_insert,
         .mapping_remove = ht_mapping_remove,
-        .mapping_find = ht_mapping_find
+        .mapping_find = ht_mapping_find,
+        .mapping_make_global = ht_mapping_make_global
 };
 
@@ -262 +264 @@
 }
 
+void ht_mapping_make_global(uintptr_t base, size_t size)
+{
+        /* nothing to do */
+}
+
 /** @}
  */

kernel/genarch/src/mm/page_pt.c

@@ -46 +46 @@
 #include <arch/asm.h>
 #include <memstr.h>
+#include <align.h>
+#include <macros.h>
 
 static void pt_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 static void pt_mapping_remove(as_t *, uintptr_t);
 static pte_t *pt_mapping_find(as_t *, uintptr_t, bool);
+static void pt_mapping_make_global(uintptr_t, size_t);
 
 page_mapping_operations_t pt_mapping_operations = {
         .mapping_insert = pt_mapping_insert,
         .mapping_remove = pt_mapping_remove,
-        .mapping_find = pt_mapping_find
+        .mapping_find = pt_mapping_find,
+        .mapping_make_global = pt_mapping_make_global
 };
 
@@ -133 +137 @@
         /*
          * First, remove the mapping, if it exists.
-         *
          */
         
@@ -150 +153 @@
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
         
-        /* Destroy the mapping. Setting to PAGE_NOT_PRESENT is not sufficient. */
+        /*
+         * Destroy the mapping.
+         * Setting to PAGE_NOT_PRESENT is not sufficient.
+         */
         memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
         
@@ -286 +292 @@
 }
 
+/** Make the mappings in the given range global accross all address spaces.
+ *
+ * All PTL0 entries in the given range will be mapped to a next level page
+ * table. The next level page table will be allocated and cleared.
+ *
+ * pt_mapping_remove() will never deallocate these page tables even when there
+ * are no PTEs in them.
+ *
+ * @param as   Address space.
+ * @param base Base address corresponding to the first PTL0 entry that will be
+ *             altered by this function.
+ * @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)
+{
+        uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
+        uintptr_t ptl0step = (((uintptr_t) -1) / PTL0_ENTRIES) + 1;
+        size_t order;
+        uintptr_t addr;
+
+#if (PTL1_ENTRIES != 0)
+        order = PTL1_SIZE;
+#elif (PTL2_ENTRIES != 0)
+        order = PTL2_SIZE;
+#else
+        order = PTL3_SIZE;
+#endif
+
+        ASSERT(ispwr2(ptl0step));
+
+        for (addr = ALIGN_DOWN(base, ptl0step); addr < base + size;
+            addr += ptl0step) {
+                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),
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_WRITE);
+        }
+}
+
 /** @}
  */

kernel/generic/include/mm/page.h

@@ -49 +49 @@
         void (* mapping_remove)(as_t *, uintptr_t);
         pte_t *(* mapping_find)(as_t *, uintptr_t, bool);
+        void (* mapping_make_global)(uintptr_t, size_t);
 } page_mapping_operations_t;
 
@@ -60 +61 @@
 extern void page_mapping_remove(as_t *, uintptr_t);
 extern pte_t *page_mapping_find(as_t *, uintptr_t, bool);
+extern void page_mapping_make_global(uintptr_t, size_t);
 extern pte_t *page_table_create(unsigned int);
 extern void page_table_destroy(pte_t *);

kernel/generic/src/mm/km.c

@@ -38 +38 @@
 #include <mm/km.h>
 #include <arch/mm/km.h>
+#include <mm/page.h>
 #include <config.h>
 #include <typedefs.h>
@@ -70 +71 @@
         bool span_added;
 
+        page_mapping_make_global(base, size);
+
         span_added = ra_span_add(km_ni_arena, base, size);
         ASSERT(span_added);

kernel/generic/src/mm/page.c

@@ -178 +178 @@
 }
 
+/** Make the mapping shared by all page tables (not address spaces).
+ * 
+ * @param base Starting virtual address of the range that is made global.
+ * @param size Size of the address range that is made global.
+ */
+void page_mapping_make_global(uintptr_t base, size_t size)
+{
+        ASSERT(page_mapping_operations);
+        ASSERT(page_mapping_operations->mapping_make_global);
+        
+        return page_mapping_operations->mapping_make_global(base, size);
+}
+
 uintptr_t hw_map(uintptr_t physaddr, size_t size)
 {