Changeset 300f4c4 in mainline

Timestamp:

2017-09-30T18:52:38Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6886705

Parents:

91b60499

Message:

Let the resource allocator treat 0 as a valid resource

Location:

kernel/generic

Files:

• include/lib/ra.h (modified) (1 diff)
• src/lib/ra.c (modified) (5 diffs)
• src/mm/km.c (modified) (1 diff)

kernel/generic/include/lib/ra.h

@@ -80 +80 @@
 extern ra_arena_t *ra_arena_create(void);
 extern bool ra_span_add(ra_arena_t *, uintptr_t, size_t);
-extern uintptr_t ra_alloc(ra_arena_t *, size_t, size_t);
+extern bool ra_alloc(ra_arena_t *, size_t, size_t, uintptr_t *);
 extern void ra_free(ra_arena_t *, uintptr_t, size_t);
 

kernel/generic/src/lib/ra.c

@@ -196 +196 @@
         ra_span_t *span;
 
-        /*
-         * At the moment, we can only create resources that don't include 0.
-         * If 0 needs to be considered as a valid resource, we would need to
-         * slightly change the API of the resource allocator.
-         */
-        if (base == 0)
-                return false;
-
         span = ra_span_create(base, size);
         if (!span)
@@ -215 +207 @@
 }
 
-static uintptr_t ra_span_alloc(ra_span_t *span, size_t size, size_t align)
+static bool
+ra_span_alloc(ra_span_t *span, size_t size, size_t align, uintptr_t *base)
 {
         /*
@@ -301 +294 @@
                 hash_table_insert(&span->used, &key, &seg->fu_link);
 
-                return newbase;
-        }
-
-        return 0;
+                *base = newbase;
+                return true;
+        }
+
+        return false;
 }
 
@@ -382 +376 @@
 
 /** Allocate resources from arena. */
-uintptr_t ra_alloc(ra_arena_t *arena, size_t size, size_t alignment)
-{
-        uintptr_t base = 0;
+bool
+ra_alloc(ra_arena_t *arena, size_t size, size_t alignment, uintptr_t *base)
+{
+        bool success = false;
 
         assert(size >= 1);
@@ -392 +387 @@
         irq_spinlock_lock(&arena->lock, true);
         list_foreach(arena->spans, span_link, ra_span_t, span) {
-                base = ra_span_alloc(span, size, alignment);
-                if (base)
+                success = ra_span_alloc(span, size, alignment, base);
+                if (success)
                         break;
         }
         irq_spinlock_unlock(&arena->lock, true);
 
-        return base;
+        return success;
 }
 

kernel/generic/src/mm/km.c

@@ -117 +117 @@
 uintptr_t km_page_alloc(size_t size, size_t align)
 {
-        return ra_alloc(km_ni_arena, size, align);
+        uintptr_t base;
+        if (ra_alloc(km_ni_arena, size, align, &base))
+                return base;
+        else
+                return (uintptr_t) NULL;
 }