diff options
author | kib <kib@FreeBSD.org> | 2009-07-09 09:34:11 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2009-07-09 09:34:11 +0000 |
commit | 1596f53aae0639b74921f046885b0fe1b57766b4 (patch) | |
tree | 72e1f854630487c503e885bb3cc1df1eeb575521 /sys/amd64/ia32/ia32_exception.S | |
parent | 2706e21f2c2e081ec96cde8bfe4e71021535961e (diff) | |
download | FreeBSD-src-1596f53aae0639b74921f046885b0fe1b57766b4.zip FreeBSD-src-1596f53aae0639b74921f046885b0fe1b57766b4.tar.gz |
Restore the segment registers and segment base MSRs for amd64 syscall
return path only when neither thread was context switched while
executing syscall code nor syscall explicitely modified LDT or MSRs.
Save segment registers in trap handlers before interrupts are enabled,
to not allow context switches to happen before registers are saved.
Use separated byte in pcb for indication of fast/full return, since
pcb_flags are not synchronized with context switches.
The change puts back syscall microbenchmark numbers that were slowed
down after commit of the support for LDT on amd64.
Reviewed by: jeff
Tested (and tested, and tested ...) by: pho
Approved by: re (kensmith)
Diffstat (limited to 'sys/amd64/ia32/ia32_exception.S')
-rw-r--r-- | sys/amd64/ia32/ia32_exception.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index 76c5d5a..341f00e 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -42,10 +42,16 @@ SUPERALIGN_TEXT IDTVEC(int0x80_syscall) swapgs - sti pushq $2 /* sizeof "int 0x80" */ subq $TF_ERR,%rsp /* skip over tf_trapno */ movq %rdi,TF_RDI(%rsp) + movq PCPU(CURPCB),%rdi + movb $0,PCB_FULL_IRET(%rdi) + movw %fs,TF_FS(%rsp) + movw %gs,TF_GS(%rsp) + movw %es,TF_ES(%rsp) + movw %ds,TF_DS(%rsp) + sti movq %rsi,TF_RSI(%rsp) movq %rdx,TF_RDX(%rsp) movq %rcx,TF_RCX(%rsp) @@ -60,10 +66,6 @@ IDTVEC(int0x80_syscall) movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) - movw %fs,TF_FS(%rsp) - movw %gs,TF_GS(%rsp) - movw %es,TF_ES(%rsp) - movw %ds,TF_DS(%rsp) movl $TF_HASSEGS,TF_FLAGS(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) movq %rsp, %rdi |