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

fileobj: disable IRQs while holding page hash locks, schedule() in I/O loop

Browse Source 
Change-Id: Iaf72d55980f1a5df6c93c4a57fa57b0ae5b1d229
This commit is contained in:
Balazs Gerofi
2019-09-26 12:12:40 +09:00
committed by Masamichi Takagi
parent b5337358cf
commit 83ef96a739
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
kernel/fileobj.c
View File

@@ -474,20 +474,24 @@ static void fileobj_do_pageio(void *args0)
ssize_t ss; ssize_t ss;
struct mcs_lock_node mcs_node; struct mcs_lock_node mcs_node;
int hash = (off >> PAGE_SHIFT) & FILEOBJ_PAGE_HASH_MASK; int hash = (off >> PAGE_SHIFT) & FILEOBJ_PAGE_HASH_MASK;
int attempts = 0;
mcs_lock_lock_noirq(&obj->page_hash_locks[hash], mcs_lock_lock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
page = __fileobj_page_hash_lookup(obj, hash, off); page = __fileobj_page_hash_lookup(obj, hash, off);
if (!page) { if (!page) {
goto out; goto out;
} }
while (page->mode == PM_PAGEIO) { while (page->mode == PM_PAGEIO) {
mcs_lock_unlock_noirq(&obj->page_hash_locks[hash], mcs_lock_unlock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node); ++attempts;
if (attempts > 49) {
dkprintf("%s: %s:%lu PM_PAGEIO loop %d -> schedule()\n",
__func__, to_memobj(obj)->path, off, attempts);
schedule();
}
cpu_pause(); cpu_pause();
mcs_lock_lock_noirq(&obj->page_hash_locks[hash], mcs_lock_lock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
} }
if (page->mode == PM_WILL_PAGEIO) { if (page->mode == PM_WILL_PAGEIO) {
@@ -500,8 +504,7 @@ static void fileobj_do_pageio(void *args0)
} }
else { else {
page->mode = PM_PAGEIO; page->mode = PM_PAGEIO;
mcs_lock_unlock_noirq(&obj->page_hash_locks[hash], mcs_lock_unlock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
ihk_mc_syscall_arg0(&ctx) = PAGER_REQ_READ; ihk_mc_syscall_arg0(&ctx) = PAGER_REQ_READ;
ihk_mc_syscall_arg1(&ctx) = obj->handle; ihk_mc_syscall_arg1(&ctx) = obj->handle;
@@ -513,8 +516,7 @@ static void fileobj_do_pageio(void *args0)
__FUNCTION__, obj->handle); __FUNCTION__, obj->handle);
ss = syscall_generic_forwarding(__NR_mmap, &ctx); ss = syscall_generic_forwarding(__NR_mmap, &ctx);
mcs_lock_lock_noirq(&obj->page_hash_locks[hash], mcs_lock_lock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
if (page->mode != PM_PAGEIO) { if (page->mode != PM_PAGEIO) {
kprintf("fileobj_do_pageio(%p,%lx,%lx):" kprintf("fileobj_do_pageio(%p,%lx,%lx):"
"invalid mode %x\n", "invalid mode %x\n",
@@ -540,8 +542,7 @@ static void fileobj_do_pageio(void *args0)
page->mode = PM_DONE_PAGEIO; page->mode = PM_DONE_PAGEIO;
} }
out: out:
mcs_lock_unlock_noirq(&obj->page_hash_locks[hash], mcs_lock_unlock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
memobj_unref(&obj->memobj); /* got fileobj_get_page() */ memobj_unref(&obj->memobj); /* got fileobj_get_page() */
kfree(args0); kfree(args0);
dkprintf("fileobj_do_pageio(%p,%lx,%lx):\n", obj, off, pgsize); dkprintf("fileobj_do_pageio(%p,%lx,%lx):\n", obj, off, pgsize);
@@ -610,8 +611,7 @@ static int fileobj_get_page(struct memobj *memobj, off_t off,
goto out_nolock; goto out_nolock;
} }
mcs_lock_lock_noirq(&obj->page_hash_locks[hash], mcs_lock_lock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
page = __fileobj_page_hash_lookup(obj, hash, off); page = __fileobj_page_hash_lookup(obj, hash, off);
if (!page || (page->mode == PM_WILL_PAGEIO) if (!page || (page->mode == PM_WILL_PAGEIO)
|| (page->mode == PM_PAGEIO)) { || (page->mode == PM_PAGEIO)) {
@@ -689,8 +689,7 @@ static int fileobj_get_page(struct memobj *memobj, off_t off,
*physp = page_to_phys(page); *physp = page_to_phys(page);
virt = NULL; virt = NULL;
out: out:
mcs_lock_unlock_noirq(&obj->page_hash_locks[hash], mcs_lock_unlock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
out_nolock: out_nolock:
if (virt) { if (virt) {
ihk_mc_free_pages_user(virt, npages); ihk_mc_free_pages_user(virt, npages);
@@ -768,8 +767,7 @@ static int fileobj_lookup_page(struct memobj *memobj, off_t off,
return -ENOMEM; return -ENOMEM;
} }
mcs_lock_lock_noirq(&obj->page_hash_locks[hash], mcs_lock_lock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
page = __fileobj_page_hash_lookup(obj, hash, off); page = __fileobj_page_hash_lookup(obj, hash, off);
if (!page) { if (!page) {
@@ -780,8 +778,7 @@ static int fileobj_lookup_page(struct memobj *memobj, off_t off,
error = 0; error = 0;
out: out:
mcs_lock_unlock_noirq(&obj->page_hash_locks[hash], mcs_lock_unlock(&obj->page_hash_locks[hash], &mcs_node);
&mcs_node);
dkprintf("fileobj_lookup_page(%p,%lx,%x,%p): %d \n", dkprintf("fileobj_lookup_page(%p,%lx,%x,%p): %d \n",
obj, off, p2align, physp, error); obj, off, p2align, physp, error);