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

xpmem: Make sure vm_range is used under memory_range_lock

Browse Source 
Refs: #1330
Change-Id: I87a0d6042a2c388fbd260d8dff5d109106478872
This commit is contained in:
Ken Sato
2019-11-12 13:03:32 +09:00
parent 0c63a2a3cd
commit 91ea69cf8f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/xpmem.c
View File

@ -1133,16 +1133,18 @@ static int xpmem_attach(
existing_vmr = lookup_process_memory_range(vm, vaddr, existing_vmr = lookup_process_memory_range(vm, vaddr,
vaddr + size); vaddr + size);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
for (; existing_vmr && existing_vmr->start < vaddr + size; for (; existing_vmr && existing_vmr->start < vaddr + size;
existing_vmr = next_process_memory_range(vm, existing_vmr = next_process_memory_range(vm,
existing_vmr)) { existing_vmr)) {
if (xpmem_is_private_data(existing_vmr)) { if (xpmem_is_private_data(existing_vmr)) {
ret = -EINVAL; ret = -EINVAL;
ihk_mc_spinlock_unlock_noirq(
&vm->memory_range_lock);
goto out_2; goto out_2;
} }
} }
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
} }
flags |= MAP_ANONYMOUS; flags |= MAP_ANONYMOUS;
@ -1414,20 +1416,18 @@ static void xpmem_detach_att(
XPMEM_DEBUG("detaching att->vm=0x%p", (void *)att->vm); XPMEM_DEBUG("detaching att->vm=0x%p", (void *)att->vm);
vm = att->vm;
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
mcs_rwlock_writer_lock(&att->at_lock, &at_lock); mcs_rwlock_writer_lock(&att->at_lock, &at_lock);
if (att->flags & XPMEM_FLAG_DESTROYING) { if (att->flags & XPMEM_FLAG_DESTROYING) {
mcs_rwlock_writer_unlock(&att->at_lock, &at_lock); mcs_rwlock_writer_unlock(&att->at_lock, &at_lock);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
XPMEM_DEBUG("return: XPMEM_FLAG_DESTROYING"); XPMEM_DEBUG("return: XPMEM_FLAG_DESTROYING");
return; return;
} }
att->flags |= XPMEM_FLAG_DESTROYING; att->flags |= XPMEM_FLAG_DESTROYING;
vm = att->vm;
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, range = lookup_process_memory_range(vm,
att->at_vaddr, att->at_vaddr + 1); att->at_vaddr, att->at_vaddr + 1);
@ -1667,10 +1667,8 @@ int xpmem_remove_process_memory_range(
mcs_rwlock_writer_lock(&att->at_lock, &at_lock); mcs_rwlock_writer_lock(&att->at_lock, &at_lock);
if (att->flags & XPMEM_FLAG_DESTROYING) { if (att->flags & XPMEM_FLAG_DESTROYING) {
mcs_rwlock_writer_unlock(&att->at_lock, &at_lock);
xpmem_att_deref(att);
XPMEM_DEBUG("already cleaned up"); XPMEM_DEBUG("already cleaned up");
return 0; goto out;
} }
if (vmr->start == att->at_vaddr && if (vmr->start == att->at_vaddr &&
@ -2019,10 +2017,6 @@ static int xpmem_remap_pte(
seg_vmr = lookup_process_memory_range(seg_tg->vm, seg_vaddr, seg_vmr = lookup_process_memory_range(seg_tg->vm, seg_vaddr,
seg_vaddr + 1); seg_vaddr + 1);
if (is_remote_vm(seg_tg->vm)) {
ihk_mc_spinlock_unlock_noirq(&seg_tg->vm->memory_range_lock);
}
if (!seg_vmr) { if (!seg_vmr) {
ret = -EFAULT; ret = -EFAULT;
ekprintf("%s: ERROR: lookup_process_memory_range() failed\n", ekprintf("%s: ERROR: lookup_process_memory_range() failed\n",
@ -2033,6 +2027,7 @@ static int xpmem_remap_pte(
seg_pte = ihk_mc_pt_lookup_pte(seg_tg->vm->address_space->page_table, seg_pte = ihk_mc_pt_lookup_pte(seg_tg->vm->address_space->page_table,
(void *)seg_vaddr, seg_vmr->pgshift, &seg_pgaddr, &seg_pgsize, (void *)seg_vaddr, seg_vmr->pgshift, &seg_pgaddr, &seg_pgsize,
&seg_p2align); &seg_p2align);
if (!seg_pte) { if (!seg_pte) {
ret = -EFAULT; ret = -EFAULT;
ekprintf("%s: ERROR: ihk_mc_pt_lookup_pte() failed\n", ekprintf("%s: ERROR: ihk_mc_pt_lookup_pte() failed\n",
@ -2080,6 +2075,10 @@ static int xpmem_remap_pte(
} }
out: out:
if (is_remote_vm(seg_tg->vm)) {
ihk_mc_spinlock_unlock_noirq(&seg_tg->vm->memory_range_lock);
}
XPMEM_DEBUG("return: ret=%d", ret); XPMEM_DEBUG("return: ret=%d", ret);
return ret; return ret;