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

Timestamp:

2018-11-09T22:04:01Z (6 years ago)

Author:

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

Branches:

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

Children:

95d45482

Parents:

88e43bc (diff), abf6c01 (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) Reduce the number of blocking allocations in the kernel

File:

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

kernel/generic/src/mm/as.c

@@ -151 +151 @@
 as_t *as_create(unsigned int flags)
 {
-        as_t *as = (as_t *) slab_alloc(as_cache, 0);
+        as_t *as = (as_t *) slab_alloc(as_cache, FRAME_ATOMIC);
+        if (!as)
+                return NULL;
+
         (void) as_create_arch(as, 0);
 
@@ -2237 +2240 @@
  *
  */
-void as_get_area_info(as_t *as, as_area_info_t **obuf, size_t *osize)
+as_area_info_t *as_get_area_info(as_t *as, size_t *osize)
 {
         mutex_lock(&as->lock);
@@ -2245 +2248 @@
 
         size_t isize = area_cnt * sizeof(as_area_info_t);
-        as_area_info_t *info = nfmalloc(isize);
+        as_area_info_t *info = malloc(isize);
+        if (!info) {
+                mutex_unlock(&as->lock);
+                return NULL;
+        }
 
         /* Record area data. */
@@ -2267 +2274 @@
         mutex_unlock(&as->lock);
 
-        *obuf = info;
         *osize = isize;
+        return info;
 }