Changeset f35749e in mainline for kernel

Timestamp:

2025-02-28T23:38:26Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

8300c72

Parents:

4285f384

Message:

System restart via shutdown -r

Location:

kernel/generic

Files:

• include/arch.h (modified) (2 diffs)
• include/main/main.h (modified) (3 diffs)
• include/main/shutdown.h (added)
• include/proc/task.h (modified) (2 diffs)
• src/console/cmd.c (modified) (2 diffs)
• src/main/main.c (modified) (3 diffs)
• src/main/shutdown.c (modified) (3 diffs)
• src/proc/task.c (modified) (4 diffs)
• src/proc/thread.c (modified) (2 diffs)
• src/syscall/syscall.c (modified) (3 diffs)

kernel/generic/include/arch.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
@@ -106 +107 @@
 extern void calibrate_delay_loop(void);
 
-extern void reboot(void);
 extern void arch_reboot(void);
 extern void *arch_construct_function(fncptr_t *, void *, void *);

kernel/generic/include/main/main.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2006 Martin Decky
  * All rights reserved.
@@ -36 +37 @@
 #define KERN_MAIN_H_
 
+#include <proc/task.h>
 #include <typedefs.h>
 
@@ -42 +44 @@
 /* Address of the end of kernel. */
 extern uint8_t kdata_end[];
+extern task_t *kernel_task;
 
 extern void main_bsp(void);

kernel/generic/include/proc/task.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
  * All rights reserved.
@@ -142 +143 @@
 
 extern void task_init(void);
-extern void task_done(void);
+extern void task_done(task_t *);
 extern task_t *task_create(as_t *, const char *);
 extern void task_hold(task_t *);

kernel/generic/src/console/cmd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2005 Jakub Jermar
  * All rights reserved.
@@ -60 +61 @@
 #include <arch/mm/tlb.h>
 #include <mm/frame.h>
+#include <main/shutdown.h>
 #include <main/version.h>
 #include <mm/slab.h>

kernel/generic/src/main/main.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
@@ -110 +111 @@
 CHECK_INT_TYPE(64);
 
+task_t *kernel_task;
+
 /** Global configuration structure. */
 config_t config = {
@@ -273 +276 @@
                 panic("Cannot create kernel task.");
 
+        kernel_task = kernel;
+
         /*
          * Create the first thread.

kernel/generic/src/main/shutdown.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2007 Martin Decky
  * All rights reserved.
@@ -37 +38 @@
 
 #include <arch.h>
-#include <proc/task.h>
+#include <errno.h>
 #include <halt.h>
 #include <log.h>
+#include <main/main.h>
+#include <main/shutdown.h>
+#include <proc/task.h>
+#include <proc/thread.h>
+
+static thread_t *reboot_thrd = NULL;
+SPINLOCK_INITIALIZE(reboot_lock);
 
 void reboot(void)
 {
-        task_done();
+        task_done(kernel_task);
 
 #ifdef CONFIG_DEBUG
@@ -53 +61 @@
 }
 
+/** Thread procedure for rebooting the system.
+ *
+ * @param arg Argument (unused)
+ */
+static void reboot_thrd_proc(void *arg)
+{
+        (void)arg;
+
+        reboot();
+}
+
+/** Reboot the system.
+ *
+ * @return EOK if reboot started successfully. EBUSY if reboot already
+ *         started, ENOMEM if out of memory.
+ */
+sys_errno_t sys_reboot(void)
+{
+        thread_t *thread;
+
+        thread = thread_create(reboot_thrd_proc, NULL, kernel_task,
+            THREAD_FLAG_NONE, "reboot");
+        if (thread == NULL)
+                return ENOMEM;
+
+        spinlock_lock(&reboot_lock);
+
+        if (reboot_thrd != NULL) {
+                spinlock_unlock(&reboot_lock);
+                thread_put(thread);
+                return EBUSY;
+        }
+
+        reboot_thrd = thread;
+
+        spinlock_unlock(&reboot_lock);
+
+        thread_start(thread);
+        thread_detach(thread);
+
+        return EOK;
+}
+
 /** @}
  */

kernel/generic/src/proc/task.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -104 +104 @@
  *
  */
-void task_done(void)
+void task_done(task_t *cur_task)
 {
         size_t tasks_left;
@@ -112 +112 @@
                 task_t *task_0 = ipc_box_0->task;
                 ipc_box_0 = NULL;
+
                 /*
                  * The first task is held by kinit(), we need to release it or
@@ -129 +130 @@
                 task = task_first();
                 while (task != NULL) {
-                        if (task != TASK) {
+                        if (task != cur_task) {
                                 tasks_left++;
 #ifdef CONFIG_DEBUG

kernel/generic/src/proc/thread.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -338 +338 @@
         irq_spinlock_unlock(&thread->task->lock, false);
 
-        assert((atomic_get_unordered(&thread->state) == Exiting) || (atomic_get_unordered(&thread->state) == Lingering));
+        assert((atomic_get_unordered(&thread->state) == Entering) ||
+            (atomic_get_unordered(&thread->state) == Exiting) ||
+            (atomic_get_unordered(&thread->state) == Lingering));
 
         /* Clear cpu->fpu_owner if set to this thread. */

kernel/generic/src/syscall/syscall.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2005 Martin Decky
  * All rights reserved.
@@ -40 +41 @@
 #include <proc/task.h>
 #include <proc/program.h>
+#include <main/shutdown.h>
 #include <mm/as.h>
 #include <mm/page.h>
@@ -59 +61 @@
         /* System management syscalls. */
         [SYS_KIO] = (syshandler_t) sys_kio,
+        [SYS_REBOOT] = (syshandler_t) sys_reboot,
 
         /* Thread and task related syscalls. */