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

Timestamp:

2018-05-11T20:22:42Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d2c5159

Parents:

ae89656

Message:

Use atomic malloc allocations

We can safely use atomic allocations in places that use the non-failing
version of malloc(), but test the return value anyway. And also in some
places that can afford to return failure but did not because of comfort.

File:

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

kernel/generic/src/mm/as.c

@@ -620 +620 @@
         }
 
-        as_area_t *area = (as_area_t *) malloc(sizeof(as_area_t), 0);
+        as_area_t *area = (as_area_t *) malloc(sizeof(as_area_t), FRAME_ATOMIC);
+        if (!area) {
+                mutex_unlock(&as->lock);
+                return NULL;
+        }
 
         mutex_initialize(&area->lock, MUTEX_PASSIVE);
@@ -646 +650 @@
          */
         if (!(attrs & AS_AREA_ATTR_PARTIAL)) {
-                si = (share_info_t *) malloc(sizeof(share_info_t), 0);
+                si = (share_info_t *) malloc(sizeof(share_info_t),
+                    FRAME_ATOMIC);
+                if (!si) {
+                        free(area);
+                        mutex_unlock(&as->lock);
+                        return NULL;
+                }
                 mutex_initialize(&si->lock, MUTEX_PASSIVE);
                 si->refcount = 1;
@@ -1292 +1302 @@
 
         /* An array for storing frame numbers */
-        uintptr_t *old_frame = malloc(used_pages * sizeof(uintptr_t), 0);
+        uintptr_t *old_frame = malloc(used_pages * sizeof(uintptr_t),
+            FRAME_ATOMIC);
+        if (!old_frame) {
+                mutex_unlock(&area->lock);
+                mutex_unlock(&as->lock);
+                return ENOMEM;
+        }
 
         page_table_lock(as, false);