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

Revert "memory_range_lock: Enable interrupt when trylock fails"

Browse Source 
This reverts commit 0d3ef65092.

Reason for revert: This fix causes circular dependency with memory_range manipulation and TLB flush. See #1394.

Change-Id: I4774e81ff300c199629e283e538c0a30ad0eeaae
This commit is contained in:
Masamichi Takagi
2019-09-20 07:18:15 +00:00
committed by Ken Sato
parent 41d37bcd30
commit edd3ea0103
12 changed files with 102 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
kernel/syscall.c
View File

@ -1597,7 +1597,6 @@ do_mmap(const uintptr_t addr0, const size_t len0, const int prot,
struct mckfd *fdp = NULL;
int pgshift;
struct vm_range *range = NULL;
unsigned long irqflags;
dkprintf("do_mmap(%lx,%lx,%x,%x,%d,%lx)\n",
addr0, len0, prot, flags, fd, off0);
@ -1629,8 +1628,6 @@ do_mmap(const uintptr_t addr0, const size_t len0, const int prot,
flush_nfo_tlb();
memory_range_write_lock(thread->vm, &irqflags);
if (flags & MAP_HUGETLB) {
pgshift = (flags >> MAP_HUGE_SHIFT) & 0x3F;
p2align = pgshift - PAGE_SHIFT;
@ -1653,6 +1650,8 @@ do_mmap(const uintptr_t addr0, const size_t len0, const int prot,
p2align = PAGE_P2ALIGN;
}
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
if (flags & MAP_FIXED) {
/* clear specified address range */
error = do_munmap((void *)addr, len, 1/* holding memory_range_lock */);
@ -1941,7 +1940,7 @@ out:
if (ro_vma_mapped) {
(void)set_host_vma(addr, len, PROT_READ | PROT_WRITE | PROT_EXEC, 1/* holding memory_range_lock */);
}
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
if (!error && populated_mapping && !((vrflags & VR_PROT_MASK) == VR_PROT_NONE)) {
error = populate_process_memory(thread->vm,
@ -1994,7 +1993,6 @@ SYSCALL_DECLARE(munmap)
struct vm_regions *region = &thread->vm->region;
size_t len;
int error;
unsigned long irqflags;
dkprintf("[%d]sys_munmap(%lx,%lx)\n",
ihk_mc_get_processor_id(), addr, len0);
@ -2010,9 +2008,9 @@ SYSCALL_DECLARE(munmap)
goto out;
}
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
error = do_munmap((void *)addr, len, 1/* holding memory_range_lock */);
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
out:
dkprintf("[%d]sys_munmap(%lx,%lx): %d\n",
@ -2037,7 +2035,6 @@ SYSCALL_DECLARE(mprotect)
const unsigned long protflags = PROT_TO_VR_FLAG(prot);
unsigned long denied;
int ro_changed = 0;
unsigned long irqflags;
dkprintf("[%d]sys_mprotect(%lx,%lx,%x)\n",
ihk_mc_get_processor_id(), start, len0, prot);
@ -2067,7 +2064,7 @@ SYSCALL_DECLARE(mprotect)
flush_nfo_tlb();
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
first = lookup_process_memory_range(thread->vm, start, start+PAGE_SIZE);
@ -2157,7 +2154,7 @@ out:
/* through */
}
}
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
dkprintf("[%d]sys_mprotect(%lx,%lx,%x): %d\n",
ihk_mc_get_processor_id(), start, len0, prot, error);
return error;
@ -2170,7 +2167,6 @@ SYSCALL_DECLARE(brk)
unsigned long r;
unsigned long vrflag;
unsigned long old_brk_end_allocated = 0;
unsigned long irqflags;
dkprintf("SC(%d)[sys_brk] brk_start=%lx,end=%lx\n",
ihk_mc_get_processor_id(), region->brk_start, region->brk_end);
@ -2201,11 +2197,11 @@ SYSCALL_DECLARE(brk)
vrflag |= VR_PRIVATE;
vrflag |= VRFLAG_PROT_TO_MAXPROT(vrflag);
old_brk_end_allocated = region->brk_end_allocated;
memory_range_write_lock(cpu_local_var(current)->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&cpu_local_var(current)->vm->memory_range_lock);
region->brk_end_allocated =
extend_process_region(cpu_local_var(current)->vm,
region->brk_end_allocated, address, vrflag);
memory_range_write_unlock(cpu_local_var(current)->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&cpu_local_var(current)->vm->memory_range_lock);
if (old_brk_end_allocated == region->brk_end_allocated) {
r = old_brk_end_allocated;
@ -2428,9 +2424,8 @@ static void munmap_all(void)
void *addr;
size_t size;
int error;
unsigned long irqflags;
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
next = lookup_process_memory_range(vm, 0, -1);
while ((range = next)) {
next = next_process_memory_range(vm, range);
@ -2444,7 +2439,7 @@ static void munmap_all(void)
/* through */
}
}
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
/* free vm_ranges which do_munmap() failed to remove. */
free_process_memory_ranges(thread->vm);
@ -2475,20 +2470,19 @@ SYSCALL_DECLARE(execve)
struct vm_range *range;
struct process *proc = thread->proc;
int i;
unsigned long irqflags;
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, (unsigned long)filename,
(unsigned long)filename+1);
if (range == NULL || !(range->flag & VR_PROT_READ)) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
kprintf("execve(): ERROR: filename is bad address\n");
return -EFAULT;
}
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
desc = ihk_mc_alloc_pages(4, IHK_MC_AP_NOWAIT);
if (!desc) {
@ -4792,7 +4786,6 @@ SYSCALL_DECLARE(mincore)
uint8_t value;
int error;
pte_t *ptep;
unsigned long irqflags;
if (start & (PAGE_SIZE - 1)) {
dkprintf("mincore(0x%lx,0x%lx,%p): EINVAL\n", start, len, vec);
@ -4809,10 +4802,10 @@ SYSCALL_DECLARE(mincore)
range = NULL;
up = vec;
for (addr = start; addr < end; addr += PAGE_SIZE) {
memory_range_read_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, addr, addr+1);
if (!range) {
memory_range_read_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
dkprintf("mincore(0x%lx,0x%lx,%p):lookup failed. ENOMEM\n",
start, len, vec);
return -ENOMEM;
@ -4834,7 +4827,7 @@ SYSCALL_DECLARE(mincore)
value = 0;
}
ihk_mc_spinlock_unlock_noirq(&vm->page_table_lock);
memory_range_read_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
error = copy_to_user(up, &value, sizeof(value));
if (error) {
@ -4949,7 +4942,6 @@ SYSCALL_DECLARE(madvise)
int error;
uintptr_t s;
uintptr_t e;
unsigned long irqflags;
dkprintf("[%d]sys_madvise(%lx,%lx,%x)\n",
ihk_mc_get_processor_id(), start, len0, advice);
@ -5009,7 +5001,7 @@ SYSCALL_DECLARE(madvise)
goto out2;
}
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
/* check contiguous map */
first = NULL;
range = NULL; /* for avoidance of warning */
@ -5134,7 +5126,7 @@ SYSCALL_DECLARE(madvise)
error = 0;
out:
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
out2:
dkprintf("[%d]sys_madvise(%lx,%lx,%x): %d\n",
@ -5397,7 +5389,6 @@ SYSCALL_DECLARE(shmat)
int req;
struct shmobj *obj;
size_t pgsize;
unsigned long irqflags;
dkprintf("shmat(%#x,%p,%#x)\n", shmid, shmaddr, shmflg);
@ -5447,11 +5438,11 @@ SYSCALL_DECLARE(shmat)
return -EACCES;
}
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
if (addr) {
if (lookup_process_memory_range(vm, addr, addr+len)) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
shmobj_list_unlock();
memobj_unref(&obj->memobj);
dkprintf("shmat(%#x,%p,%#x):lookup_process_memory_range succeeded. -ENOMEM\n", shmid, shmaddr, shmflg);
@ -5461,7 +5452,7 @@ SYSCALL_DECLARE(shmat)
else {
error = search_free_space(len, obj->pgshift, &addr);
if (error) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
shmobj_list_unlock();
memobj_unref(&obj->memobj);
dkprintf("shmat(%#x,%p,%#x):search_free_space failed. %d\n", shmid, shmaddr, shmflg, error);
@ -5477,7 +5468,7 @@ SYSCALL_DECLARE(shmat)
if (!(prot & PROT_WRITE)) {
error = set_host_vma(addr, len, PROT_READ | PROT_EXEC, 1/* holding memory_range_lock */);
if (error) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
shmobj_list_unlock();
memobj_unref(&obj->memobj);
dkprintf("shmat(%#x,%p,%#x):set_host_vma failed. %d\n", shmid, shmaddr, shmflg, error);
@ -5492,13 +5483,13 @@ SYSCALL_DECLARE(shmat)
(void)set_host_vma(addr, len, PROT_READ | PROT_WRITE | PROT_EXEC, 1/* holding memory_range_lock */);
}
memobj_unref(&obj->memobj);
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
shmobj_list_unlock();
dkprintf("shmat(%#x,%p,%#x):add_process_memory_range failed. %d\n", shmid, shmaddr, shmflg, error);
return error;
}
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
shmobj_list_unlock();
dkprintf("shmat(%#x,%p,%#x): 0x%lx. %d\n", shmid, shmaddr, shmflg, addr);
@ -5783,26 +5774,25 @@ SYSCALL_DECLARE(shmdt)
struct process_vm *vm = thread->vm;
struct vm_range *range;
int error;
unsigned long irqflags;
dkprintf("shmdt(%p)\n", shmaddr);
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, (uintptr_t)shmaddr, (uintptr_t)shmaddr+1);
if (!range || (range->start != (uintptr_t)shmaddr) || !range->memobj
|| !(range->memobj->flags & MF_SHMDT_OK)) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
dkprintf("shmdt(%p): -EINVAL\n", shmaddr);
return -EINVAL;
}
error = do_munmap((void *)range->start, (range->end - range->start), 1/* holding memory_range_lock */);
if (error) {
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
dkprintf("shmdt(%p): %d\n", shmaddr, error);
return error;
}
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
dkprintf("shmdt(%p): 0\n", shmaddr);
return 0;
} /* sys_shmdt() */
@ -7665,7 +7655,6 @@ SYSCALL_DECLARE(mlock)
struct vm_range *range;
int error;
struct vm_range *changed;
unsigned long irqflags;
dkprintf("[%d]sys_mlock(%lx,%lx)\n",
ihk_mc_get_processor_id(), start0, len0);
@ -7693,7 +7682,7 @@ SYSCALL_DECLARE(mlock)
goto out2;
}
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
/* check contiguous map */
first = NULL;
@ -7798,7 +7787,7 @@ SYSCALL_DECLARE(mlock)
error = 0;
out:
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
if (!error) {
error = populate_process_memory(thread->vm, (void *)start, len);
@ -7841,7 +7830,6 @@ SYSCALL_DECLARE(munlock)
struct vm_range *range;
int error;
struct vm_range *changed;
unsigned long irqflags;
dkprintf("[%d]sys_munlock(%lx,%lx)\n",
ihk_mc_get_processor_id(), start0, len0);
@ -7869,7 +7857,7 @@ SYSCALL_DECLARE(munlock)
goto out2;
}
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
/* check contiguous map */
first = NULL;
@ -7974,7 +7962,7 @@ SYSCALL_DECLARE(munlock)
error = 0;
out:
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
out2:
dkprintf("[%d]sys_munlock(%lx,%lx): %d\n",
ihk_mc_get_processor_id(), start0, len0, error);
@ -8027,11 +8015,10 @@ SYSCALL_DECLARE(remap_file_pages)
struct vm_range *range;
int er;
int need_populate = 0;
unsigned long irqflags;
dkprintf("sys_remap_file_pages(%#lx,%#lx,%#x,%#lx,%#x)\n",
start0, size, prot, pgoff, flags);
memory_range_write_lock(thread->vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
#define PGOFF_LIMIT ((off_t)1 << ((8*sizeof(off_t) - 1) - PAGE_SHIFT))
if ((size <= 0) || (size & (PAGE_SIZE - 1)) || (prot != 0)
|| (PGOFF_LIMIT <= pgoff)
@ -8075,7 +8062,7 @@ SYSCALL_DECLARE(remap_file_pages)
}
error = 0;
out:
memory_range_write_unlock(thread->vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&thread->vm->memory_range_lock);
if (need_populate
&& (er = populate_process_memory(
@ -8113,11 +8100,10 @@ SYSCALL_DECLARE(mremap)
uintptr_t ret;
uintptr_t lckstart = -1;
uintptr_t lckend = -1;
unsigned long irqflags;
dkprintf("sys_mremap(%#lx,%#lx,%#lx,%#x,%#lx)\n",
oldaddr, oldsize0, newsize0, flags, newaddr);
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
/* check arguments */
if ((oldaddr & ~PAGE_MASK)
@ -8313,7 +8299,7 @@ SYSCALL_DECLARE(mremap)
error = 0;
out:
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
if (!error && (lckstart < lckend)) {
error = populate_process_memory(thread->vm, (void *)lckstart, (lckend - lckstart));
if (error) {
@ -8346,10 +8332,9 @@ SYSCALL_DECLARE(msync)
struct vm_range *range;
uintptr_t s;
uintptr_t e;
unsigned long irqflags;
dkprintf("sys_msync(%#lx,%#lx,%#x)\n", start0, len0, flags);
memory_range_read_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
if ((start0 & ~PAGE_MASK)
|| (flags & ~(MS_ASYNC|MS_INVALIDATE|MS_SYNC))
@ -8443,7 +8428,7 @@ SYSCALL_DECLARE(msync)
error = 0;
out:
memory_range_read_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
dkprintf("sys_msync(%#lx,%#lx,%#x):%d\n", start0, len0, flags, error);
return error;
} /* sys_msync() */
@ -8492,7 +8477,6 @@ SYSCALL_DECLARE(mbind)
struct vm_range *range;
struct vm_range_numa_policy *range_policy, *range_policy_iter = NULL;
DECLARE_BITMAP(numa_mask, PROCESS_NUMA_MASK_BITS);
unsigned long irqflags;
dkprintf("%s: addr: 0x%lx, len: %lu, mode: 0x%x, "
"nodemask: 0x%lx, flags: %lx\n",
@ -8625,7 +8609,7 @@ SYSCALL_DECLARE(mbind)
}
/* Validate address range */
memory_range_write_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, addr, addr + len);
if (!range) {
@ -8792,7 +8776,7 @@ mbind_update_only:
error = 0;
unlock_out:
memory_range_write_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
out:
return error;
} /* sys_mbind() */
@ -9021,20 +9005,19 @@ SYSCALL_DECLARE(get_mempolicy)
/* Address range specific? */
if (flags & MPOL_F_ADDR) {
struct vm_range *range;
unsigned long irqflags;
memory_range_read_lock(vm, &irqflags);
ihk_mc_spinlock_lock_noirq(&vm->memory_range_lock);
range = lookup_process_memory_range(vm, addr, addr + 1);
if (!range) {
dkprintf("%s: ERROR: range is invalid\n", __FUNCTION__);
error = -EFAULT;
memory_range_read_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
goto out;
}
range_policy = vm_range_policy_search(vm, addr);
memory_range_read_unlock(vm, &irqflags);
ihk_mc_spinlock_unlock_noirq(&vm->memory_range_lock);
}
/* Return policy */