Changeset 1d432f9 in mainline for kernel/genarch

Timestamp:

2010-05-31T22:33:44Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

179d052

Parents:

3a2b636

Message:

Reflect assumptions about lock and interrupt state in functions themselves.

Location:

kernel/genarch/src/mm

Files:

• asid.c (modified) (2 diffs)
• page_ht.c (modified) (3 diffs)
• page_pt.c (modified) (3 diffs)

kernel/genarch/src/mm/asid.c

@@ -70 +70 @@
 /** Allocate free address space identifier.
  *
- * Interrupts must be disabled and inactive_as_with_asid_lock must be held
- * prior to this call
+ * Interrupts must be disabled and asidlock must be held prior to this call
  *
  * @return New ASID.
@@ -80 +79 @@
         link_t *tmp;
         as_t *as;
+
+        ASSERT(interrupts_disabled());
+        ASSERT(spinlock_locked(&asidlock));
 
         /*

kernel/genarch/src/mm/page_ht.c

@@ -186 +186 @@
                 page = ALIGN_DOWN(page, PAGE_SIZE)
         };
+
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
         
         if (!hash_table_find(&page_ht, key)) {
@@ -226 +229 @@
                 page = ALIGN_DOWN(page, PAGE_SIZE)
         };
+
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
         
         /*
@@ -253 +259 @@
                 page = ALIGN_DOWN(page, PAGE_SIZE)
         };
+
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
         
         link_t *cur = hash_table_find(&page_ht, key);

kernel/genarch/src/mm/page_pt.c

@@ -73 +73 @@
 {
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
+
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -121 +124 @@
 void pt_mapping_remove(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+
         /*
          * First, remove the mapping, if it exists.
@@ -251 +257 @@
 pte_t *pt_mapping_find(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)