Changeset e5a015b in mainline for kernel/generic/src/mm/as.c

Timestamp:

2011-04-16T20:45:36Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a7dbd49

Parents:

b2fb47f (diff), 9e953bda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the memory reservation feature (Phase 1) from
lp:~jakub/helenos/mm.

This merge makes the testcase from ticket #114 non-reproducible. The
testcase is now available as tester's malloc2 test. It also seems to me
that this merge makes it harder for the system to run out of memory
during kconsole 'test *' and 'tester *', even though I did see several
hangs already with this feature in place. See below for what is still
missing to make the hangs even less probable or even impossible.

In Phase 1, I am targeting just the low-hanging fruits. In particular,
only anonymous and ELF backend pages are reserved physical memory at
time of as_area_create() and as_area_resize(). Memory is unreserved on
as_area_destroy(). In all other cases, memory is reserved at the same
time as it is allocated, making those calls subject to infinite
blocking if FRAME_ATOMIC is not used.

Possible sources of memory overcommit not addressed in this merge:

• As mentioned above, only backend pages are reserved; pages for supporting structures such as B+tree nodes, TTEs are not reserved or handled otherwise. Kernel heap allocator fragmentation is not included in the reservations either.
• The initial amount of reservable memory is fed from zone_construct(). Zone merging is not taken into account, which can make the reservable memory tracking inaccurate.

File:

• kernel/generic/src/mm/as.c (modified) (4 diffs)

kernel/generic/src/mm/as.c

@@ -80 +80 @@
 #include <arch/interrupt.h>
 
-#ifdef CONFIG_VIRT_IDX_DCACHE
-#include <arch/mm/cache.h>
-#endif /* CONFIG_VIRT_IDX_DCACHE */
-
 /**
  * Each architecture decides what functions will be used to carry out
@@ -447 +443 @@
         else
                 memsetb(&area->backend_data, sizeof(area->backend_data), 0);
+        
+        if (area->backend && area->backend->create) {
+                if (!area->backend->create(area)) {
+                        free(area);
+                        mutex_unlock(&as->lock);
+                        return NULL;
+                }
+        }
         
         btree_create(&area->used_space);
@@ -690 +694 @@
         }
         
+        if (area->backend && area->backend->resize) {
+                if (!area->backend->resize(area, pages)) {
+                        mutex_unlock(&area->lock);
+                        mutex_unlock(&as->lock);
+                        return ENOMEM;
+                }
+        }
+        
         area->pages = pages;
         
@@ -756 +768 @@
                 return ENOENT;
         }
+
+        if (area->backend && area->backend->destroy)
+                area->backend->destroy(area);
         
         uintptr_t base = area->base;