Changes in kernel/genarch/src/mm/as_ht.c [fb63c06:f97f1e51] in mainline

File:

• kernel/genarch/src/mm/as_ht.c (modified) (5 diffs)

kernel/genarch/src/mm/as_ht.c

@@ -77 +77 @@
         if (flags & FLAG_AS_KERNEL) {
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
+                mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
                 pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
                     NULL, NULL, SLAB_CACHE_MAGDEFERRED);
@@ -98 +99 @@
 /** Lock page table.
  *
- * Lock address space.
+ * Lock address space and page hash table.
  * Interrupts must be disabled.
  *
@@ -109 +110 @@
         if (lock)
                 mutex_lock(&as->lock);
+        
+        mutex_lock(&page_ht_lock);
 }
 
 /** Unlock page table.
  *
- * Unlock address space.
+ * Unlock address space and page hash table.
  * Interrupts must be disabled.
  *
@@ -122 +125 @@
 void ht_unlock(as_t *as, bool unlock)
 {
+        mutex_unlock(&page_ht_lock);
+        
         if (unlock)
                 mutex_unlock(&as->lock);
@@ -135 +140 @@
 bool ht_locked(as_t *as)
 {
-        return mutex_locked(&as->lock);
+        return (mutex_locked(&page_ht_lock) && mutex_locked(&as->lock));
 }