Handle swapgs in interrupts and scheduling

2026-01-01 18:42:53 +01:00
parent 3bcbdb5ec4
commit 5e6bdcc52d
5 changed files with 24 additions and 8 deletions
--- a/kernel/amd64/intr_stub.S
+++ b/kernel/amd64/intr_stub.S
@@ -48,6 +48,12 @@
  amd64_intr ## n:; \
  x(n); \
  cli; \
+  movq %rsp, %rax; \
+  movq 144(%rax), %rax; \
+  testb $3, %al; \
+  jz 1f; \
+  swapgs; \
+1:; \
  push_regs; \
  cld; \
  movq %rsp, %rdi; \
@@ -58,6 +64,12 @@
  callq amd64_intr_handler; \
  movq (%rsp), %rsp; \
  pop_regs; \
+  movq %rsp, %rax; \
+  movq 144(%rax), %rax; \
+  testb $3, %al; \
+  jz 2f; \
+  swapgs; \
+2:; \
  addq $16, %rsp; \
  iretq;