Changes in kernel/generic/src/mm/slab.c [cd3b380:feeac0d] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/mm/slab.c
rcd3b380 rfeeac0d 182 182 size_t zone = 0; 183 183 184 uintptr_t data_phys =185 frame_alloc_generic(cache->frames, flags, 0, &zone);186 if (!data _phys)184 void *data = (void *) 185 PA2KA(frame_alloc_generic(cache->order, flags, 0, &zone)); 186 if (!data) 187 187 return NULL; 188 189 void *data = (void *) PA2KA(data_phys);190 188 191 189 slab_t *slab; … … 195 193 slab = slab_alloc(slab_extern_cache, flags); 196 194 if (!slab) { 197 frame_free(KA2PA(data) , cache->frames);195 frame_free(KA2PA(data)); 198 196 return NULL; 199 197 } 200 198 } else { 201 fsize = FRAMES2SIZE(cache->frames);199 fsize = (PAGE_SIZE << cache->order); 202 200 slab = data + fsize - sizeof(*slab); 203 201 } … … 205 203 /* Fill in slab structures */ 206 204 size_t i; 207 for (i = 0; i < cache->frames; i++)205 for (i = 0; i < ((size_t) 1 << cache->order); i++) 208 206 frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone); 209 207 … … 227 225 NO_TRACE static size_t slab_space_free(slab_cache_t *cache, slab_t *slab) 228 226 { 229 frame_free(KA2PA(slab->start) , slab->cache->frames);227 frame_free(KA2PA(slab->start)); 230 228 if (!(cache->flags & SLAB_CACHE_SLINSIDE)) 231 229 slab_free(slab_extern_cache, slab); … … 233 231 atomic_dec(&cache->allocated_slabs); 234 232 235 return cache->frames;233 return (1 << cache->order); 236 234 } 237 235 … … 560 558 { 561 559 if (cache->flags & SLAB_CACHE_SLINSIDE) 562 return ( FRAMES2SIZE(cache->frames) - sizeof(slab_t)) /563 cache->size;560 return ((PAGE_SIZE << cache->order) 561 - sizeof(slab_t)) / cache->size; 564 562 else 565 return FRAMES2SIZE(cache->frames) / cache->size;563 return (PAGE_SIZE << cache->order) / cache->size; 566 564 } 567 565 … … 572 570 { 573 571 size_t objects = comp_objects(cache); 574 size_t ssize = FRAMES2SIZE(cache->frames);572 size_t ssize = PAGE_SIZE << cache->order; 575 573 576 574 if (cache->flags & SLAB_CACHE_SLINSIDE) … … 636 634 cache->flags |= SLAB_CACHE_SLINSIDE; 637 635 638 /* Minimum slab frames */ 639 cache->frames = SIZE2FRAMES(cache->size); 636 /* Minimum slab order */ 637 size_t pages = SIZE2FRAMES(cache->size); 638 639 /* We need the 2^order >= pages */ 640 if (pages == 1) 641 cache->order = 0; 642 else 643 cache->order = fnzb(pages - 1) + 1; 640 644 641 645 while (badness(cache) > SLAB_MAX_BADNESS(cache)) 642 cache-> frames <<= 1;646 cache->order += 1; 643 647 644 648 cache->objects = comp_objects(cache); … … 866 870 867 871 const char *name = cache->name; 868 size_t frames = cache->frames;872 uint8_t order = cache->order; 869 873 size_t size = cache->size; 870 874 size_t objects = cache->objects; … … 876 880 irq_spinlock_unlock(&slab_cache_lock, true); 877 881 878 printf("%-18s %8zu %8 zu %8zu %8ld %8ld %8ld %-5s\n",879 name, size, frames, objects, allocated_slabs,882 printf("%-18s %8zu %8u %8zu %8ld %8ld %8ld %-5s\n", 883 name, size, (1 << order), objects, allocated_slabs, 880 884 cached_objs, allocated_objs, 881 885 flags & SLAB_CACHE_SLINSIDE ? "in" : "out");
Note:
See TracChangeset
for help on using the changeset viewer.