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

lock when changing process memory region (in syscall.c) and page-table (in process.c)

Browse Source
This commit is contained in:
Masamichi Takagi m-takagi@ab.jp.nec.com
2012-10-09 11:40:49 +09:00
parent 9a8449df2b
commit dd596a2a78
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/syscall.c
View File

@@ -384,6 +384,7 @@ SYSCALL_DECLARE(mmap)
} else if ((aal_mc_syscall_arg3(ctx) & 0x20) == 0x20) {
// #define MAP_ANONYMOUS 0x20
kprintf("syscall.c,!MAP_FIXED,MAP_ANONYMOUS\n");
unsigned long flags = aal_mc_spinlock_lock(&cpu_local_var(current)->vm->memory_range_lock);
unsigned long s = (region->map_end + PAGE_SIZE - 1) & PAGE_MASK;
unsigned long len = (aal_mc_syscall_arg1(ctx) + PAGE_SIZE - 1) & PAGE_MASK;
// lockr = aal_mc_spinlock_lock(&cpu_status_lock);
@@ -392,13 +393,14 @@ SYSCALL_DECLARE(mmap)
region->map_start,
region->map_end,
s + len);
// aal_mc_spinlock_unlock(&cpu_status_lock, lockr);
aal_mc_spinlock_unlock(&cpu_local_var(current)->vm->memory_range_lock, flags);
kprintf("syscall.c,returning to caller...\n");
if (region->map_end == s + len) { return s; } else { return -EINVAL; }
} else if ((aal_mc_syscall_arg3(ctx) & 0x02) == 0x02) {
// #define MAP_PRIVATE 0x02
unsigned long flags = aal_mc_spinlock_lock(&cpu_local_var(current)->vm->memory_range_lock);
unsigned long s = (region->map_end + PAGE_SIZE - 1) & PAGE_MASK;
unsigned long len = (aal_mc_syscall_arg1(ctx) + PAGE_SIZE - 1) & PAGE_MASK;
// lockr = aal_mc_spinlock_lock(&cpu_status_lock);
@@ -407,7 +409,7 @@ SYSCALL_DECLARE(mmap)
region->map_start,
region->map_end,
s + len);
// aal_mc_spinlock_unlock(&cpu_status_lock, lockr);
aal_mc_spinlock_unlock(&cpu_local_var(current)->vm->memory_range_lock, flags);
if (region->map_end != s + len) { return -EINVAL; }
struct syscall_request request AAL_DMA_ALIGN;