feat(kernel: process): provide an argument to the entrypoint function

d4ilyrun · Jun 14, 2024 · 79d7113 · 79d7113
1 parent c888779
commit 79d7113
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/include/kernel/process.h b/include/kernel/process.h
@@ -102,8 +102,9 @@ void process_switch(process_t *process);
  *
  * @param name The name of the process
  * @param entrypoint The function called when starting the process
+ * @param data Data passed to the entry function (can be NULL)
  */
-process_t *process_create(char *name, process_entry_t entrypoint);
+process_t *process_create(char *name, process_entry_t entrypoint, void *);
 
 /** Effectively kill a process
  *
@@ -134,12 +135,14 @@ void arch_process_switch(process_context_t *);
  *
  * @param process Pointer to process to initialize
  * @param entrypoint The entrypoint used for starting this process
+ * @param data Data passed to the entry function (can be NULL)
  *
  * @return Whether we succeded or not
  *
  * @warning Do not call this function directly! This should only be
  *          called by @ref process_create
  */
-bool arch_process_create(process_t *process, process_entry_t entrypoint);
+bool arch_process_create(process_t *process, process_entry_t entrypoint,
+                         void *);
 
 /** @} */
diff --git a/kernel/arch/i686/process.c b/kernel/arch/i686/process.c
@@ -20,7 +20,8 @@ void arch_process_entrypoint(void)
         log_err("SCHED", "Failed to initilize VMM (%s)", current_process->name);
 }
 
-bool arch_process_create(process_t *process, process_entry_t entrypoint)
+bool arch_process_create(process_t *process, process_entry_t entrypoint,
+                         void *data)
 {
     // Allocate a kernel stack for the new process
     u32 *kstack = kmalloc(KERNEL_STACK_SIZE, KMALLOC_KERNEL);
@@ -46,7 +47,7 @@ bool arch_process_create(process_t *process, process_entry_t entrypoint)
 #define KSTACK(_i) kstack[KERNEL_STACK_SIZE / sizeof(u32) - (_i)]
 
     // Stack frame for arch_process_entrypoint
-    KSTACK(0) = 0x1234;          // arg1(NULL)
+    KSTACK(0) = (u32)data;       // arg1
     KSTACK(1) = 0;               // nuke ebp
     KSTACK(2) = (u32)entrypoint; // eip
 

diff --git a/kernel/devices/uacpi.c b/kernel/devices/uacpi.c
@@ -292,9 +292,7 @@ uacpi_status uacpi_kernel_schedule_work(uacpi_work_type type,
 {
     UNUSED(type);
 
-    // FIXME: pass argument to process
-    UNUSED(ctx);
-    process_t *process = process_create("kuacpi", handler);
+    process_t *process = process_create("kuacpi", handler, ctx);
     if (process == NULL)
         return UACPI_STATUS_OUT_OF_MEMORY;
 

diff --git a/kernel/main.c b/kernel/main.c
@@ -243,7 +243,7 @@ void kernel_main(struct multiboot_info *mbt, unsigned int magic)
     }
 
     process_t *kernel_timer_test =
-        process_create("ktimer_test", kernel_task_timer);
+        process_create("ktimer_test", kernel_task_timer, NULL);
     sched_new_process(kernel_timer_test);
 
     log_dbg("TASK", "Re-started task: '%s'", current_process->name);

diff --git a/kernel/sys/process.c b/kernel/sys/process.c
@@ -29,7 +29,7 @@ process_t *current_process = &kernel_startup_process;
  * * Create a new page directory
  * * Copy the kernel's page table
  */
-process_t *process_create(char *name, process_entry_t entrypoint)
+process_t *process_create(char *name, process_entry_t entrypoint, void *data)
 {
     process_t *new = kmalloc(sizeof(*new), KMALLOC_KERNEL);
     if (new == NULL) {
@@ -51,7 +51,7 @@ process_t *process_create(char *name, process_entry_t entrypoint)
     new->pid = g_highest_pid++;
     new->vmm = vmm;
 
-    if (!arch_process_create(new, entrypoint)) {
+    if (!arch_process_create(new, entrypoint, data)) {
         kfree(vmm);
         kfree(new);
     }

diff --git a/kernel/sys/sched.c b/kernel/sys/sched.c
@@ -104,7 +104,7 @@ static void idle_task(void *data __attribute__((unused)))
 
 void scheduler_init(void)
 {
-    idle_process = process_create("<< IDLE >>", idle_task);
+    idle_process = process_create("<< IDLE >>", idle_task, NULL);
     // use the largest PID possible to avoid any conflict later on
     idle_process->pid = (pid_t)-1;
     sched_new_process(idle_process);