fork(): preliminary version (no wait()/waitpid() support yet)

executer/kernel/control.c

@@ -358,7 +358,6 @@ retry_alloc:
 			kfree(wqhln);
 			wqhln = wqhln_iter;
 			list_del(&wqhln->list);
-			printk("DEBUG: wait queue head was already available in syscall wait\n");
 			break;
 		}
 	}

executer/kernel/syscall.c

@@ -1126,10 +1126,11 @@ static void clear_pte_range(uintptr_t start, uintptr_t len)
 		}
 		if (addr < end) {
 			zap_vma_ptes(vma, addr, end-addr);
+			dprintk("clear_pte_range() 0x%lx - 0x%lx OK\n", 
+					vma->vm_start, vma->vm_end);
 		}
 		addr = end;
 	}
-
 	up_read(&mm->mmap_sem);
 	return;
 }
@@ -1138,6 +1139,7 @@ int __do_in_kernel_syscall(ihk_os_t os, struct mcctrl_channel *c, struct syscall
 {
 	int error;
 	long ret = -1;
+	struct mcctrl_usrdata *usrdata = ihk_host_os_get_usrdata(os);
 
 	dprintk("__do_in_kernel_syscall(%p,%p,%ld %lx)\n", os, c, sc->number, sc->args[0]);
 	switch (sc->number) {
@@ -1146,6 +1148,11 @@ int __do_in_kernel_syscall(ihk_os_t os, struct mcctrl_channel *c, struct syscall
 		break;
 
 	case __NR_munmap:
+		/* Set new remote page table if not zero */
+		if (sc->args[2]) {
+			usrdata->rpgtable = sc->args[2];
+		}
+
 		clear_pte_range(sc->args[0], sc->args[1]);
 		ret = 0;
 		break;

executer/user/mcexec.c

@@ -1093,6 +1093,55 @@ int main_loop(int fd, int cpu, pthread_mutex_t *lock)
 			break;
 		}
 #endif
+		case __NR_fork: {
+			int child;
+
+			child = fork();
+
+			switch (child) {
+				/* Error */
+				case -1:
+					do_syscall_return(fd, cpu, -1, 0, 0, 0, 0);
+					break;
+
+				/* Child process */
+				case 0: {
+					int i;
+
+					/* Reopen device fd */
+					close(fd);
+					fd = open(dev, O_RDWR);
+					if (fd < 0) {
+						/* TODO: tell parent something went wrong? */
+						fprintf(stderr, "ERROR: opening %s\n", dev);
+						return 1;
+					}
+					
+					/* Reinit signals and syscall threads */
+					init_sigaction();
+					init_worker_threads(fd);
+
+					__dprintf("pid(%d): signals and syscall threads OK\n", 
+							getpid());
+				
+					/* TODO: does the forked thread run in a pthread context? */
+					for (i = 0; i <= ncpu; ++i) {
+						pthread_join(thread_data[i].thread_id, NULL);
+					}
+
+					return 0;
+				}
+				
+				/* Parent */
+				default:
+					
+					do_syscall_return(fd, cpu, child, 0, 0, 0, 0);
+					break;
+			}
+
+			break;
+		}
+
 		default:
 			 ret = do_generic_syscall(&w);
 			 do_syscall_return(fd, cpu, ret, 0, 0, 0, 0);