Changeset 2299914 in mainline for genarch/src/mm/page_ht.c

Timestamp:

2006-03-16T12:57:31Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e898a8d7

Parents:

b7dcabb

Message:

Page table locking.

File:

• genarch/src/mm/page_ht.c (modified) (9 diffs)

genarch/src/mm/page_ht.c

@@ -53 +53 @@
 
 /**
- * This lock protects the page hash table.
+ * This lock protects the page hash table. It must be acquired
+ * after address space lock and after any address space area
+ * locks.
  */
 SPINLOCK_INITIALIZE(page_ht_lock);
@@ -156 +158 @@
  * using 'flags'. 
  *
- * The address space must be locked and interruptsmust be disabled.
+ * The page table must be locked and interrupts must be disabled.
  *
  * @param as Address space to which page belongs.
@@ -168 +170 @@
         __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
-        spinlock_lock(&page_ht_lock);
-
         if (!hash_table_find(&page_ht, key)) {
                 t = (pte_t *) malloc(sizeof(pte_t), FRAME_ATOMIC);
@@ -187 +187 @@
                 hash_table_insert(&page_ht, key, &t->link);
         }
-        
-        spinlock_unlock(&page_ht_lock);
 }
 
@@ -197 +195 @@
  * this call visible.
  *
- * The address space must be locked and interrupts must be disabled.
+ * The page table must be locked and interrupts must be disabled.
  *
  * @param as Address space to wich page belongs.
@@ -206 +204 @@
         __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
-        spinlock_lock(&page_ht_lock);
-
         /*
          * Note that removed PTE's will be freed
@@ -213 +209 @@
          */
         hash_table_remove(&page_ht, key, 2);
-
-        spinlock_unlock(&page_ht_lock);
 }
 
@@ -222 +216 @@
  * Find mapping for virtual page.
  *
- * The address space must be locked and interrupts must be disabled.
+ * The page table must be locked and interrupts must be disabled.
  *
  * @param as Address space to wich page belongs.
@@ -235 +229 @@
         __native key[2] = { (__address) as, page = ALIGN_DOWN(page, PAGE_SIZE) };
         
-        spinlock_lock(&page_ht_lock);
-
         hlp = hash_table_find(&page_ht, key);
         if (hlp)
                 t = hash_table_get_instance(hlp, pte_t, link);
 
-        spinlock_unlock(&page_ht_lock);
         return t;
 }