Changeset 8f00329 in mainline

Timestamp:

2006-02-09T21:59:31Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a3eeceb6

Parents:

bfb87df

Message:

Add page_mapping_remove().

Files:

• genarch/src/mm/page_ht.c (modified) (4 diffs)
• genarch/src/mm/page_pt.c (modified) (2 diffs)
• generic/include/mm/page.h (modified) (2 diffs)
• generic/src/mm/page.c (modified) (3 diffs)

genarch/src/mm/page_ht.c

@@ -48 +48 @@
 
 static void ht_mapping_insert(as_t *as, __address page, __address frame, int flags);
+static void ht_mapping_remove(as_t *as, __address page);
 static pte_t *ht_mapping_find(as_t *as, __address page);
 
@@ -71 +72 @@
 page_mapping_operations_t ht_mapping_operations = {
         .mapping_insert = ht_mapping_insert,
+        .mapping_remove = ht_mapping_remove,
         .mapping_find = ht_mapping_find
 };
@@ -163 +165 @@
 {
         pte_t *t;
-        ipl_t ipl;
         __native key[2] = { (__address) as, page };
         
-        ipl = interrupts_disable();
         spinlock_lock(&page_ht_lock);
 
@@ -177 +177 @@
         
         spinlock_unlock(&page_ht_lock);
-        interrupts_restore(ipl);
-}
+}
+
+/** Remove mapping of page from page hash table.
+ *
+ * Remove any mapping of 'page' within address space 'as'.
+ * TLB shootdown should follow in order to make effects of
+ * this call visible.
+ *
+ * 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 demapped.
+ */
+void ht_mapping_remove(as_t *as, __address page)
+{
+        __native key[2] = { (__address) as, page };
+        
+        spinlock_lock(&page_ht_lock);
+
+        /*
+         * Note that removed PTE's will be freed
+         * by remove_callback().
+         */
+        hash_table_remove(&page_ht, key, 2);
+
+        spinlock_unlock(&page_ht_lock);
+}
+
 
 /** Find mapping for virtual page in page hash table.

genarch/src/mm/page_pt.c

@@ -39 +39 @@
 
 static void pt_mapping_insert(as_t *as, __address page, __address frame, int flags);
+static void pt_mapping_remove(as_t *as, __address page);
 static pte_t *pt_mapping_find(as_t *as, __address page);
 
 page_mapping_operations_t pt_mapping_operations = {
         .mapping_insert = pt_mapping_insert,
+        .mapping_remove = pt_mapping_remove,
         .mapping_find = pt_mapping_find
 };
@@ -96 +98 @@
 }
 
+/** Remove mapping of page from hierarchical page tables.
+ *
+ * Remove any mapping of 'page' within address space 'as'.
+ * TLB shootdown should follow in order to make effects of
+ * this call visible.
+ *
+ * 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 demapped.
+ */
+void pt_mapping_remove(as_t *as, __address page)
+{
+        pte_t *ptl0, *ptl1, *ptl2, *ptl3;
+
+        ptl0 = (pte_t *) PA2KA((__address) as->page_table);
+
+        if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
+                return;
+
+        ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
+
+        if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
+                return;
+
+        ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
+
+        if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
+                return;
+
+        ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
+
+        /* Destroy the mapping. Setting to PAGE_NOT_PRESENT is not sufficient. */
+        memsetb((__address) &ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);
+}
+
 /** Find mapping for virtual page in hierarchical page tables.
  *

generic/include/mm/page.h

@@ -63 +63 @@
 struct page_mapping_operations {
         void (* mapping_insert)(as_t *as, __address page, __address frame, int flags);
+        void (* mapping_remove)(as_t *as, __address page);
         pte_t *(* mapping_find)(as_t *as, __address page);
 };
@@ -71 +72 @@
 extern void page_init(void);
 extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags);
+extern void page_mapping_remove(as_t *as, __address page);
 extern pte_t *page_mapping_find(as_t *as, __address page);
 extern pte_t *page_table_create(int flags);

generic/src/mm/page.c

@@ -72 +72 @@
 }
 
-/** Map page to frame
+/** Insert mapping of page to frame.
  *
  * Map virtual address 'page' to physical address 'frame'
@@ -79 +79 @@
  * The address space must be locked and interrupts must be disabled.
  *
- * @param as Address space to wich page belongs..
+ * @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.
@@ -90 +90 @@
         
         page_mapping_operations->mapping_insert(as, page, frame, flags);
+}
+
+/** Remove mapping of page.
+ *
+ * Remove any mapping of 'page' within address space 'as'.
+ * TLB shootdown should follow in order to make effects of
+ * this call visible.
+ *
+ * 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 demapped.
+ */
+void page_mapping_remove(as_t *as, __address page)
+{
+        ASSERT(page_mapping_operations);
+        ASSERT(page_mapping_operations->mapping_remove);
+        
+        page_mapping_operations->mapping_remove(as, page);
 }