Changeset 312

Timestamp:

Aug 2, 2017, 2:36:58 PM (7 years ago)

Author:

max@…

Message:

Add a --no-smp option.

Location:

trunk/hal/x86_64/core

Files:

• hal_boot.S (modified) (1 diff)
• hal_init.c (modified) (6 diffs)
• hal_multiboot.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_boot.S

@@ -229 +229 @@
 1:
 
+        testl   $MULTIBOOT_INFO_HAS_CMDLINE,MB_MI_FLAGS(%ebx)
+        jz      1f
+        movl    MB_MI_CMDLINE(%ebx),%esi        /* src */
+        movl    $RELOC(mb_cmdline),%edi         /* dst */
+        movl    $PAGE_SIZE,%ecx /* len */
+
+        rep
+        movsb   /* copy esi -> edi */
+1:
+
 /*
  * There are four levels of pages in amd64: PML4 -> PDP -> PD -> PT. They will

trunk/hal/x86_64/core/hal_init.c

@@ -58 +58 @@
 char mb_loader_name[PAGE_SIZE] __in_kdata;
 uint8_t mb_mmap[PAGE_SIZE] __in_kdata;
-
+char mb_cmdline[PAGE_SIZE] __in_kdata;
+
+bool_t has_smp __in_kdata = true;
 size_t ncpu __in_kdata = 0;
 static boot_info_t btinfo __in_kdata;
@@ -80 +82 @@
 /* -------------------------------------------------------------------------- */
 
+/* XXX XXX XXX libk */
+char *
+strstr(char *s, const char *find)
+{
+        char c, sc;
+        size_t len;
+
+        if ((c = *find++) != 0) {
+                len = strlen(find);
+                do {
+                        do {
+                                if ((sc = *s++) == 0)
+                                        return (NULL);
+                        } while (sc != c);
+                } while (strncmp(s, find, len) != 0);
+                s--;
+        }
+        return s;
+}
+
 static void
 dump_memmap()
@@ -101 +123 @@
 
                 i += mm->mm_size + 4;
+        }
+
+        if (mb_info.mi_flags & MULTIBOOT_INFO_HAS_CMDLINE) {
+                mb_cmdline[PAGE_SIZE-1] = '\0';
+                if (strstr(mb_cmdline, "--no-smp")) {
+                        has_smp = false;
+                        x86_printf("[+] SMP disabled\n");
+                }
         }
 }
@@ -162 +192 @@
 }
 
-static void init_bootinfo_core(boot_core_t *core)
+static void init_bootinfo_core(boot_core_t *core, size_t n)
 {
         size_t i;
 
         // XXX: not necessarily contiguous
-        for (i = 0; i < ncpu; i++) {
+        for (i = 0; i < n; i++) {
                 memset(&core[i], 0, sizeof(boot_core_t));
 
@@ -240 +270 @@
 
         info->cxy = 0;
-        info->cores_nr = ncpu;
-        init_bootinfo_core((boot_core_t *)&info->core);
+        if (has_smp) {
+                info->cores_nr = ncpu;
+        } else {
+                info->cores_nr = 1;
+        }
+        init_bootinfo_core((boot_core_t *)&info->core, info->cores_nr);
 
         info->rsvd_nr = init_bootinfo_rsvd((boot_rsvd_t *)&info->rsvd);
@@ -396 +430 @@
         init_bootinfo(&btinfo);
 
-        start_secondary_cpus();
+        if (has_smp) {
+                start_secondary_cpus();
+        }
 
         kernel_init(&btinfo);

trunk/hal/x86_64/core/hal_multiboot.h

@@ -71 +71 @@
 /* Offsets into the structure */
 #define MB_MI_FLAGS             0
+#define MB_MI_CMDLINE           16
 #define MB_MI_MMAP_LENGTH       44
 #define MB_MI_MMAP_ADDR         48