Changeset 7473807 in mainline for kernel/generic/src/synch/futex.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/synch/futex.c (modified) (2 diffs)

kernel/generic/src/synch/futex.c

@@ -339 +339 @@
 static futex_t *get_and_cache_futex(uintptr_t phys_addr, uintptr_t uaddr)
 {
-        futex_t *futex = malloc(sizeof(futex_t), 0);
+        futex_t *futex = malloc(sizeof(futex_t), FRAME_ATOMIC);
+        if (!futex)
+                return NULL;
 
         /*
@@ -363 +365 @@
          * Cache the link to the futex object for this task.
          */
-        futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t), 0);
+        futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t), FRAME_ATOMIC);
+        if (!fut_ptr) {
+                spinlock_lock(&futex_ht_lock);
+                futex_release_ref(futex);
+                spinlock_unlock(&futex_ht_lock);
+                return NULL;
+        }
         cht_link_t *dup_link;