Changeset ef67bab in mainline for generic/src/mm

Timestamp:

2006-02-01T00:02:16Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

071a8ae6

Parents:

fc1e4f6

Message:

Memory management work.
Remove the last (i.e. 'root') argument from page_mapping_insert() and page_mapping_find().
Page table address is now extracted from the first (i.e. 'as') argument.
Add a lot of infrastructure to make the above possible.
sparc64 is now broken, most likely because of insufficient identity mapping of physical memory.

Location:

generic/src/mm

Files:

• as.c (modified) (8 diffs)
• page.c (modified) (4 diffs)

generic/src/mm/as.c

@@ -34 +34 @@
 
 #include <mm/as.h>
-#include <mm/asid.h>
+#include <arch/mm/as.h>
 #include <mm/page.h>
 #include <mm/frame.h>
@@ -43 +43 @@
 #include <mm/asid.h>
 #include <arch/mm/asid.h>
-#include <arch/mm/as.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -56 +55 @@
 #include <print.h>
 
-#define KAS_START_INDEX         PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)
-#define KAS_END_INDEX           PTL0_INDEX(KERNEL_ADDRESS_SPACE_END)
-#define KAS_INDICES             (1+(KAS_END_INDEX-KAS_START_INDEX))
+as_operations_t *as_operations = NULL;
 
 static int get_area_flags(as_area_t *a);
 
+/** Initialize address space subsystem. */
+void as_init(void)
+{
+        as_arch_init();
+        AS_KERNEL = as_create(FLAG_AS_KERNEL);
+        if (!AS_KERNEL)
+                panic("can't create kernel address space\n");
+}
+
 /** Create address space. */
-/*
- * FIXME: this interface must be meaningful for all possible VAT
- *        (Virtual Address Translation) mechanisms.
- */
-as_t *as_create(pte_t *ptl0, int flags)
+as_t *as_create(int flags)
 {
         as_t *as;
@@ -82 +84 @@
                         as->asid = ASID_INVALID;
 
-                as->ptl0 = ptl0;
-                if (!as->ptl0) {
-                        pte_t *src_ptl0, *dst_ptl0;
-                
-                        src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
-                        dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC, ONE_FRAME, NULL);
-
-//                      memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
-//                      memcpy((void *) &dst_ptl0[KAS_START_INDEX], (void *) &src_ptl0[KAS_START_INDEX], KAS_INDICES);
-                        
-                        memcpy((void *) dst_ptl0,(void *) src_ptl0, PAGE_SIZE);
-
-                        as->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
-                }
+                as->page_table = page_table_create(flags);
         }
 
@@ -187 +176 @@
          */
         
-        page_mapping_insert(as, page, frame, get_area_flags(area), (__address) as->ptl0);
+        page_mapping_insert(as, page, frame, get_area_flags(area));
         
         spinlock_unlock(&area->lock);
@@ -267 +256 @@
          * inserted into page tables.
          */
-        page_mapping_insert(AS, page, frame, get_area_flags(area), (__address) AS->ptl0);
+        page_mapping_insert(AS, page, frame, get_area_flags(area));
         
         spinlock_unlock(&area->lock);
@@ -287 +276 @@
         ipl = interrupts_disable();
         spinlock_lock(&as->lock);
-        ASSERT(as->ptl0);
-        SET_PTL0_ADDRESS(as->ptl0);
+        ASSERT(as->page_table);
+        SET_PTL0_ADDRESS(as->page_table);
         spinlock_unlock(&as->lock);
         interrupts_restore(ipl);
@@ -328 +317 @@
         return flags;
 }
+
+/** Create page table.
+ *
+ * Depending on architecture, create either address space
+ * private or global page table.
+ *
+ * @param flags Flags saying whether the page table is for kernel address space.
+ *
+ * @return First entry of the page table.
+ */
+pte_t *page_table_create(int flags)
+{
+        ASSERT(as_operations);
+        ASSERT(as_operations->page_table_create);
+
+        return as_operations->page_table_create(flags);
+}

generic/src/mm/page.c

@@ -49 +49 @@
 {
         page_arch_init();
-        page_mapping_insert(AS_KERNEL, 0x0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -69 +68 @@
 
         for (i = 0; i < cnt; i++)
-                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE);
 
 }
@@ -78 +77 @@
  * using 'flags'. Allocate and setup any missing page tables.
  *
- * @param as Address space to wich page belongs. Must be locked prior the call.
+ * The address space must be locked and interrupts must be disabled.
+ *
+ * @param as Address space to wich page belongs..
  * @param page Virtual address of the page to be mapped.
  * @param frame Physical address of memory frame to which the mapping is done.
  * @param flags Flags to be used for mapping.
- * @param root Explicit PTL0 address.
  */
-void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
+void page_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_insert);
         
-        page_operations->mapping_insert(as, page, frame, flags, root);
+        page_operations->mapping_insert(as, page, frame, flags);
 }
 
@@ -96 +96 @@
  * Find mapping for virtual page.
  *
- * @param as Address space to wich page belongs must be locked prior the call.
+ * The address space must be locked and interrupts must be disabled.
+ *
+ * @param as Address space to wich page belongs.
  * @param page Virtual page.
- * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *page_mapping_find(as_t *as, __address page, __address root)
+pte_t *page_mapping_find(as_t *as, __address page)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_find);
 
-        return page_operations->mapping_find(as, page, root);
+        return page_operations->mapping_find(as, page);
 }