lkl: Fix lkl_sys_halt

Signed-off-by: Yuan Liu <liuyuan@google.com>
laijs · Nov 11, 2016 · 8e4ddea · 8e4ddea
1 parent c329658
commit 8e4ddea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/arch/lkl/include/asm/thread_info.h b/arch/lkl/include/asm/thread_info.h
@@ -49,6 +49,7 @@ void free_thread_stack(unsigned long *);
 
 void threads_init(void);
 void threads_cleanup(void);
+void threads_cnt_dec(void);
 
 #define TIF_SYSCALL_TRACE		0
 #define TIF_NOTIFY_RESUME		1

diff --git a/arch/lkl/kernel/setup.c b/arch/lkl/kernel/setup.c
@@ -112,7 +112,8 @@ void machine_restart(char *unused)
 long lkl_sys_halt(void)
 {
 	long err;
-	long params[6] = { 0, };
+	long params[6] = {LINUX_REBOOT_MAGIC1,
+		LINUX_REBOOT_MAGIC2, LINUX_REBOOT_CMD_RESTART, };
 
 	err = lkl_syscall(__NR_reboot, params);
 	if (err < 0)
@@ -158,6 +159,7 @@ static int lkl_run_init(struct linux_binprm *bprm)
 	init_pid_ns.child_reaper = 0;
 
 	syscalls_init();
+	threads_cnt_dec();
 
 	lkl_ops->sem_up(init_sem);
 	lkl_ops->thread_exit();

diff --git a/arch/lkl/kernel/syscalls.c b/arch/lkl/kernel/syscalls.c
@@ -113,6 +113,13 @@ long lkl_syscall(long no, long *params)
 
 	ret = run_syscall(no, params);
 
+	if (no == __NR_reboot) {
+		set_current_state(TASK_UNINTERRUPTIBLE);
+		if (!thread_set_sched_jmp())
+			schedule();
+		return ret;
+	}
+
 out:
 	lkl_cpu_put();
 

diff --git a/arch/lkl/kernel/threads.c b/arch/lkl/kernel/threads.c
@@ -225,6 +225,11 @@ void threads_init(void)
 	ti->tid = lkl_ops->thread_self();
 }
 
+void threads_cnt_dec(void)
+{
+	__sync_fetch_and_sub(&threads_counter, 1);
+}
+
 void threads_cleanup(void)
 {
 	struct task_struct *p;

diff --git a/tools/lkl/lib/hijack/init.c b/tools/lkl/lib/hijack/init.c
@@ -433,6 +433,7 @@ hijack_fini(void)
 {
 	int i;
 	char *dump = getenv("LKL_HIJACK_DUMP");
+	int err;
 
 	/* The following pauses the kernel before exiting allowing one
 	 * to debug or collect stattistics/diagnosis info from it.
@@ -453,5 +454,7 @@ hijack_fini(void)
 	if (nd)
 		lkl_netdev_free(nd);
 
-	lkl_sys_halt();
+	err = lkl_sys_halt();
+	if (err)
+		fprintf(stderr, "lkl_sys_halt: %s\n", lkl_strerror(err));
 }