Changes in kernel/generic/src/mm/slab.c [b0c2075:e2a0d76] in mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -183 +183 @@
         
         void *data = (void *)
-            PA2KA(frame_alloc_generic(cache->frames, flags, 0, &zone));
+            PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone));
         if (!data)
                 return NULL;
@@ -197 +197 @@
                 }
         } else {
-                fsize = FRAMES2SIZE(cache->frames);
+                fsize = (PAGE_SIZE << cache->order);
                 slab = data + fsize - sizeof(*slab);
         }
@@ -203 +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);
         
@@ -231 +231 @@
         atomic_dec(&cache->allocated_slabs);
         
-        return cache->frames;
+        return (1 << cache->order);
 }
 
@@ -558 +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;
 }
 
@@ -570 +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)
@@ -634 +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);
@@ -804 +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);
         }
@@ -864 +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;
@@ -874 +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");
@@ -929 +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)