From b62706c9f2ceed65394457ae9b131996a2b29463 Mon Sep 17 00:00:00 2001
From: Brett Weiland <brett_weiland@bpcspace.com>
Date: Fri, 24 Sep 2021 14:20:20 -0500
Subject: [PATCH] palloc/pfree found smp safe

---
 README.md                  |  12 +++++-
 src/debug/gdbinit.gdb      |   1 -
 src/include/panic.h        |   1 +
 src/include/smp.h          |  30 +++++++++----
 src/include/smp_racetest.h |   2 +-
 src/indigo_os              | Bin 45152 -> 0 bytes
 src/kernel/kernel.c        |   6 ++-
 src/kernel/page.c          |  37 +++++++++++-----
 src/kernel/panic.c         |   5 ++-
 src/kernel/printf.c        |   2 +-
 src/kernel/smp.c           |   1 +
 src/kernel/smp_racetest.c  |  84 +++++++++++++++++++++++++++++++++----
 12 files changed, 148 insertions(+), 33 deletions(-)
 delete mode 100755 src/indigo_os

diff --git a/README.md b/README.md
index f10c938..0566e9c 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,21 @@ With all that out of the way, check out the features.
 This project will likely go very slow and take multiple years, as I'm dealing with things such as college and adulting. If there are blatantly obvious bugs, or things look unfinished, I'm still working on them.
 Additionally, there's some pretty messy code. I've improved while working on this project, so expect those things to be changed some time down the line.
 
+# Just completed
+1. palloc()/pfree() is now smp safe
+
 # What I'm working on now
-1. Ensuring palloc() and malloc() are smp safe (current)
+1. Ensuring malloc()/free() is smp safe (current)
 2. Creating kernel space threads with primitive scheduler
 3. VFS filesystem
 4. ACPI, PCI
 5. ext2 filesystem
 6. Userspace processes!!!
 7. IO buffering, process waitlists
-8. Improve scheduler
+8. Implement permanent scheduler
 9. Let's not get too ahead of ourselves...
+
+# Backlog
+## These are things I want to evencually fix, but don't effect current development
+1. Making the bootloader pass kernel command paramaters from fat filesystem. Bootloader has no filesystem and is part of kernel, this will be hard
+2. Making mutexes more space efficent; right now we use a 16 bit variable for every boolean operation
diff --git a/src/debug/gdbinit.gdb b/src/debug/gdbinit.gdb
index 516deba..b8aa7f5 100644
--- a/src/debug/gdbinit.gdb
+++ b/src/debug/gdbinit.gdb
@@ -3,7 +3,6 @@ symbol-file debug/debug_syms.o
 
 set scheduler-locking step
 
-hb page.c:357
 
 define cs2bs
   print (1 << (5 + $arg0))
diff --git a/src/include/panic.h b/src/include/panic.h
index 43712a2..29e9f85 100644
--- a/src/include/panic.h
+++ b/src/include/panic.h
@@ -53,6 +53,7 @@ void panic(int reason, void *frame_p, struct registers *regs);
 #define KERNEL_PANIC_INVALID_IOAPIC_VEC   36
 #define KERNEL_PANIC_HPET_REQUIRED        37
 #define KERNEL_PANIC_SMP_FAILED           38
+#define KERNEL_PANIC_PALLOC_TOO_LARGE     39
 
 #define DEV_EMAIL "brett_weiland@bpcspace.com"
 
diff --git a/src/include/smp.h b/src/include/smp.h
index e331036..ba12c76 100644
--- a/src/include/smp.h
+++ b/src/include/smp.h
@@ -7,6 +7,7 @@
 void smp_prepare();
 extern uint8_t corecount;
 
+/**
 static inline void lock(uint8_t *lock) {
   asm("mov al, 1\n"
       "spinlock:\n"
@@ -16,30 +17,45 @@ static inline void lock(uint8_t *lock) {
       "jnz spinlock\n"
       ::"r"(lock):"al");
 } 
+**/
 
+static inline void lock(uint16_t *mutex) {
+  asm(".spinlock_%=:\n"
+      "lock bts %0, 0\n"
+      "jnc .done_%=\n"
+      "pause\n"
+      "jmp .spinlock_%=\n"
+      ".done_%=:\n"
+      ::"m"(*mutex));
+}
+
+static inline void unlock(uint16_t *mutex) {
+  asm("lock btr %0, 0\n"
+      ::"m"(*mutex));
+}
+
+/**
 static inline void unlock(uint8_t *lock) {
   asm("lock andb [%0], 0"::"r"(lock));
 }
+**/
 
 static inline bool get_set_mutex(uint16_t *mutex) {
   bool ret;
   asm("lock bts %1, 0\n"
-      "jc .mutex_taken\n"
+      "jc .mutex_taken_%=\n"
       "mov %0, 0\n"
-      "jmp .done\n"
-      ".mutex_taken:\n"
+      "jmp .done_%=\n"
+      ".mutex_taken_%=:\n"
       "mov %0, 1\n"
-      ".done:\n"
+      ".done_%=:\n"
       :"=r"(ret)
       :"m"(*mutex));
   return ret;
 }
 
-
-
 //THIS IS ONLY UNTIL WE GET MULTITHREADING SET UP
 uint8_t get_coreid();
 
-#define CREATE_LOTO(name)
 
 #endif
diff --git a/src/include/smp_racetest.h b/src/include/smp_racetest.h
index 25ab7f3..f30c3be 100644
--- a/src/include/smp_racetest.h
+++ b/src/include/smp_racetest.h
@@ -1,6 +1,6 @@
 #ifndef testmalloc_header
 #define testmalloc_header
 
-void test_malloc(unsigned int cnt);
+void racetest();
 
 #endif
diff --git a/src/indigo_os b/src/indigo_os
deleted file mode 100755
index 821f97a363d1b4fc83fd02da37db436c876761f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45152
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

diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 0aa394e..bc5bae8 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -23,7 +23,7 @@
 
 void kmain() {
   printf("Kernal started on core %i\n", get_coreid()); 
-  sync_malloc();
+  racetest();
   PANIC(KERNEL_PANIC_KERNEL_RETURNED);
 }
 
@@ -49,7 +49,6 @@ void kernel_init() {
   init_klog();
   init_pmap(pmap_size); 
   printf("\nKernal started on core 1!\n");
-  //test_malloc(100);
  
   
   find_root_sdp();
@@ -66,6 +65,9 @@ void kernel_init() {
 
   //the rest of this needs to get done before the cores start executing
   init_pmap_smp();
+
+
+
   smp_unlocked = true;
 
   fix_stack();
diff --git a/src/kernel/page.c b/src/kernel/page.c
index 0b286a4..c79b1fa 100644
--- a/src/kernel/page.c
+++ b/src/kernel/page.c
@@ -100,7 +100,6 @@ void fix_stack() {
       :"r"(PA_OFFSET));
   
   while(frame->next != 0) {
-    printf("%p\n", frame->function_base);
     frame->next = PHYS_TO_VIRT((void *)frame->next);
     frame = frame->next;
   }
@@ -171,14 +170,13 @@ void debug_pmap() {
   }
 }
 
-//TODO I know you don't want to, but you need to thoroughly check this.
 void pfree(void *addr, size_t size) { 
   int blevel = 0;
   uint64_t *onbyte;         
   uint64_t page_bitloc; 
   int bbitlen;              
   int lshift;         
-  pmap_t *pmap = first_pmap;
+  pmap_t *pmap;
   
   /* note: there's no security check to see if the page is actually allocated,
    * or if we are freeing the table itself.
@@ -192,10 +190,13 @@ void pfree(void *addr, size_t size) {
     return; 
   }
   size /= 0x1000; 
-  for(; pmap != 0; pmap = pmap->next) {
+  for(pmap = first_pmap; pmap; pmap = pmap->next) {
     page_bitloc = (addr - (void *)pmap) / 0x1000;
     onbyte = pmap->buddy[0] + (page_bitloc / 64);
-    if((addr >= (void *)pmap) && onbyte < pmap->buddy[1]) break;
+    if((addr >= (void *)pmap) && onbyte < pmap->buddy[1]) {
+      lock(&pmap->mutex);
+      break;
+    }
   }
 
   while(blevel < MAX_BUDDY_ORDER) {
@@ -241,6 +242,7 @@ void pfree(void *addr, size_t size) {
       blevel++;
     }
   }
+  unlock(&pmap->mutex);
 }
 
 
@@ -276,13 +278,10 @@ void *palloc(size_t size) {
     self_alloc = false;
     min_blevel = 63 - __builtin_clzl(size);
     if(size & (size - 1)) min_blevel++;
-    if(min_blevel > MAX_BUDDY_ORDER - 1) return 0;
+    if(min_blevel > MAX_BUDDY_ORDER - 1) PANIC(KERNEL_PANIC_PALLOC_TOO_LARGE);
   }
 
   for(blevel = min_blevel; blevel < MAX_BUDDY_ORDER; blevel++) {
-    //for(pmap = first_pmap; pmap != 0; pmap = pmap->next) {
-    //while(!unlocked_pmaps_searched || 
-    //   is_empty(waiting_pmaps[core_id], sizeof(&pmap) * pmap_count)) {
     pmap = first_pmap;
     while(pmap) {
 
@@ -329,12 +328,13 @@ void *palloc(size_t size) {
           return ret;
         }
       }
-get_next_pmap:
       pmap->mutex = 0;
+get_next_pmap:
       if(unlocked_pmaps_searched) {
         pmap = 0;
         for(searchingp_i = waitingp_i + 1; searchingp_i < pmap_count; searchingp_i++) {
           if(waiting_pmaps[waitlist_i(searchingp_i)]) {
+            waitingp_i = searchingp_i;
             pmap = waiting_pmaps[waitlist_i(searchingp_i)];
             break;
           }
@@ -342,6 +342,7 @@ get_next_pmap:
         if(!pmap) {
           for(searchingp_i = 0; searchingp_i <= waitingp_i; searchingp_i++) {
             if(waiting_pmaps[waitlist_i(searchingp_i)]) {
+              waitingp_i = searchingp_i;
               pmap = waiting_pmaps[waitlist_i(searchingp_i)];
               break;
             }
@@ -350,6 +351,7 @@ get_next_pmap:
       }
       else {
         if(!pmap->next) {
+          waitingp_i = 0;
           pmap = waiting_pmaps ? waiting_pmaps[waitlist_i(0)] : 0;
           unlocked_pmaps_searched = true;
         }
@@ -515,3 +517,18 @@ void *init_pmap(size_t pagetable_size) {
   }
   return pmap;
 }
+
+void lock_all_maps() {
+  pmap_t *pmap;
+  for(pmap = first_pmap; pmap; pmap = pmap->next) pmap->mutex = 1;
+  pmap = first_pmap;
+  pmap_count++;
+  for(pmap = first_pmap;;pmap = pmap->next) {
+    if(!pmap->next) {
+      pmap->next = malloc(sizeof(pmap_t));
+      pmap->next->mutex = 1;
+      break;
+    }
+  }
+  first_pmap->mutex = 0;
+}
diff --git a/src/kernel/panic.c b/src/kernel/panic.c
index 06b37da..17a563d 100644
--- a/src/kernel/panic.c
+++ b/src/kernel/panic.c
@@ -6,7 +6,7 @@
 #include <isv.h>
 #include <smp.h>
 
-static uint8_t panic_lock = 0;
+static uint16_t panic_lock = 0;
 
 void panic(int reason, void *eframe_p, struct registers *regs) { // will fill with debugging info latter
   lock(&panic_lock);
@@ -56,6 +56,9 @@ void panic(int reason, void *eframe_p, struct registers *regs) { // will fill wi
     case KERNEL_PANIC_SMP_FAILED:
       printf("\nNot all cores booted successfully (see text before panic).\n");
       break;
+    case KERNEL_PANIC_PALLOC_TOO_LARGE:
+      printf("\npalloc was called with a size greater then supported.\n");
+      break;
     default:
       printf("\nUnknown panic code %i\n.", reason);
       break;
diff --git a/src/kernel/printf.c b/src/kernel/printf.c
index 62261ec..8e33981 100644
--- a/src/kernel/printf.c
+++ b/src/kernel/printf.c
@@ -873,7 +873,7 @@ static int _vsnprintf(out_fct_type out, char* buffer, const size_t maxlen, const
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static uint8_t printf_lock = 0;
+static uint16_t printf_lock = 0;
 int printf_(const char* format, ...)
 {
   //BRETT modification
diff --git a/src/kernel/smp.c b/src/kernel/smp.c
index a55fe49..662f9ed 100644
--- a/src/kernel/smp.c
+++ b/src/kernel/smp.c
@@ -101,6 +101,7 @@ void smp_prepare() {
     if(cores.apic_id[core_i] == cores.bsp) continue;
     stackarray[stack_i].apic_id = cores.apic_id[core_i];
     stackarray[stack_i].stack = palloc(0x1000);
+    printf("core %i's stack: %lx\n", core_i, stackarray[stack_i].stack);
     stackarray[stack_i].secondary_bsp = (stack_i)? false : true;
 
     stack_i++;
diff --git a/src/kernel/smp_racetest.c b/src/kernel/smp_racetest.c
index f86e030..84321de 100644
--- a/src/kernel/smp_racetest.c
+++ b/src/kernel/smp_racetest.c
@@ -1,3 +1,6 @@
+//Disregard bad code here.
+//I'm going to delete this whole file once I am confident smp is safe.
+
 #define CHUNK_SIZE_FROM_INDEX(i) ((1 << ((i) + 5)))
 
 #include <printf.h>
@@ -9,7 +12,7 @@
 
 //will delete later
 
-static uint8_t lockeroni = 0;
+static uint16_t lockeroni = 0;
 
 void test_malloc(unsigned int cnt) {
   void *testchunks[cnt];
@@ -39,14 +42,79 @@ void test_malloc(unsigned int cnt) {
   printf("____________________________________\n");
   unlock(&lockeroni);
 }
-uint8_t cores_waiting = 4;
-void sync_malloc() {
-  void *mtest; 
+
+#define DEBUG_CORE_CNT 2
+
+uint8_t cores_waiting = DEBUG_CORE_CNT;
+uint8_t cores_waiting_2 = DEBUG_CORE_CNT;
+uint8_t cores_waiting_3 = DEBUG_CORE_CNT;
+uint8_t cores_waiting_4 = DEBUG_CORE_CNT;
+uint8_t cores_waiting_5 = DEBUG_CORE_CNT;
+void *smp_outputs[DEBUG_CORE_CNT];
+
+void racetest() {
+  uint8_t core_id = get_coreid();
+  uint8_t c_check;
+  unsigned int core_i; 
+
   asm("lock decb [%0]\n"
-      "spinlock:\n"
+      "spinlock_%=:\n"
       "cmpb [%0], 0\n"
-      "jnz spinlock\n"
+      "jnz spinlock_%=\n"
       ::"m"(cores_waiting));
-  mtest = palloc(0x1000);
-  printf("Make sure none of these match -> %lx\n", mtest);
+
+  smp_outputs[core_id] = palloc(0x1000);
+  printf("Make sure none of these match (palloc) -> %lx\n", smp_outputs[core_id]);
+  free(smp_outputs[core_id]);
+  
+  asm("lock decb [%0]\n"
+      "spinlock_%=:\n"
+      "cmpb [%0], 0\n"
+      "jnz spinlock_%=\n"
+      ::"m"(cores_waiting_2));
+
+  if(core_id == 0) {
+    for(core_i = 0; core_i < DEBUG_CORE_CNT; core_i++) {
+      for(c_check = core_i + 1; c_check < DEBUG_CORE_CNT; c_check++) {
+        if(smp_outputs[core_i] == smp_outputs[c_check]) {
+          printf("TEST FAILED\n");
+          for(;;);
+        }
+      }
+    }
+    printf("TEST PASSED\n");
+    printf("malloc beforehand: \n");
+    debug_heap();
+  }
+  
+
+  asm("lock decb [%0]\n"
+      "spinlock_%=:\n"
+      "cmpb [%0], 0\n"
+      "jnz spinlock_%=\n"
+      ::"m"(cores_waiting_3));
+
+
+  smp_outputs[core_id] = malloc(1);
+  printf("Make sure none of these match (malloc) -> %lx\n", smp_outputs[core_id]);
+
+  asm("lock decb [%0]\n"
+      "spinlock_%=:\n"
+      "cmpb [%0], 0\n"
+      "jnz spinlock_%=\n"
+      ::"m"(cores_waiting_4));
+
+  if(core_id == 0) {
+    for(core_i = 0; core_i < DEBUG_CORE_CNT; core_i++) {
+      for(c_check = core_i + 1; c_check < DEBUG_CORE_CNT; c_check++) {
+        if(smp_outputs[core_i] == smp_outputs[c_check]) {
+          printf("TEST FAILED\n");
+          for(;;);
+        }
+      }
+    }
+    printf("TEST PASSED\n");
+    printf("malloc afterhand: \n");
+    debug_heap();
+  }
 }