gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow partial deallocation in page level allocation tracker

Browse Source
This commit is contained in:
Balazs Gerofi
2016-09-22 07:25:58 -04:00
parent a6bd98cc02
commit 7176bb2a47
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/mem.c
View File

@@ -242,6 +242,7 @@ void _ihk_mc_free_pages(void *ptr, int npages, char *file, int line)
struct pagealloc_track_entry *entry; struct pagealloc_track_entry *entry;
struct pagealloc_track_addr_entry *addr_entry_iter, *addr_entry = NULL; struct pagealloc_track_addr_entry *addr_entry_iter, *addr_entry = NULL;
int hash; int hash;
int rehash_addr_entry = 0;
if (!memdebug || !pagealloc_track_initialized) { if (!memdebug || !pagealloc_track_initialized) {
goto out; goto out;
@@ -259,14 +260,8 @@ void _ihk_mc_free_pages(void *ptr, int npages, char *file, int line)
if (addr_entry) { if (addr_entry) {
if (addr_entry->entry->npages != npages) { if (addr_entry->entry->npages != npages) {
kprintf("%s: ERROR: freeing %d pages @ %s:%d " addr_entry->addr += (npages * PAGE_SIZE);
"for allocation @ %s:%d of %d pages\n", rehash_addr_entry = 1;
__FUNCTION__,
npages, file, line,
addr_entry->entry->file,
addr_entry->entry->line,
addr_entry->entry->npages);
panic("panic: this is not an error, but needs more processing...");
} }
list_del(&addr_entry->hash); list_del(&addr_entry->hash);
@@ -278,6 +273,15 @@ void _ihk_mc_free_pages(void *ptr, int npages, char *file, int line)
panic("panic: this may not be an error"); panic("panic: this may not be an error");
} }
if (rehash_addr_entry) {
int addr_hash = ((unsigned long)addr_entry->addr >> 5) &
PAGEALLOC_TRACK_HASH_MASK;
irqflags = ihk_mc_spinlock_lock(&pagealloc_addr_hash_locks[addr_hash]);
list_add(&addr_entry->hash, &pagealloc_addr_hash[addr_hash]);
ihk_mc_spinlock_unlock(&pagealloc_addr_hash_locks[addr_hash], irqflags);
goto out;
}
entry = addr_entry->entry; entry = addr_entry->entry;
irqflags = ihk_mc_spinlock_lock(&entry->addr_list_lock); irqflags = ihk_mc_spinlock_lock(&entry->addr_list_lock);