Changeset 162 for trunk

Timestamp:

Jul 7, 2017, 2:39:34 PM (7 years ago)

Author:

max@…

Message:

start making these variables per-cpu

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (4 diffs)
• hal_segmentation.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -264 +264 @@
 
         /* Attach cpu0 */
-        cpu_attach();
+        cpu_attach(0);
         x86_printf("[+] cpu_attach called\n");
 
@@ -315 +315 @@
 uint8_t gdtstore[PAGE_SIZE] __in_kdata;
 uint8_t idtstore[PAGE_SIZE] __in_kdata;
-struct tss cpu0_tss __in_kdata;
-uint8_t cpu0_intr_stack[STKSIZE] __in_kdata;
-uint8_t cpu0_dbfl_stack[STKSIZE] __in_kdata;
-uint8_t cpu0_nmfl_stack[STKSIZE] __in_kdata;
+struct tss cpu_tss[CONFIG_MAX_LOCAL_CORES] __in_kdata;
+uint8_t cpu_intr_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
+uint8_t cpu_dbfl_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
+uint8_t cpu_nmfl_stack[CONFIG_MAX_LOCAL_CORES][STKSIZE] __in_kdata;
 
 static void
@@ -453 +453 @@
 }
 
-void cpu_create_tss()
-{
-        struct tss *tss = &cpu0_tss;
+void cpu_create_tss(size_t lid)
+{
+        struct tss *tss = &cpu_tss[lid];
         int sel;
 
         /* Create the tss */
         memset(tss, 0, sizeof(*tss));
+
+        /* tss->tss_rsp0 */
+        tss->tss_ist[0] = (uint64_t)cpu_intr_stack[lid] + STKSIZE;
+        tss->tss_ist[1] = (uint64_t)cpu_dbfl_stack[lid] + STKSIZE;
+        tss->tss_ist[2] = (uint64_t)cpu_nmfl_stack[lid] + STKSIZE;
         tss->tss_iobase = IOMAP_INVALOFF << 16;
-        tss->tss_ist[0] = (uint64_t)cpu0_intr_stack + STKSIZE;
-        tss->tss_ist[1] = (uint64_t)cpu0_dbfl_stack + STKSIZE;
-        tss->tss_ist[2] = (uint64_t)cpu0_nmfl_stack + STKSIZE;
         sel = tss_alloc(tss);
 
@@ -472 +474 @@
 /* -------------------------------------------------------------------------- */
 
-void cpu_attach()
+void cpu_attach(size_t lid)
 {
         cpu_load_gdt();
         cpu_load_idt();
-        cpu_create_tss();
-}
-
+        cpu_create_tss(lid);
+}
+

trunk/hal/x86_64/core/hal_segmentation.h

@@ -133 +133 @@
 struct tss {
         uint32_t tss_reserved1;
-        uint64_t tss_rsp0;
-        uint64_t tss_rsp1;
-        uint64_t tss_rsp3;
+        uint64_t tss_rsp0;      /* kernel stack pointer ring 0 */
+        uint64_t tss_rsp1;      /* kernel stack pointer ring 1 */
+        uint64_t tss_rsp2;      /* kernel stack pointer ring 2 */
         uint32_t tss_reserved2;
         uint32_t tss_reserved3;
-        uint64_t tss_ist[7];
+        uint64_t tss_ist[7];    /* Interrupt stack table */
         uint32_t tss_reserved4;
         uint32_t tss_reserved5;