Changeset 235e6c7 in mainline

Timestamp:

2011-05-21T16:47:40Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c99693a

Parents:

0ff03f3

Message:

Propagate the nolock flag to individual mapping_find() implementations.

Location:

kernel

Files:

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

kernel/genarch/include/mm/page_pt.h

@@ -129 +129 @@
 
 extern void page_mapping_insert_pt(as_t *, uintptr_t, uintptr_t, unsigned int);
-extern pte_t *page_mapping_find_pt(as_t *, uintptr_t);
+extern pte_t *page_mapping_find_pt(as_t *, uintptr_t, bool);
 
 #endif

kernel/genarch/src/mm/page_ht.c

@@ -58 +58 @@
 static void ht_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 static void ht_mapping_remove(as_t *, uintptr_t);
-static pte_t *ht_mapping_find(as_t *, uintptr_t);
+static pte_t *ht_mapping_find(as_t *, uintptr_t, bool);
 
 /**
@@ -214 +214 @@
  * this call visible.
  *
- * @param as   Address space to wich page belongs.
+ * @param as   Address space to which page belongs.
  * @param page Virtual address of the page to be demapped.
  *
@@ -237 +237 @@
 /** Find mapping for virtual page in page hash table.
  *
- * Find mapping for virtual page.
- *
- * @param as   Address space to wich page belongs.
- * @param page Virtual page.
+ * @param as     Address space to which page belongs.
+ * @param page   Virtual page.
+ * @param nolock True if the page tables need not be locked.
  *
  * @return NULL if there is no such mapping; requested mapping otherwise.
  *
  */
-pte_t *ht_mapping_find(as_t *as, uintptr_t page)
+pte_t *ht_mapping_find(as_t *as, uintptr_t page, bool nolock)
 {
         sysarg_t key[2] = {
@@ -252 +251 @@
         };
 
-        ASSERT(page_table_locked(as));
+        ASSERT(nolock || page_table_locked(as));
         
         link_t *cur = hash_table_find(&page_ht, key);

kernel/genarch/src/mm/page_pt.c

@@ -48 +48 @@
 static void pt_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 static void pt_mapping_remove(as_t *, uintptr_t);
-static pte_t *pt_mapping_find(as_t *, uintptr_t);
+static pte_t *pt_mapping_find(as_t *, uintptr_t, bool);
 
 page_mapping_operations_t pt_mapping_operations = {
@@ -238 +238 @@
 /** Find mapping for virtual page in hierarchical page tables.
  *
- * Find mapping for virtual page.
- *
- * @param as   Address space to which page belongs.
- * @param page Virtual page.
+ * @param as     Address space to which page belongs.
+ * @param page   Virtual page.
+ * @param nolock True if the page tables need not be locked.
  *
  * @return NULL if there is no such mapping; entry from PTL3 describing
@@ -247 +246 @@
  *
  */
-pte_t *pt_mapping_find(as_t *as, uintptr_t page)
+pte_t *pt_mapping_find(as_t *as, uintptr_t page, bool nolock)
 {
-        ASSERT(page_table_locked(as));
+        ASSERT(nolock || page_table_locked(as));
 
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);

kernel/generic/include/mm/page.h

@@ -47 +47 @@
         void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
         void (* mapping_remove)(as_t *, uintptr_t);
-        pte_t *(* mapping_find)(as_t *, uintptr_t);
+        pte_t *(* mapping_find)(as_t *, uintptr_t, bool);
 } page_mapping_operations_t;
 

kernel/generic/src/mm/page.c

@@ -169 +169 @@
         ASSERT(page_mapping_operations->mapping_find);
         
-        return page_mapping_operations->mapping_find(as, page);
+        return page_mapping_operations->mapping_find(as, page, nolock);
 }