Implement userspace TLS, remove RW Locks

kernel/amd64/apic.c

@@ -4,7 +4,7 @@
 #include <amd64/msr.h>
 #include <libk/std.h>
 #include <limine/requests.h>
-#include <sync/rw_spin_lock.h>
+#include <sync/spin_lock.h>
 #include <sys/debug.h>
 #include <sys/mm.h>
 #include <sys/spin.h>
@@ -38,7 +38,7 @@
 
 struct ioapic {
   struct acpi_madt_ioapic table_data;
-  rw_spin_lock_t lock;
+  spin_lock_t lock;
   uintptr_t mmio_base;
 };
 
@@ -59,10 +59,10 @@ static spin_lock_t lapic_calibration_lock = SPIN_LOCK_INIT;
 static uint32_t amd64_ioapic_read (struct ioapic* ioapic, uint32_t reg) {
   spin_lock_ctx_t ctxioar;
 
-  rw_spin_read_lock (&ioapic->lock, &ctxioar);
+  spin_lock (&ioapic->lock, &ctxioar);
   *(volatile uint32_t*)ioapic->mmio_base = reg;
   uint32_t ret = *(volatile uint32_t*)(ioapic->mmio_base + 0x10);
-  rw_spin_read_unlock (&ioapic->lock, &ctxioar);
+  spin_unlock (&ioapic->lock, &ctxioar);
   return ret;
 }
 
@@ -70,10 +70,10 @@ static uint32_t amd64_ioapic_read (struct ioapic* ioapic, uint32_t reg) {
 static void amd64_ioapic_write (struct ioapic* ioapic, uint32_t reg, uint32_t value) {
   spin_lock_ctx_t ctxioaw;
 
-  rw_spin_write_lock (&ioapic->lock, &ctxioaw);
+  spin_lock (&ioapic->lock, &ctxioaw);
   *(volatile uint32_t*)ioapic->mmio_base = reg;
   *(volatile uint32_t*)(ioapic->mmio_base + 0x10) = value;
-  rw_spin_write_unlock (&ioapic->lock, &ctxioaw);
+  spin_unlock (&ioapic->lock, &ctxioaw);
 }
 
 /* Find an IOAPIC corresposting to provided IRQ */
@@ -162,7 +162,7 @@ void amd64_ioapic_init (void) {
                           (uintptr_t)hhdm->offset + (uintptr_t)ioapic_table_data->address,
                           MM_PG_PRESENT | MM_PG_RW);
       ioapics[ioapic_entries++] = (struct ioapic){
-          .lock = RW_SPIN_LOCK_INIT,
+          .lock = SPIN_LOCK_INIT,
           .table_data = *ioapic_table_data,
           .mmio_base = ((uintptr_t)hhdm->offset + (uintptr_t)ioapic_table_data->address),
       };

kernel/amd64/proc.c

@@ -1,6 +1,7 @@
 #include <amd64/gdt.h>
 #include <amd64/proc.h>
 #include <aux/elf.h>
+#include <libk/align.h>
 #include <libk/list.h>
 #include <libk/rbtree.h>
 #include <libk/std.h>
@@ -11,12 +12,11 @@
 #include <proc/proc.h>
 #include <proc/procgroup.h>
 #include <proc/resource.h>
-#include <sync/rw_spin_lock.h>
 #include <sync/spin_lock.h>
 #include <sys/debug.h>
+#include <sys/proc.h>
 
-/* 0 is kpproc */
-static atomic_int pids = 1;
+static atomic_int pids = 0;
 
 struct proc* proc_from_elf (uint8_t* elf_contents) {
   struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
@@ -87,6 +87,8 @@ struct proc* proc_clone (struct proc* proto, uintptr_t vstack_top, uintptr_t ent
   proc->pdata.regs.cs = GDT_UCODE | 0x03;
   proc->pdata.regs.rip = (uint64_t)entry;
 
+  proc_init_tls (proc);
+
   return proc;
 }
 
@@ -116,10 +118,36 @@ void proc_cleanup (struct proc* proc) {
 
   spin_unlock (&proc->lock, &ctxpr);
 
-  procgroup_detach (proc->procgroup, proc);
-
   pmm_free (proc->pdata.kernel_stack, KSTACK_SIZE / PAGE_SIZE);
+  procgroup_unmap (proc->procgroup, proc->pdata.tls_vaddr, proc->procgroup->tls.tls_tmpl_pages);
+
+  procgroup_detach (proc->procgroup, proc);
 
   /* clean the process */
   free (proc);
 }
+
+void proc_init_tls (struct proc* proc) {
+  struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
+
+  size_t tls_size = proc->procgroup->tls.tls_tmpl_size;
+
+  uintptr_t tls_paddr;
+  uint32_t flags = MM_PG_USER | MM_PG_PRESENT | MM_PG_RW;
+
+  uintptr_t tls_vaddr =
+      procgroup_map (proc->procgroup, 0, proc->procgroup->tls.tls_tmpl_pages, flags, &tls_paddr);
+
+  uintptr_t k_tls_addr = (uintptr_t)hhdm->offset + tls_paddr;
+
+  uintptr_t ktcb = k_tls_addr + tls_size;
+  uintptr_t utcb = tls_vaddr + tls_size;
+
+  memset ((void*)k_tls_addr, 0, tls_size);
+  memcpy ((void*)k_tls_addr, (void*)proc->procgroup->tls.tls_tmpl, tls_size);
+
+  *(uintptr_t*)ktcb = utcb;
+
+  proc->pdata.fs_base = utcb;
+  proc->pdata.tls_vaddr = tls_vaddr;
+}

kernel/amd64/proc.h

@@ -16,6 +16,7 @@ struct proc_platformdata {
   struct saved_regs regs;
   uintptr_t kernel_stack;
   uint64_t fs_base;
+  uintptr_t tls_vaddr;
 };
 
 #endif // _KERNEL_AMD64_PROC_H

kernel/amd64/procgroup.h

@@ -0,0 +1,13 @@
+#ifndef _KERNEL_AMD64_PROCGRPUP_H
+#define _KERNEL_AMD64_PROCGRPUP_H
+
+#include <libk/std.h>
+
+struct procgroup_tls {
+  uint8_t* tls_tmpl;
+  size_t tls_tmpl_size;
+  size_t tls_tmpl_total_size;
+  size_t tls_tmpl_pages;
+};
+
+#endif // _KERNEL_AMD64_PROCGRPUP_H