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

page_unmap(): proper locking of hash table

Browse Source
This commit is contained in:
Balazs Gerofi
2016-09-21 14:29:32 +09:00
parent f39fa54c39
commit ffd3f53785
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/mem.c
View File

@@ -631,11 +631,16 @@ out:
int page_unmap(struct page *page) int page_unmap(struct page *page)
{ {
int hash = (page->phys >> PAGE_SHIFT) & PHYS_PAGE_HASH_MASK;
unsigned long irqflags;
irqflags = ihk_mc_spinlock_lock(&page_hash_locks[hash]);
dkprintf("page_unmap(%p %x %d)\n", page, page->mode, page->count); dkprintf("page_unmap(%p %x %d)\n", page, page->mode, page->count);
if (ihk_atomic_sub_return(1, &page->count) > 0) { if (ihk_atomic_sub_return(1, &page->count) > 0) {
/* other mapping exist */ /* other mapping exist */
dkprintf("page_unmap(%p %x %d): 0\n", dkprintf("page_unmap(%p %x %d): 0\n",
page, page->mode, page->count); page, page->mode, page->count);
ihk_mc_spinlock_unlock(&page_hash_locks[hash], irqflags);
return 0; return 0;
} }
@@ -645,10 +650,10 @@ int page_unmap(struct page *page)
} }
*/ */
list_del(&page->hash);
page->mode = PM_NONE;
kfree(page);
dkprintf("page_unmap(%p %x %d): 1\n", page, page->mode, page->count); dkprintf("page_unmap(%p %x %d): 1\n", page, page->mode, page->count);
list_del(&page->hash);
kfree(page);
ihk_mc_spinlock_unlock(&page_hash_locks[hash], irqflags);
return 1; return 1;
} }