mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

slab: fix indirect return object and add a debug assert define

Browse Source
This commit is contained in:
Matheus
2023-05-28 17:55:02 -03:00
parent 0afbff3881
commit 6761ca494b
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/mm/slab.c
+15 -1
View File
@@ -12,6 +12,8 @@
#define GET_SLAB(x) (slab_t *)(ROUND_DOWN((uintptr_t)x, PAGE_SIZE) + SLAB_PAGE_OFFSET) #define GET_SLAB(x) (slab_t *)(ROUND_DOWN((uintptr_t)x, PAGE_SIZE) + SLAB_PAGE_OFFSET)
#define SLAB_DEBUG 0
// the cache responsible for allocating all others // the cache responsible for allocating all others
static scache_t selfcache = { static scache_t selfcache = {
.size = sizeof(scache_t), .size = sizeof(scache_t),
@@ -77,6 +79,18 @@ static void *takeobject(scache_t *cache, slab_t *slab) {
return NULL; return NULL;
void **objend = slab->free; void **objend = slab->free;
#if SLAB_DEBUG != 0
if (cache->size < SLAB_INDIRECT_CUTOFF) {
void *addr = (void *)objend;
void *base = (void *)ROUND_DOWN((uintptr_t)slab, PAGE_SIZE);
__assert(addr > base && addr < (void *)slab);
} else {
void *addr = slab->base + ((uintptr_t)objend - ROUND_DOWN((uintptr_t)slab, PAGE_SIZE)) / sizeof(void **) * cache->truesize;
__assert(addr > slab->base && (uintptr_t)addr < (uintptr_t)slab->base + cache->slabobjcount * cache->truesize);
}
#endif
slab->free = *slab->free; slab->free = *slab->free;
slab->used += 1; slab->used += 1;
*objend = NULL; *objend = NULL;
@@ -110,7 +124,7 @@ static slab_t *returnobject(scache_t *cache, void *obj) {
} }
__assert(slab); __assert(slab);
uintmax_t objn = ((uintptr_t)obj - (uintptr_t)slab->base) / cache->truesize; uintmax_t objn = ((uintptr_t)obj - (uintptr_t)slab->base) / cache->truesize;
void **base = (void **)ROUND_DOWN((uintptr_t)obj, PAGE_SIZE); void **base = (void **)ROUND_DOWN((uintptr_t)slab, PAGE_SIZE);
freeptr = &base[objn]; freeptr = &base[objn];
} }