summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Moffett <ian@osmora.org>2025-09-15 13:01:37 -0400
committerIan Moffett <ian@osmora.org>2025-09-15 13:02:17 -0400
commit76b4d4408ec450d8f8a3aee7223b67da1ce0e2cb (patch)
tree11217d920d871127d21ec50ae9b64c976264d3b4
parent6bd92c969a6f4aefee258adc79a3ab0bde9443b2 (diff)
kernel/amd64: Add task state segment logic
This commit implements the task state segment and splits up processor initialization into two seperate stages. The cpu_conf() function is apart of the first stage and sets up things that should be going by the time the kernel is started / early init. The cpu_init() function runs later functions that initialize further platform specific subsystems. Signed-off-by: Ian Moffett <ian@osmora.org>
-rw-r--r--src/sys/arch/amd64/boot/boot_chip.c27
-rw-r--r--src/sys/arch/amd64/cpu/cpu_conf.c11
-rw-r--r--src/sys/arch/amd64/intel/tss.c158
-rw-r--r--src/sys/include/arch/amd64/mdcpu.h3
-rw-r--r--src/sys/include/arch/amd64/tss.h149
-rw-r--r--src/sys/include/sys/cpuvar.h10
-rw-r--r--src/sys/os/os_init.c3
7 files changed, 356 insertions, 5 deletions
diff --git a/src/sys/arch/amd64/boot/boot_chip.c b/src/sys/arch/amd64/boot/boot_chip.c
index 679a759..8cefdac 100644
--- a/src/sys/arch/amd64/boot/boot_chip.c
+++ b/src/sys/arch/amd64/boot/boot_chip.c
@@ -28,11 +28,15 @@
*/
#include <sys/types.h>
+#include <sys/panic.h>
+#include <sys/cpuvar.h>
#include <machine/uart.h>
#include <machine/gdt.h>
#include <machine/boot.h>
#include <machine/i8259.h>
#include <machine/ioapic.h>
+#include <machine/tss.h>
+#include <machine/gdt.h>
#include <stdbool.h>
static void
@@ -48,12 +52,33 @@ chipset_init(void)
ioapic_init();
}
+/*
+ * Initialize and load the task state segment
+ */
+static void
+init_tss(struct pcore *pcore)
+{
+ struct tss_desc *desc;
+
+ desc = (struct tss_desc *)&g_gdt_data[GDT_TSS_INDEX];
+ write_tss(pcore, desc);
+ tss_load();
+}
+
void
platform_boot(void)
{
+ struct pcore *core;
+
+ /* Try to get the current core */
+ if ((core = this_core()) == NULL) {
+ panic("platform_boot: could not get core\n");
+ }
+
gdt_load();
- i8259_disable();
+ init_tss(core);
+ i8259_disable();
chipset_init();
uart_init();
}
diff --git a/src/sys/arch/amd64/cpu/cpu_conf.c b/src/sys/arch/amd64/cpu/cpu_conf.c
index 7c1f5a0..ee3bb78 100644
--- a/src/sys/arch/amd64/cpu/cpu_conf.c
+++ b/src/sys/arch/amd64/cpu/cpu_conf.c
@@ -57,12 +57,17 @@ init_vectors(void)
void
cpu_conf(struct pcore *pcore)
{
+ /* We use %GS to store the processor */
pcore->self = pcore;
+ wrmsr(IA32_GS_BASE, (uintptr_t)pcore);
+
init_vectors();
idt_load();
- platform_boot();
+}
- /* We use %GS to store the processor */
- wrmsr(IA32_GS_BASE, (uintptr_t)pcore);
+void
+cpu_init(struct pcore *pcore)
+{
lapic_init();
+ platform_boot();
}
diff --git a/src/sys/arch/amd64/intel/tss.c b/src/sys/arch/amd64/intel/tss.c
new file mode 100644
index 0000000..ab905e2
--- /dev/null
+++ b/src/sys/arch/amd64/intel/tss.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2025 Ian Marco Moffett and L5 engineers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/param.h>
+#include <sys/panic.h>
+#include <sys/cdefs.h>
+#include <sys/cpuvar.h>
+#include <vm/physseg.h>
+#include <vm/vm.h>
+#include <machine/tss.h>
+#include <machine/mdcpu.h>
+#include <string.h>
+
+/*
+ * Allocates memory for TSS and kernel
+ * stack.
+ *
+ * XXX: Kernel stack is allocated from
+ * vm_alloc_frame()
+ */
+static void
+alloc_resources(struct mdcore *mdcore)
+{
+ const size_t STACK_SIZE = 0x1000;
+ size_t tss_pages = sizeof(struct tss_entry);
+ static uintptr_t rsp0_base, rsp0;
+ struct tss_entry *tss = &mdcore->tss;
+
+ tss_pages = ALIGN_UP(tss_pages, DEFAULT_PAGESIZE) / DEFAULT_PAGESIZE;
+ memset(tss, 0, sizeof(*tss));
+ rsp0_base = vm_alloc_frame(tss_pages) + VM_HIGHER_HALF;
+
+ if (rsp0_base == 0) {
+ panic("could not allocate RSP0 base\n");
+ }
+
+ rsp0 = rsp0_base + STACK_SIZE;
+ tss->rsp0_lo = rsp0 & 0xFFFFFFFF;
+ tss->rsp0_hi = (rsp0 >> 32) & 0xFFFFFFFF;
+}
+
+int
+tss_alloc_stack(union tss_stack *entry_out, size_t size)
+{
+ uintptr_t base;
+
+ base = vm_alloc_frame(1);
+ if (base == 0) {
+ panic("tss_alloc_stack: failed to allocate stack\n");
+ }
+
+ base = (uintptr_t)PHYS_TO_VIRT(base);
+ entry_out->top = base + size;
+ return 0;
+}
+
+int
+tss_update_ist(struct pcore *pcore, union tss_stack stack, uint8_t istno)
+{
+ struct mdcore *mdcore = &pcore->md;
+ struct tss_entry *tss = &mdcore->tss;
+
+ switch (istno) {
+ case 1:
+ tss->ist1_lo = stack.top_lo;
+ tss->ist1_hi = stack.top_hi;
+ break;
+ case 2:
+ tss->ist2_lo = stack.top_lo;
+ tss->ist2_hi = stack.top_hi;
+ break;
+ case 3:
+ tss->ist3_lo = stack.top_lo;
+ tss->ist3_hi = stack.top_hi;
+ break;
+ case 4:
+ tss->ist4_lo = stack.top_lo;
+ tss->ist4_hi = stack.top_hi;
+ break;
+ case 5:
+ tss->ist5_lo = stack.top_lo;
+ tss->ist5_hi = stack.top_hi;
+ break;
+ case 6:
+ tss->ist6_lo = stack.top_lo;
+ tss->ist6_hi = stack.top_hi;
+ break;
+ case 7:
+ tss->ist7_lo = stack.top_lo;
+ tss->ist7_hi = stack.top_hi;
+ break;
+ default:
+ return -EINVAL;
+ };
+
+ return 0;
+}
+
+void
+write_tss(struct pcore *pcore, struct tss_desc *desc)
+{
+ volatile struct tss_entry *tss;
+ struct mdcore *mdcore = &pcore->md;
+ uintptr_t tss_base;
+ uint8_t io_base;
+
+ alloc_resources(mdcore);
+ tss_base = (uintptr_t)&mdcore->tss;
+
+ desc->seglimit = sizeof(struct tss_entry) - 1;
+ desc->p = 1; /* Must be present to be valid! */
+ desc->g = 0; /* Granularity -> 0 */
+ desc->avl = 0; /* Not used */
+ desc->dpl = 0; /* Descriptor Privilege Level -> 0 */
+ desc->type = 0x9; /* For TSS -> 0x9 (0b1001) */
+
+ desc->base_lo16 = tss_base & 0xFFFF;
+ desc->base_mid8 = (tss_base >> 16) & 0xFF;
+ desc->base_hi_mid8 = (tss_base >> 24) & 0xFF;
+ desc->base_hi32 = (tss_base >> 32) & 0xFFFFFFFF;
+
+ /*
+ * XXX: By default, each process is not allowed to have any I/O
+ * port access. This should be configurable for certain servers
+ * running in CPL 3.
+ */
+ tss = &mdcore->tss;
+ memset((void *)tss->iomap, 0xFF, sizeof(tss->iomap));
+ tss->io_base = offsetof(struct tss_entry, iomap);
+}
diff --git a/src/sys/include/arch/amd64/mdcpu.h b/src/sys/include/arch/amd64/mdcpu.h
index 0a39eb4..1503adb 100644
--- a/src/sys/include/arch/amd64/mdcpu.h
+++ b/src/sys/include/arch/amd64/mdcpu.h
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <sys/cdefs.h>
+#include <machine/tss.h>
#define md_spinwait() __ASMV("pause")
#define md_intoff() __ASMV("cli")
@@ -46,12 +47,14 @@
* @cr3: CR3 register value (PML<n> phys)
* @lapic_base: LAPIC register interface base
* @x2apic: Has the x2APIC? Is 1 if true
+ * @tss: Task state segment for this core
*/
struct mdcore {
uint32_t apic_id;
uint64_t cr3;
void *lapic_base;
uint8_t x2apic : 1;
+ struct tss_entry tss;
};
#endif /* !_MACHINE_MDCPU_H_ */
diff --git a/src/sys/include/arch/amd64/tss.h b/src/sys/include/arch/amd64/tss.h
new file mode 100644
index 0000000..da2059c
--- /dev/null
+++ b/src/sys/include/arch/amd64/tss.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright (c) 2025 Ian Marco Moffett and L5 engineers
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MACHINE_TSS_H_
+#define _MACHINE_TSS_H_ 1
+
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+#define IST_SCHED 1U
+
+struct pcore;
+
+/*
+ * A TSS entry (64-bit)
+ *
+ * See Intel SDM Section 8.2.1 - Task-State Segment (TSS)
+ */
+struct __packed tss_entry {
+ uint32_t reserved1;
+ uint32_t rsp0_lo;
+ uint32_t rsp0_hi;
+ uint32_t rsp1_lo;
+ uint32_t rsp1_hi;
+ uint32_t rsp2_lo;
+ uint32_t rsp2_hi;
+ uint64_t reserved2;
+ uint32_t ist1_lo;
+ uint32_t ist1_hi;
+ uint32_t ist2_lo;
+ uint32_t ist2_hi;
+ uint32_t ist3_lo;
+ uint32_t ist3_hi;
+ uint32_t ist4_lo;
+ uint32_t ist4_hi;
+ uint32_t ist5_lo;
+ uint32_t ist5_hi;
+ uint32_t ist6_lo;
+ uint32_t ist6_hi;
+ uint32_t ist7_lo;
+ uint32_t ist7_hi;
+ uint64_t reserved3;
+ uint16_t reserved4;
+ uint16_t io_base;
+ uint8_t iomap[8192];
+};
+
+/*
+ * TSS descriptor (64-bit)
+ *
+ * The TSS descriptor describes the location
+ * of the TSS segments among other things...
+ *
+ * See Intel SDM Section 8.2.3 - TSS Descriptor in 64-bit mode
+ */
+struct __packed tss_desc {
+ uint16_t seglimit;
+ uint16_t base_lo16;
+ uint8_t base_mid8;
+ uint8_t type : 4;
+ uint8_t zero : 1;
+ uint8_t dpl : 2;
+ uint8_t p : 1;
+ uint8_t seglimit_hi : 4;
+ uint8_t avl : 1;
+ uint8_t unused : 2;
+ uint8_t g : 1;
+ uint8_t base_hi_mid8;
+ uint32_t base_hi32;
+ uint32_t reserved;
+};
+
+/*
+ * Holds the address of the address pointing
+ * to the top of an interrupt stack.
+ */
+union tss_stack {
+ struct {
+ uint32_t top_lo;
+ uint32_t top_hi;
+ };
+ uint64_t top;
+};
+
+__always_inline static inline void
+tss_load(void)
+{
+ __ASMV("str %ax\n"
+ "mov $0x2B, %ax\n"
+ "ltr %ax"
+ );
+}
+
+/*
+ * Allocates TSS stack.
+ *
+ * @entry_out: Result is written here
+ * @size: Size of new stack
+ *
+ * Returns 0 on success.
+ */
+int tss_alloc_stack(union tss_stack *entry_out, size_t size);
+
+/*
+ * Update interrupt stack table entry `istno' with `stack'
+ *
+ * @pcore: Current processor
+ * @stack: Interrupt stack.
+ * @istno: IST number, must be 1-based.
+ *
+ * Returns 0 on success.
+ */
+int tss_update_ist(struct pcore *pcore, union tss_stack stack, uint8_t istno);
+
+/*
+ * Write the TSS with a known state
+ *
+ * @pcore: Current processor
+ * @desc: Descriptor to initialize
+ */
+void write_tss(struct pcore *pcore, struct tss_desc *desc);
+
+#endif /* !_MACHINE_TSS_H_ */
diff --git a/src/sys/include/sys/cpuvar.h b/src/sys/include/sys/cpuvar.h
index b5ff31b..7431ce4 100644
--- a/src/sys/include/sys/cpuvar.h
+++ b/src/sys/include/sys/cpuvar.h
@@ -63,6 +63,16 @@ struct pcore {
void cpu_conf(struct pcore *pcore);
/*
+ * Initialize a processor core on the system, second
+ * stage initialization hook.
+ *
+ * [MD]
+ *
+ * @pcore: Processor core to init
+ */
+void cpu_init(struct pcore *pcore);
+
+/*
* Get the current processing element (core) as
* a 'pcore' descriptor.
*
diff --git a/src/sys/os/os_init.c b/src/sys/os/os_init.c
index ca4d0a9..00f5ffe 100644
--- a/src/sys/os/os_init.c
+++ b/src/sys/os/os_init.c
@@ -16,13 +16,14 @@ main(void)
{
printf("booting l5 lunos v0.0.1...\n");
acpi_early_init();
- cpu_conf(&g_bsp);
cons_init();
syslog_toggle(true);
+ cpu_conf(&g_bsp);
vm_init();
+ cpu_init(&g_bsp);
panic("end of kernel reached\n");
for (;;);
}