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

fix REQ-39

Browse Source
This commit is contained in:
Tomoki Shirasawa
2016-03-24 13:45:15 +09:00
parent 70b27e06ff
commit 670741ae40
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/kernel/syscall.c
View File

@ -127,6 +127,19 @@ int obtain_clone_cpuid() {
return cpuid;
}
int
arch_clear_host_user_space()
{
struct syscall_request request IHK_DMA_ALIGN;
request.number = __NR_munmap;
request.args[0] = cpu_local_var(current)->vm->region.user_start;
request.args[1] = cpu_local_var(current)->vm->region.user_end -
cpu_local_var(current)->vm->region.user_start;
return do_syscall(&request, ihk_mc_get_processor_id(), 0);
}
SYSCALL_DECLARE(rt_sigaction)
{
int sig = ihk_mc_syscall_arg0(ctx);

9
kernel/syscall.c
View File

@ -112,6 +112,7 @@ extern unsigned long ihk_mc_get_ns_per_tsc(void);
extern int ptrace_detach(int pid, int data);
extern void debug_log(unsigned long);
extern void free_all_process_memory_range(struct process_vm *vm);
extern int arch_clear_host_user_space();
extern struct cpu_local_var *clv;
int prepare_process_ranges_args_envs(struct thread *thread,
@ -1734,13 +1735,7 @@ SYSCALL_DECLARE(execve)
}
/* Clear host user space PTEs */
request.number = __NR_munmap;
request.args[0] = cpu_local_var(current)->vm->region.user_start;
request.args[1] = cpu_local_var(current)->vm->region.user_end -
cpu_local_var(current)->vm->region.user_start;
dkprintf("execve(): requesting host PTE clear\n");
if (do_syscall(&request, ihk_mc_get_processor_id(), 0)) {
if (arch_clear_host_user_space()) {
kprintf("execve(): ERROR: clearing PTEs in host process\n");
panic("");
}