Changeset 677a6d5 in mainline for generic

Timestamp:

2006-01-08T16:24:32Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f275cb3

Parents:

59adc2b

Message:

Memory management work.
Pass address space identifier to functions in page_operations to support single global page hash table.

Location:

generic

Files:

• include/mm/asid.h (added)
• include/mm/page.h (modified) (3 diffs)
• src/mm/page.c (modified) (6 diffs)
• src/mm/vm.c (modified) (2 diffs)

generic/include/mm/page.h

@@ -30 +30 @@
 #define __PAGE_H__
 
+#include <arch/mm/asid.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -57 +58 @@
 
 struct page_operations {
-        void (* mapping_insert)(__address page, __address frame, int flags, __address root);
-        pte_t *(* mapping_find)(__address page, __address root);
+        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);
 };
 typedef struct page_operations page_operations_t;
@@ -65 +66 @@
 
 extern void page_init(void);
-extern void page_mapping_insert(__address page, __address frame, int flags, __address root);
-extern pte_t *page_mapping_find(__address page, __address root);
+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 map_structure(__address s, size_t size);
 

generic/src/mm/page.c

@@ -28 +28 @@
 
 #include <mm/page.h>
+#include <arch/mm/page.h>
+#include <arch/mm/asid.h>
+#include <mm/asid.h>
 #include <mm/frame.h>
-#include <arch/mm/page.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -35 +37 @@
 #include <memstr.h>
 #include <debug.h>
+#include <arch.h>
 
 /** Virtual operations for page subsystem. */
@@ -42 +45 @@
 {
         page_arch_init();
-        page_mapping_insert(0x0, 0x0, PAGE_NOT_PRESENT, 0);
+        page_mapping_insert(0x0, 0, 0x0, PAGE_NOT_PRESENT, 0);
 }
 
@@ -62 +65 @@
 
         for (i = 0; i < cnt; i++)
-                page_mapping_insert(s + i*PAGE_SIZE, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
+                page_mapping_insert(s + i*PAGE_SIZE, ASID_KERNEL, s + i*PAGE_SIZE, PAGE_NOT_CACHEABLE, 0);
 
 }
@@ -72 +75 @@
  *
  * @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, __address frame, int flags, __address root)
+void page_mapping_insert(__address page, asid_t asid, __address frame, int flags, __address root)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_insert);
         
-        page_operations->mapping_insert(page, frame, flags, root);
+        page_operations->mapping_insert(page, asid, frame, flags, root);
 }
 
@@ -89 +93 @@
  *
  * @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; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *page_mapping_find(__address page, __address root)
+pte_t *page_mapping_find(__address page,  asid_t asid, __address root)
 {
         ASSERT(page_operations);
         ASSERT(page_operations->mapping_find);
 
-        return page_operations->mapping_find(page, root);
+        return page_operations->mapping_find(page, asid, root);
 }

generic/src/mm/vm.c

@@ -163 +163 @@
         ASSERT(m->ptl0);
         for (i=0; i<a->size; i++)
-                page_mapping_insert(a->address + i*PAGE_SIZE, a->mapping[i], flags, (__address) m->ptl0);
+                page_mapping_insert(a->address + i*PAGE_SIZE, m->asid, a->mapping[i], flags, (__address) m->ptl0);
                 
         spinlock_unlock(&a->lock);
@@ -181 +181 @@
         ASSERT(m->ptl0);
         for (i=0; i<a->size; i++)               
-                page_mapping_insert(a->address + i*PAGE_SIZE, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
+                page_mapping_insert(a->address + i*PAGE_SIZE, 0, 0, PAGE_NOT_PRESENT, (__address) m->ptl0);
         
         spinlock_unlock(&a->lock);