Changeset 436a0a5 in mainline for kernel/generic/src/mm

Timestamp:

2018-11-09T22:04:01Z (7 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

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (4 diffs)
• slab.c (modified) (6 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;
 }
 

kernel/generic/src/mm/slab.c

@@ -667 +667 @@
     size_t (*destructor)(void *obj), unsigned int flags)
 {
-        slab_cache_t *cache = slab_alloc(&slab_cache_cache, 0);
+        slab_cache_t *cache = slab_alloc(&slab_cache_cache, FRAME_ATOMIC);
+        if (!cache)
+                panic("Not enough memory to allocate slab cache %s.", name);
+
         _slab_cache_create(cache, name, size, align, constructor, destructor,
             flags);
@@ -730 +733 @@
 NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
+        if (!obj)
+                return;
+
         ipl_t ipl = interrupts_disable();
 
@@ -954 +960 @@
 }
 
-static void *_malloc(size_t size, unsigned int flags)
+void *malloc(size_t size)
 {
         assert(_slab_initialized);
@@ -964 +970 @@
         uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-        return slab_alloc(malloc_caches[idx], 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)
+        return slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
+}
+
+void *realloc(void *ptr, size_t size)
 {
         assert(_slab_initialized);
@@ -992 +985 @@
                 uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-                new_ptr = slab_alloc(malloc_caches[idx], flags);
+                new_ptr = slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
         } else
                 new_ptr = NULL;
@@ -1007 +1000 @@
 }
 
-void *realloc(void *ptr, size_t size)
-{
-        return _realloc(ptr, size, FRAME_ATOMIC);
-}
-
 void free(void *ptr)
 {