From 415fb9894a4cbd761791ef1e218a5b01089cf80d Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Wed, 28 May 2025 22:35:28 -0400
Subject: kernel: exit: Handle killings of kernel threads

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 sys/kern/kern_exit.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'sys/kern/kern_exit.c')

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index d6c9168..da1e3cf 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -40,7 +40,7 @@
 #define pr_error(...) pr_trace(__VA_ARGS__)
 
 static void
-unload_td(struct proc *td)
+unload_td(struct proc *td, int flags)
 {
     const struct auxval *auxvalp;
     struct exec_prog *execp;
@@ -49,6 +49,10 @@ unload_td(struct proc *td)
     size_t len;
 
     sched_detach(td);
+    if (ISSET(flags, EXIT_KTD)) {
+        return;
+    }
+
     execp = &td->exec;
     auxvalp = &execp->auxval;
     pcbp = &td->pcb;
@@ -79,7 +83,7 @@ unload_td(struct proc *td)
  * @td: Thread to exit
  */
 int
-exit1(struct proc *td)
+exit1(struct proc *td, int flags)
 {
     struct pcb *pcbp;
     struct proc *curtd, *procp;
@@ -97,7 +101,7 @@ exit1(struct proc *td)
     /* If we have any children, kill them too */
     if (td->nleaves > 0) {
         TAILQ_FOREACH(procp, &td->leafq, leaf_link) {
-            exit1(procp);
+            exit1(procp, flags);
         }
     }
 
@@ -110,7 +114,7 @@ exit1(struct proc *td)
         stack -= VM_HIGHER_HALF;
     }
 
-    unload_td(td);
+    unload_td(td, flags);
     vm_unmap(pcbp->addrsp, td->stack_base, PROC_STACK_SIZE);
     vm_free_frame(stack, PROC_STACK_PAGES);
     pmap_destroy_vas(pcbp->addrsp);
@@ -145,6 +149,6 @@ sys_exit(struct syscall_args *scargs)
     struct proc *td = this_td();
 
     td->exit_status = scargs->arg0;
-    exit1(td);
+    exit1(td, 0);
     __builtin_unreachable();
 }
-- 
cgit v1.2.3