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

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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 mainline changes

File:

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

kernel/generic/src/mm/slab.c

@@ -182 +182 @@
         size_t zone = 0;
         
-        void *data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
-        if (!data) {
+        uintptr_t data_phys =
+            frame_alloc_generic(cache->frames, flags, 0, &zone);
+        if (!data_phys)
                 return NULL;
-        }
+        
+        void *data = (void *) PA2KA(data_phys);
         
         slab_t *slab;
@@ -193 +195 @@
                 slab = slab_alloc(slab_extern_cache, flags);
                 if (!slab) {
-                        frame_free(KA2PA(data));
+                        frame_free(KA2PA(data), cache->frames);
                         return NULL;
                 }
         } else {
-                fsize = (PAGE_SIZE << cache->order);
+                fsize = FRAMES2SIZE(cache->frames);
                 slab = data + fsize - sizeof(*slab);
         }
@@ -203 +205 @@
         /* 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);
         
@@ -225 +227 @@
 NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab)
 {
-        frame_free(KA2PA(slab->start));
+        frame_free(KA2PA(slab->start), slab->cache->frames);
         if (!(cache->flags & SLAB_CACHE_SLINSIDE))
                 slab_free(slab_extern_cache, slab);
@@ -231 +233 @@
         atomic_dec(&cache->allocated_slabs);
         
-        return (1 << cache->order);
+        return cache->frames;
 }
 
@@ -558 +560 @@
 {
         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 +572 @@
 {
         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 +636 @@
                 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);
@@ -810 +806 @@
         
         size_t frames = 0;
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, cache) {
                 frames += _slab_reclaim(cache, flags);
         }
@@ -871 +866 @@
                 
                 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;
@@ -881 +876 @@
                 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");
@@ -936 +931 @@
         irq_spinlock_lock(&slab_cache_lock, false);
         
-        list_foreach(slab_cache_list, cur) {
-                slab_cache_t *slab = list_get_instance(cur, slab_cache_t, link);
+        list_foreach(slab_cache_list, link, slab_cache_t, slab) {
                 if ((slab->flags & SLAB_CACHE_MAGDEFERRED) !=
                     SLAB_CACHE_MAGDEFERRED)