Changeset 11b285d in mainline for kernel/generic/src/mm

Timestamp:

2018-05-13T15:19:32Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

ad896eb

Parents:

13db2044

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 14:59:01)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 15:19:32)

Message:

Use standard signature for malloc() in kernel.

The remaining instances of blocking allocation are replaced with
a new separate function named nfmalloc (short for non-failing malloc).

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (4 diffs)
• backend_phys.c (modified) (1 diff)
• slab.c (modified) (3 diffs)

kernel/generic/src/mm/as.c

@@ -620 +620 @@
         }
 
-        as_area_t *area = (as_area_t *) malloc(sizeof(as_area_t), FRAME_ATOMIC);
+        as_area_t *area = (as_area_t *) malloc(sizeof(as_area_t));
         if (!area) {
                 mutex_unlock(&as->lock);
@@ -650 +650 @@
          */
         if (!(attrs & AS_AREA_ATTR_PARTIAL)) {
-                si = (share_info_t *) malloc(sizeof(share_info_t),
-                    FRAME_ATOMIC);
+                si = (share_info_t *) malloc(sizeof(share_info_t));
                 if (!si) {
                         free(area);
@@ -1302 +1301 @@
 
         /* An array for storing frame numbers */
-        uintptr_t *old_frame = malloc(used_pages * sizeof(uintptr_t),
-            FRAME_ATOMIC);
+        uintptr_t *old_frame = malloc(used_pages * sizeof(uintptr_t));
         if (!old_frame) {
                 mutex_unlock(&area->lock);
@@ -2260 +2258 @@
 
         size_t isize = area_cnt * sizeof(as_area_info_t);
-        as_area_info_t *info = malloc(isize, 0);
+        as_area_info_t *info = nfmalloc(isize);
 
         /* Second pass, record data. */

kernel/generic/src/mm/backend_phys.c

@@ -160 +160 @@
                 phys_shared_data_t *data;
 
-                data = (phys_shared_data_t *) malloc(sizeof(*data),
-                    FRAME_ATOMIC);
+                data = (phys_shared_data_t *) malloc(sizeof(*data));
                 if (!data)
                         return false;

kernel/generic/src/mm/slab.c

@@ -954 +954 @@
 }
 
-void *malloc(size_t size, unsigned int flags)
+static void *_malloc(size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -967 +967 @@
 }
 
-void *realloc(void *ptr, size_t size, unsigned int flags)
+void *malloc(size_t size)
+{
+        return _malloc(size, FRAME_ATOMIC);
+}
+
+/** Non-failing malloc.
+ *  Never returns NULL, but may block forever if no memory is available.
+ */
+void *nfmalloc(size_t size)
+{
+        return _malloc(size, 0);
+}
+
+static void *_realloc(void *ptr, size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -994 +1007 @@
 }
 
+void *realloc(void *ptr, size_t size)
+{
+        return _realloc(ptr, size, FRAME_ATOMIC);
+}
+
 void free(void *ptr)
 {