Changes in kernel/genarch/src/mm/as_pt.c [fdaad75d:af863d0] in mainline

File:

• kernel/genarch/src/mm/as_pt.c (modified) (8 diffs)

kernel/genarch/src/mm/as_pt.c

@@ -33 +33 @@
 /**
  * @file
- * @brief Address space functions for 4-level hierarchical pagetables.
+ * @brief       Address space functions for 4-level hierarchical pagetables.
  */
 
@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
-#include <typedefs.h>
+#include <arch/types.h>
 #include <memstr.h>
 #include <arch.h>
 
-static pte_t *ptl0_create(unsigned int);
-static void ptl0_destroy(pte_t *);
+static pte_t *ptl0_create(int flags);
+static void ptl0_destroy(pte_t *page_table);
 
-static void pt_lock(as_t *, bool);
-static void pt_unlock(as_t *, bool);
-static bool pt_locked(as_t *);
+static void pt_lock(as_t *as, bool lock);
+static void pt_unlock(as_t *as, bool unlock);
 
 as_operations_t as_pt_operations = {
@@ -58 +57 @@
         .page_table_destroy = ptl0_destroy,
         .page_table_lock = pt_lock,
-        .page_table_unlock = pt_unlock,
-        .page_table_locked = pt_locked,
+        .page_table_unlock = pt_unlock
 };
 
@@ -69 +67 @@
  *
  * @return New PTL0.
- *
  */
-pte_t *ptl0_create(unsigned int flags)
+pte_t *ptl0_create(int flags)
 {
-        pte_t *dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE, FRAME_KA);
-        size_t table_size = FRAME_SIZE << PTL0_SIZE;
+        pte_t *src_ptl0, *dst_ptl0;
+        ipl_t ipl;
+        int table_size;
+
+        dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE, FRAME_KA);
+        table_size = FRAME_SIZE << PTL0_SIZE;
+
+        if (flags & FLAG_AS_KERNEL) {
+                memsetb(dst_ptl0, table_size, 0);
+        } else {
+                uintptr_t src, dst;
         
-        if (flags & FLAG_AS_KERNEL)
-                memsetb(dst_ptl0, table_size, 0);
-        else {
                 /*
                  * Copy the kernel address space portion to new PTL0.
-                 *
                  */
-                
-                mutex_lock(&AS_KERNEL->lock);
-                
-                pte_t *src_ptl0 =
-                    (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
-                
-                uintptr_t src =
-                    (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-                uintptr_t dst =
-                    (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-                
+                 
+                ipl = interrupts_disable();
+                mutex_lock(&AS_KERNEL->lock);           
+                src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
+
+                src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+                dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+
                 memsetb(dst_ptl0, table_size, 0);
-                memcpy((void *) dst, (void *) src,
-                    table_size - (src - (uintptr_t) src_ptl0));
-                
+                memcpy((void *) dst, (void *) src, table_size - (src - (uintptr_t) src_ptl0));
                 mutex_unlock(&AS_KERNEL->lock);
+                interrupts_restore(ipl);
         }
-        
+
         return (pte_t *) KA2PA((uintptr_t) dst_ptl0);
 }
@@ -109 +107 @@
  *
  * @param page_table Physical address of PTL0.
- *
  */
 void ptl0_destroy(pte_t *page_table)
 {
-        frame_free((uintptr_t) page_table);
+        frame_free((uintptr_t)page_table);
 }
 
@@ -121 +118 @@
  * Interrupts must be disabled.
  *
- * @param as   Address space.
+ * @param as Address space.
  * @param lock If false, do not attempt to lock the address space.
- *
  */
 void pt_lock(as_t *as, bool lock)
@@ -136 +132 @@
  * Interrupts must be disabled.
  *
- * @param as     Address space.
+ * @param as Address space.
  * @param unlock If false, do not attempt to unlock the address space.
- *
  */
 void pt_unlock(as_t *as, bool unlock)
@@ -146 +141 @@
 }
 
-/** Test whether page tables are locked.
- *
- * @param as            Address space where the page tables belong.
- *
- * @return              True if the page tables belonging to the address soace
- *                      are locked, otherwise false.
- */
-bool pt_locked(as_t *as)
-{
-        return mutex_locked(&as->lock);
-}
-
 /** @}
  */