Changeset ef67bab in mainline for genarch/src

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:

genarch/src

Files:

• acpi/acpi.c (modified) (1 diff)
• mm/as_ht.c (added)
• mm/as_pt.c (added)
• mm/page_ht.c (modified) (4 diffs)
• mm/page_pt.c (modified) (4 diffs)

genarch/src/acpi/acpi.c

@@ -80 +80 @@
 static void map_sdt(struct acpi_sdt_header *sdt)
 {
-        page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE, 0);
+        page_mapping_insert(AS_KERNEL, (__address) sdt, (__address) sdt, PAGE_NOT_CACHEABLE);
         map_structure((__address) sdt, sdt->length);
 }

genarch/src/mm/page_ht.c

@@ -39 +39 @@
 #include <arch.h>
 #include <debug.h>
+#include <memstr.h>
 
 /**
- * This lock protects the page hash table. Note that software must
- * be still careful about ordering of writes to ensure consistent
- * view of the page hash table for hardware helpers such as VHPT
- * walker on ia64.
+ * This lock protects the page hash table.
  */
 SPINLOCK_INITIALIZE(page_ht_lock);
@@ -54 +52 @@
 pte_t *page_ht = NULL;
 
-static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
-static pte_t *ht_mapping_find(as_t *as, __address page, __address root);
+static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags);
+static pte_t *ht_mapping_find(as_t *as, __address page);
 
 page_operations_t page_ht_operations = {
         .mapping_insert = ht_mapping_insert,
-        .mapping_find = ht_mapping_find
+        .mapping_find = ht_mapping_find,
 };
 
@@ -65 +63 @@
  *
  * Map virtual address 'page' to physical address 'frame'
- * using 'flags'. In order not to disturb hardware searching,
- * new mappings are appended to the end of the collision
- * chain.
+ * using 'flags'. 
  *
- * @param as Address space to which page belongs. Must be locked prior the call.
+ * The address space must be locked and interruptsmust be disabled.
+ *
+ * @param as Address space to which 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 Ignored.
  */
-void ht_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
+void ht_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
         pte_t *t, *u;
@@ -122 +119 @@
  * Find mapping for virtual page.
  *
- * Interrupts must be disabled.
+ * The address space must be locked and interrupts must be disabled.
  *
- * @param as Address space to wich page belongs. Must be locked prior the call.
+ * @param as Address space to wich page belongs.
  * @param page Virtual page.
- * @param root Ignored.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  */
-pte_t *ht_mapping_find(as_t *as, __address page, __address root)
+pte_t *ht_mapping_find(as_t *as, __address page)
 {
         pte_t *t;

genarch/src/mm/page_pt.c

@@ -30 +30 @@
 #include <mm/page.h>
 #include <mm/frame.h>
+#include <mm/as.h>
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
@@ -37 +38 @@
 #include <memstr.h>
 
-static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root);
-static pte_t *pt_mapping_find(as_t *as, __address page, __address root);
+static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags);
+static pte_t *pt_mapping_find(as_t *as, __address page);
 
 page_operations_t page_pt_operations = {
@@ -50 +51 @@
  * using 'flags'.
  *
- * @param as Ignored.
+ * 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 pt_mapping_insert(as_t *as, __address page, __address frame, int flags, __address root)
+void pt_mapping_insert(as_t *as, __address page, __address frame, int flags)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
         __address newpt;
 
-        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
+        ptl0 = (pte_t *) PA2KA((__address) as->page_table);
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -98 +100 @@
  * Find mapping for virtual page.
  *
- * @param as Ignored.
+ * The address space must be locked and interrupts must be disabled.
+ *
+ * @param as Address space to which page belongs.
  * @param page Virtual page.
- * @param root PTL0 address if non-zero.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing the mapping otherwise.
  */
-pte_t *pt_mapping_find(as_t *as, __address page, __address root)
+pte_t *pt_mapping_find(as_t *as, __address page)
 {
         pte_t *ptl0, *ptl1, *ptl2, *ptl3;
 
-        ptl0 = (pte_t *) PA2KA(root ? root : (__address) GET_PTL0_ADDRESS());
+        ptl0 = (pte_t *) PA2KA((__address) as->page_table);
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)