Changeset fc1e4f6 in mainline for generic

Timestamp:

2006-01-31T00:44:08Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ef67bab

Parents:

6a3c9a7

Message:

Change page_mapping_find/insert interfaces to take as_t * as first argument
and not asid_t as second argument. This change was necessitated by the
removal of mapping array from as_area_t and the fact that an address
space doesn't have an ASID when it is created.

Location:

generic

Files:

• include/mm/as.h (modified) (2 diffs)
• include/mm/page.h (modified) (2 diffs)
• src/main/main.c (modified) (3 diffs)
• src/mm/as.c (modified) (3 diffs)
• src/mm/page.c (modified) (5 diffs)

generic/include/mm/as.h

@@ -49 +49 @@
 #define UDATA_ADDRESS   UDATA_ADDRESS_ARCH
 
-#define AS_KERNEL       (1<<0)          /**< Kernel address space. */
+#define FLAG_AS_KERNEL  (1<<0)          /**< Kernel address space. */
 
 enum as_area_type {
@@ -85 +85 @@
 };
 
-extern as_t * as_create(pte_t *ptl0, int flags);
+extern as_t *AS_KERNEL;
+
+extern as_t *as_create(pte_t *ptl0, int flags);
 extern as_area_t *as_area_create(as_t *as, as_area_type_t type, size_t size, __address base);
 extern void as_set_mapping(as_t *as, __address page, __address frame);

generic/include/mm/page.h

@@ -62 +62 @@
 /** Operations to manipulate page mappings. */
 struct page_operations {
-        void (* mapping_insert)(__address page, asid_t asid, __address frame, int flags, __address root);
-        pte_t *(* mapping_find)(__address page, asid_t asid, __address root);
+        void (* mapping_insert)(as_t *as, __address page, __address frame, int flags, __address root);
+        pte_t *(* mapping_find)(as_t *as, __address page, __address root);
 };
 typedef struct page_operations page_operations_t;
@@ -70 +70 @@
 
 extern void page_init(void);
-extern void page_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root);
-extern pte_t *page_mapping_find(__address page, asid_t asid, __address root);
+extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
+extern pte_t *page_mapping_find(as_t *as, __address page, __address root);
 extern void map_structure(__address s, size_t size);
 

generic/src/main/main.c

@@ -78 +78 @@
 size_t init_size = 0;
 
+/** Kernel address space. */
+as_t *AS_KERNEL = NULL;
+
 void main_bsp(void);
 void main_ap(void);
@@ -153 +156 @@
          */
         exc_init();
-        
+
+        /*
+         * Memory management subsystems initialization.
+         */     
         arch_pre_mm_init();
         early_heap_init(config.heap_addr, config.heap_size + config.heap_delta);
@@ -186 +192 @@
          * Create kernel address space.
          */
-        as = as_create(GET_PTL0_ADDRESS(), AS_KERNEL);
+        as = as_create(GET_PTL0_ADDRESS(), FLAG_AS_KERNEL);
         if (!as)
                 panic("can't create kernel address space\n");

generic/src/mm/as.c

@@ -77 +77 @@
                 list_initialize(&as->as_area_head);
 
-                if (flags & AS_KERNEL)
+                if (flags & FLAG_AS_KERNEL)
                         as->asid = ASID_KERNEL;
                 else
@@ -187 +187 @@
          */
         
-        page_mapping_insert(page, as->asid, frame, get_area_flags(area), (__address) as->ptl0);
+        page_mapping_insert(as, page, frame, get_area_flags(area), (__address) as->ptl0);
         
         spinlock_unlock(&area->lock);
@@ -267 +267 @@
          * inserted into page tables.
          */
-        page_mapping_insert(page, AS->asid, frame, get_area_flags(area), (__address) AS->ptl0);
+        page_mapping_insert(AS, page, frame, get_area_flags(area), (__address) AS->ptl0);
         
         spinlock_unlock(&area->lock);

generic/src/mm/page.c

@@ -34 +34 @@
 #include <arch/mm/page.h>
 #include <arch/mm/asid.h>
-#include <mm/asid.h>
+#include <mm/as.h>
 #include <mm/frame.h>
 #include <arch/types.h>
@@ -49 +49 @@
 {
         page_arch_init();
-        page_mapping_insert(0x0, 0, 0x0, PAGE_NOT_PRESENT, 0);
+        page_mapping_insert(AS_KERNEL, 0x0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -69 +69 @@
 
         for (i = 0; i < cnt; i++)
-                page_mapping_insert(s + i*PAGE_SIZE, ASID_KERNEL, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+                page_mapping_insert(AS_KERNEL, s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -78 +78 @@
  * using 'flags'. Allocate and setup any missing page tables.
  *
+ * @param as Address space to wich page belongs. Must be locked prior the call.
  * @param page Virtual address of the page to be mapped.
- * @param asid Address space to wich page belongs.
  * @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(__address page, asid_t asid, __address frame, int flags, __address root)
+void page_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_insert);
         
-        page_operations->mapping_insert(page, asid, frame, flags, root);
+        page_operations->mapping_insert(as, page, frame, flags, root);
 }
 
@@ -96 +96 @@
  * Find mapping for virtual page.
  *
+ * @param as Address space to wich page belongs must be locked prior the call.
  * @param page Virtual page.
- * @param asid Address space to wich page belongs.
  * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *page_mapping_find(__address page,  asid_t asid, __address root)
+pte_t *page_mapping_find(as_t *as, __address page, __address root)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_find);
 
-        return page_operations->mapping_find(page, asid, root);
+        return page_operations->mapping_find(as, page, root);
 }