Changeset 168 for trunk/hal/x86_64/core

Timestamp:

Jul 10, 2017, 10:33:15 AM (7 years ago)

Author:

max@…

Message:

make the TLS initialization per-cpu

Location:

trunk/hal/x86_64/core

Files:

• hal_init.c (modified) (5 diffs)
• hal_internal.h (modified) (1 diff)
• hal_interrupt.c (modified) (2 diffs)
• hal_special.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_init.c

@@ -48 +48 @@
 static void gdt_create();
 static void idt_create();
+void cpu_tls_init(size_t lid);
 void cpu_identify();
 void cpu_attach();
@@ -292 +293 @@
         x86_printf("[+] hal_apic_init called\n");
 
-        hal_tls_init_cpu0();
-        x86_printf("[+] hal_tls_init_cpu0 called\n");
+        cpu_tls_init(0);
+        x86_printf("[+] cput_tls_init called\n");
 
         x86_printf("-> mytest = %z\n", mytest);
@@ -328 +329 @@
 typedef struct {
         struct tss tss;
+        struct tls tls;
         uint8_t intr_stack[STKSIZE];
         uint8_t dbfl_stack[STKSIZE];
@@ -485 +487 @@
 /* -------------------------------------------------------------------------- */
 
+void cpu_tls_init(size_t lid)
+{
+        percpu_archdata_t *data = &cpudata[lid];
+        tls_t *cputls = &data->tls;
+
+        memset(cputls, 0, sizeof(tls_t));
+
+        cputls->tls_self = cputls;
+        cputls->tls_gid = hal_lapic_gid();
+        cputls->tls_lid = lid;
+
+        wrmsr(MSR_FSBASE, 0);
+        wrmsr(MSR_GSBASE, (uint64_t)cputls);
+        wrmsr(MSR_KERNELGSBASE, 0);
+}
+
+/* -------------------------------------------------------------------------- */
+
 uint64_t cpu_features[4] __in_kdata;
 
@@ -532 +552 @@
 void cpu_attach(size_t lid)
 {
+        /* Per-cluster structures */
         cpu_load_gdt();
         cpu_load_idt();
+
+        /* Per-cpu structures */
         cpu_create_tss(lid);
 

trunk/hal/x86_64/core/hal_internal.h

@@ -66 +66 @@
 
 /* hal_special.c */
-void hal_tls_init_cpu0();
 
 /* x86_printf.c */

trunk/hal/x86_64/core/hal_interrupt.c

@@ -29 +29 @@
 #include <hal_apic.h>
 #include <hal_internal.h>
+#include <hal_special.h>
 
 /* -------------------------------------------------------------------------- */
@@ -37 +38 @@
 void hal_timer_intr(struct trapframe *tf)
 {
-        x86_printf("-> got timer: rip=%Z\n", tf->tf_rip);
+        x86_printf("-> got timer: rip=%Z (th=%Z)\n", tf->tf_rip,
+            hal_get_current_thread());
         return;
 }

trunk/hal/x86_64/core/hal_special.c

@@ -43 +43 @@
             (*(tls_t * const *)offsetof(tls_t, tls_self)));
         return cputls;
-}
-
-static void hal_tls_load_cpu(tls_t *cputls)
-{
-        wrmsr(MSR_FSBASE, 0);
-        wrmsr(MSR_GSBASE, (uint64_t)cputls);
-        wrmsr(MSR_KERNELGSBASE, 0);
-}
-
-void hal_tls_init_cpu0()
-{
-        tls_t *cputls = &cpu0;
-
-        memset(cputls, 0, sizeof(tls_t));
-
-        cputls->tls_self = cputls;
-        cputls->tls_gid = hal_lapic_gid();
-        cputls->tls_lid = 0; /* XXX */
-
-        hal_tls_load_cpu(cputls);
 }