Changeset c739102 in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2012-11-21T23:26:22Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0f2c80a

Parents:

bebf97d (diff), 1f7753a (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:

Mainline changes.

File:

• kernel/generic/src/mm/backend_anon.c (modified) (8 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -59 +59 @@
 static void anon_destroy(as_area_t *);
 
+static bool anon_is_resizable(as_area_t *);
+static bool anon_is_shareable(as_area_t *);
+
 static int anon_page_fault(as_area_t *, uintptr_t, pf_access_t);
 static void anon_frame_free(as_area_t *, uintptr_t, uintptr_t);
@@ -68 +71 @@
         .destroy = anon_destroy,
 
+        .is_resizable = anon_is_resizable,
+        .is_shareable = anon_is_shareable,
+
         .page_fault = anon_page_fault,
         .frame_free = anon_frame_free,
@@ -74 +80 @@
 bool anon_create(as_area_t *area)
 {
+        if (area->flags & AS_AREA_LATE_RESERVE)
+                return true;
+
         return reserve_try_alloc(area->pages);
 }
@@ -79 +88 @@
 bool anon_resize(as_area_t *area, size_t new_pages)
 {
+        if (area->flags & AS_AREA_LATE_RESERVE)
+                return true;
+
         if (new_pages > area->pages)
                 return reserve_try_alloc(new_pages - area->pages);
@@ -100 +112 @@
         ASSERT(mutex_locked(&area->as->lock));
         ASSERT(mutex_locked(&area->lock));
+        ASSERT(!(area->flags & AS_AREA_LATE_RESERVE));
 
         /*
@@ -139 +152 @@
 void anon_destroy(as_area_t *area)
 {
+        if (area->flags & AS_AREA_LATE_RESERVE)
+                return;
+
         reserve_free(area->pages);
 }
 
+bool anon_is_resizable(as_area_t *area)
+{
+        return true;
+}
+
+bool anon_is_shareable(as_area_t *area)
+{
+        return !(area->flags & AS_AREA_LATE_RESERVE);
+}
 
 /** Service a page fault in the anonymous memory address space area.
@@ -225 +250 @@
                  *   the different causes
                  */
+
+                if (area->flags & AS_AREA_LATE_RESERVE) {
+                        /*
+                         * Reserve the memory for this page now.
+                         */
+                        if (!reserve_try_alloc(1)) {
+                                printf("Killing task %" PRIu64 " due to a "
+                                    "failed late reservation request.\n",
+                                    TASK->taskid);
+                                TASK->silent_kill = true;
+                                return AS_PF_FAULT;
+                        }
+                }
+
                 kpage = km_temporary_page_get(&frame, FRAME_NO_RESERVE);
                 memsetb((void *) kpage, PAGE_SIZE, 0);
@@ -255 +294 @@
         ASSERT(mutex_locked(&area->lock));
 
-        frame_free_noreserve(frame);
+        if (area->flags & AS_AREA_LATE_RESERVE) {
+                /*
+                 * In case of the late reserve areas, physical memory will not
+                 * be unreserved when the area is destroyed so we need to use
+                 * the normal unreserving frame_free().
+                 */
+                frame_free(frame);
+        } else {
+                /*
+                 * The reserve will be given back when the area is destroyed or
+                 * resized, so use the frame_free_noreserve() which does not
+                 * manipulate the reserve or it would be given back twice.
+                 */
+                frame_free_noreserve(frame);
+        }
 }