Changeset 1d432f9 in mainline for kernel/generic/src/mm

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/generic/src/mm

Files:

• as.c (modified) (9 diffs)
• backend_anon.c (modified) (3 diffs)
• backend_elf.c (modified) (3 diffs)
• backend_phys.c (modified) (2 diffs)
• page.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -817 +817 @@
                 [PF_ACCESS_EXEC] = AS_AREA_EXEC
         };
+
+        ASSERT(interrupts_disabled());
+        ASSERT(mutex_locked(&area->lock));
         
         if (!(area->flags & flagmap[access]))
@@ -1221 +1224 @@
 unsigned int as_area_get_flags(as_area_t *area)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(mutex_locked(&area->lock));
+
         return area_flags_to_page_flags(area->flags);
 }
@@ -1322 +1328 @@
 as_area_t *find_area_and_lock(as_t *as, uintptr_t va)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(mutex_locked(&as->lock));
+
         btree_node_t *leaf;
         as_area_t *area = (as_area_t *) btree_search(&as->as_area_btree, va, &leaf);
@@ -1386 +1395 @@
     as_area_t *avoid_area)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(mutex_locked(&as->lock));
+
         /*
          * We don't want any area to have conflicts with NULL page.
@@ -1473 +1485 @@
 /** Return size of the address space area with given base.
  *
- * @param base Arbitrary address insede the address space area.
+ * @param base Arbitrary address inside the address space area.
  *
  * @return Size of the address space area in bytes or zero if it
@@ -1484 +1496 @@
         
         ipl_t ipl = interrupts_disable();
+        page_table_lock(AS, true);
         as_area_t *src_area = find_area_and_lock(AS, base);
         
@@ -1492 +1505 @@
                 size = 0;
         
+        page_table_unlock(AS, true);
         interrupts_restore(ipl);
         return size;
@@ -1509 +1523 @@
 int used_space_insert(as_area_t *area, uintptr_t page, size_t count)
 {
+        ASSERT(mutex_locked(&area->lock));
         ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
         ASSERT(count);
@@ -1815 +1830 @@
 int used_space_remove(as_area_t *area, uintptr_t page, size_t count)
 {
+        ASSERT(mutex_locked(&area->lock));
         ASSERT(page == ALIGN_DOWN(page, PAGE_SIZE));
         ASSERT(count);

kernel/generic/src/mm/backend_anon.c

@@ -79 +79 @@
 {
         uintptr_t frame;
+
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
 
         if (!as_area_check_access(area, access))
@@ -168 +171 @@
 void anon_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
+        ASSERT(page_table_locked(area->as));
+        ASSERT(mutex_locked(&area->lock));
+
         frame_free(frame);
 }
@@ -183 +189 @@
 {
         link_t *cur;
+
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 
         /*

kernel/generic/src/mm/backend_elf.c

@@ -86 +86 @@
         bool dirty = false;
 
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
+
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
@@ -235 +238 @@
         uintptr_t start_anon;
 
-        ASSERT((page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) &&
-            (page < entry->p_vaddr + entry->p_memsz));
+        ASSERT(page_table_locked(area->as));
+        ASSERT(mutex_locked(&area->lock));
+
+        ASSERT(page >= ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE));
+        ASSERT(page < entry->p_vaddr + entry->p_memsz);
+
         start_anon = entry->p_vaddr + entry->p_filesz;
 
@@ -273 +280 @@
         btree_node_t *leaf, *node;
         uintptr_t start_anon = entry->p_vaddr + entry->p_filesz;
+
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 
         /*

kernel/generic/src/mm/backend_phys.c

@@ -72 +72 @@
         uintptr_t base = area->backend_data.base;
 
+        ASSERT(page_table_locked(AS));
+        ASSERT(mutex_locked(&area->lock));
+
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
@@ -93 +96 @@
 void phys_share(as_area_t *area)
 {
+        ASSERT(mutex_locked(&area->as->lock));
+        ASSERT(mutex_locked(&area->lock));
 }
 

kernel/generic/src/mm/page.c

@@ -120 +120 @@
     unsigned int flags)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_insert);
-        
+
         page_mapping_operations->mapping_insert(as, page, frame, flags);
         
@@ -143 +146 @@
 void page_mapping_remove(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_remove);
@@ -167 +173 @@
 pte_t *page_mapping_find(as_t *as, uintptr_t page)
 {
+        ASSERT(interrupts_disabled());
+        ASSERT(page_table_locked(as));
+        
         ASSERT(page_mapping_operations);
         ASSERT(page_mapping_operations->mapping_find);