Changes in kernel/generic/src/mm/slab.c [7ec3c56:f97f1e51] in mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -114 +114 @@
 #include <bitops.h>
 #include <macros.h>
-#include <cpu.h>
 
 IRQ_SPINLOCK_STATIC_INITIALIZE(slab_cache_lock);
@@ -183 +182 @@
         size_t zone = 0;
         
-        uintptr_t data_phys =
-            frame_alloc_generic(cache->frames, flags, 0, &zone);
-        if (!data_phys)
+        void *data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
+        if (!data) {
                 return NULL;
-        
-        void *data = (void *) PA2KA(data_phys);
+        }
         
         slab_t *slab;
@@ -196 +193 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free(KA2PA(data), cache->frames);
+                        frame_free(KA2PA(data));
                         return NULL;
                 }
         } else {
-                fsize = FRAMES2SIZE(cache->frames);
+                fsize = (PAGE_SIZE << cache->order);
                 slab = data + fsize - sizeof(*slab);
         }
@@ -206 +203 @@
         /* Fill in slab structures */
         size_t i;
-        for (i = 0; i < cache->frames; i++)
+        for (i = 0; i < ((size_t) 1 << cache->order); i++)
                 frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone);
         
@@ -228 +225 @@
 NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free(KA2PA(slab->start), slab->cache->frames);
+        frame_free(KA2PA(slab->start));
         if (!(cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);
@@ -234 +231 @@
         atomic_dec(&cache->allocated_slabs);
         
-        return cache->frames;
+        return (1 << cache->order);
 }
 
@@ -561 +558 @@
 {
         if (cache->flags & SLAB_CACHE_SLINSIDE)
-                return (FRAMES2SIZE(cache->frames) - sizeof(slab_t)) /
-                    cache->size;
+                return ((PAGE_SIZE << cache->order)
+                    - sizeof(slab_t)) / cache->size;
         else
-                return FRAMES2SIZE(cache->frames) / cache->size;
+                return (PAGE_SIZE << cache->order) / cache->size;
 }
 
@@ -573 +570 @@
 {
         size_t objects = comp_objects(cache);
-        size_t ssize = FRAMES2SIZE(cache->frames);
+        size_t ssize = PAGE_SIZE << cache->order;
         
         if (cache->flags & SLAB_CACHE_SLINSIDE)
@@ -610 +607 @@
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
 {
-        ASSERT(size > 0);
-        
         memsetb(cache, sizeof(*cache), 0);
         cache->name = name;
@@ -639 +634 @@
                 cache->flags |= SLAB_CACHE_SLINSIDE;
         
-        /* Minimum slab frames */
-        cache->frames = SIZE2FRAMES(cache->size);
+        /* 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;
         
         while (badness(cache) > SLAB_MAX_BADNESS(cache))
-                cache->frames <<= 1;
+                cache->order += 1;
         
         cache->objects = comp_objects(cache);
@@ -809 +810 @@
         
         size_t frames = 0;
-        list_foreach(slab_cache_list, link, slab_cache_t, cache) {
+        list_foreach(slab_cache_list, cur) {
+                slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link);
                 frames += _slab_reclaim(cache, flags);
         }
@@ -869 +871 @@
                 
                 const char *name = cache->name;
-                size_t frames = cache->frames;
+                uint8_t order = cache->order;
                 size_t size = cache->size;
                 size_t objects = cache->objects;
@@ -879 +881 @@
                 irq_spinlock_unlock(&slab_cache_lock, true);
                 
-                printf("%-18s %8zu %8zu %8zu %8ld %8ld %8ld %-5s\n",
-                    name, size, frames, objects, allocated_slabs,
+                printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n",
+                    name, size, (1 << order), objects, allocated_slabs,
                     cached_objs, allocated_objs,
                     flags & SLAB_CACHE_SLINSIDE ? "in" : "out");
@@ -890 +892 @@
         /* Initialize magazine cache */
         _slab_cache_create(&mag_cache, "slab_magazine_t",
-            sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void *),
+            sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void*),
             sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE |
             SLAB_CACHE_SLINSIDE);
@@ -934 +936 @@
         irq_spinlock_lock(&slab_cache_lock, false);
         
-        list_foreach(slab_cache_list, link, slab_cache_t, slab) {
+        list_foreach(slab_cache_list, cur) {
+                slab_cache_t *slab = list_get_instance(cur, slab_cache_t, link);
                 if ((slab->flags & SLAB_CACHE_MAGDEFERRED) !=
                     SLAB_CACHE_MAGDEFERRED)