Changeset b0c2075 in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2013-09-10T17:48:57Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

85147f3

Parents:

86733f3

Message:

new physical memory allocator supporting physical address constrains
the buddy allocator framework is retired and replaced by a two-level bitmap
the allocator can allocate an arbitrary number of frames, not only a power-of-two count

Caution: Change of semantics
The physical memory allocator no longer allocates naturally aligned blocks. If you require an aligned block, specify it as the constraint.

File:

• kernel/generic/src/mm/slab.c (modified) (9 diffs)

kernel/generic/src/mm/slab.c

@@ -183 +183 @@
         
         void *data = (void *)
-            PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone));
+            PA2KA(frame_alloc_generic(cache->frames, flags, 0, &zone));
         if (!data)
                 return NULL;
@@ -197 +197 @@
                 }
         } else {
-                fsize = (PAGE_SIZE << cache->order);
+                fsize = FRAMES2SIZE(cache->frames);
                 slab = data + fsize - sizeof(*slab);
         }
@@ -203 +203 @@
         /* Fill in slab structures */
         size_t i;
-        for (i = 0; i < ((size_t) 1 << cache->order); i++)
+        for (i = 0; i < cache->frames; i++)
                 frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone);
         
@@ -231 +231 @@
         atomic_dec(&cache->allocated_slabs);
         
-        return (1 << cache->order);
+        return cache->frames;
 }
 
@@ -558 +558 @@
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
-                return ((PAGE_SIZE << cache->order)
-                    - sizeof(slab_t)) / cache->size;
+                return (FRAMES2SIZE(cache->frames) - sizeof(slab_t)) /
+                    cache->size;
         else
-                return (PAGE_SIZE << cache->order) / cache->size;
+                return FRAMES2SIZE(cache->frames) / cache->size;
 }
 
@@ -570 +570 @@
 {
         size_t objects = comp_objects(cache);
-        size_t ssize = PAGE_SIZE << cache->order;
+        size_t ssize = FRAMES2SIZE(cache->frames);
         
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -634 +634 @@
                 cache->flags |= SLAB_CACHE_SLINSIDE;
         
-        /* Minimum slab order */
-        size_t pages = SIZE2FRAMES(cache->size);
-        
-        /* We need the 2^order >= pages */
-        if (pages == 1)
-                cache->order = 0;
-        else
-                cache->order = fnzb(pages - 1) + 1;
+        /* Minimum slab frames */
+        cache->frames = SIZE2FRAMES(cache->size);
         
         while (badness(cache) > SLAB_MAX_BADNESS(cache))
-                cache->order += 1;
+                cache->frames <<= 1;
         
         cache->objects = comp_objects(cache);
@@ -870 +864 @@
                 
                 const char *name = cache->name;
-                uint8_t order = cache->order;
+                size_t frames = cache->frames;
                 size_t size = cache->size;
                 size_t objects = cache->objects;
@@ -880 +874 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
-                    name, size, (1 << order), objects, allocated_slabs,
+                printf("%-18s %8zu %8zu %8zu %8ld %8ld %8ld %-5s\n",
+                    name, size, frames, objects, allocated_slabs,
                     cached_objs, allocated_objs,
                     flags & SLAB_CACHE_SLINSIDE ? "in" : "out");