diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:38:29 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-23 19:38:29 -0300 |
| commit | 77e2817e78b7c20d77a94256f5fcb31651001e8f (patch) | |
| tree | a6e84114b610691ccb552ff3da891317c0971c42 /sys/amd64/amd64/cpu_switch.S | |
| parent | 71bc802f753a5002d2eca6913c7bfdfc138fb250 (diff) | |
| download | FreeBSD-src-77e2817e78b7c20d77a94256f5fcb31651001e8f.zip FreeBSD-src-77e2817e78b7c20d77a94256f5fcb31651001e8f.tar.gz | |
Revert "Revert "MFC r322762, r322799, r322832, r322833:""
This reverts commit 5919c0a9658dde48bd090704915aa3a85a6c0d26.
Diffstat (limited to 'sys/amd64/amd64/cpu_switch.S')
| -rw-r--r-- | sys/amd64/amd64/cpu_switch.S | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 64a3485..552f481 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -87,7 +87,6 @@ END(cpu_throw) ENTRY(cpu_switch) /* Switch to new thread. First, save context. */ movq TD_PCB(%rdi),%r8 - orl $PCB_FULL_IRET,PCB_FLAGS(%r8) movq (%rsp),%rax /* Hardware registers */ movq %r15,PCB_R15(%r8) @@ -99,6 +98,30 @@ ENTRY(cpu_switch) movq %rbx,PCB_RBX(%r8) movq %rax,PCB_RIP(%r8) + testl $PCB_FULL_IRET,PCB_FLAGS(%r8) + jnz 2f + orl $PCB_FULL_IRET,PCB_FLAGS(%r8) + testl $TDP_KTHREAD,TD_PFLAGS(%rdi) + jnz 2f + testb $CPUID_STDEXT_FSGSBASE,cpu_stdext_feature(%rip) + jz 2f + movl %fs,%eax + cmpl $KUF32SEL,%eax + jne 1f + rdfsbaseq %rax + movq %rax,PCB_FSBASE(%r8) +1: movl %gs,%eax + cmpl $KUG32SEL,%eax + jne 2f + movq %rdx,%r12 + movl $MSR_KGSBASE,%ecx /* Read user gs base */ + rdmsr + shlq $32,%rdx + orq %rdx,%rax + movq %rax,PCB_GSBASE(%r8) + movq %r12,%rdx + +2: testl $PCB_DBREGS,PCB_FLAGS(%r8) jnz store_dr /* static predict not taken */ done_store_dr: |
