Commit c64cc280 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Borislav Petkov

x86/entry: Move CLD to the start of the idtentry macro

Move it after CLAC.
Suggested-by: default avatarPeter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220503032107.680190-5-jiangshanlai@gmail.com
parent ee774dac
...@@ -371,6 +371,7 @@ SYM_CODE_START(\asmsym) ...@@ -371,6 +371,7 @@ SYM_CODE_START(\asmsym)
UNWIND_HINT_IRET_REGS offset=\has_error_code*8 UNWIND_HINT_IRET_REGS offset=\has_error_code*8
ENDBR ENDBR
ASM_CLAC ASM_CLAC
cld
.if \has_error_code == 0 .if \has_error_code == 0
pushq $-1 /* ORIG_RAX: no syscall to restart */ pushq $-1 /* ORIG_RAX: no syscall to restart */
...@@ -439,6 +440,7 @@ SYM_CODE_START(\asmsym) ...@@ -439,6 +440,7 @@ SYM_CODE_START(\asmsym)
UNWIND_HINT_IRET_REGS UNWIND_HINT_IRET_REGS
ENDBR ENDBR
ASM_CLAC ASM_CLAC
cld
pushq $-1 /* ORIG_RAX: no syscall to restart */ pushq $-1 /* ORIG_RAX: no syscall to restart */
...@@ -495,6 +497,7 @@ SYM_CODE_START(\asmsym) ...@@ -495,6 +497,7 @@ SYM_CODE_START(\asmsym)
UNWIND_HINT_IRET_REGS UNWIND_HINT_IRET_REGS
ENDBR ENDBR
ASM_CLAC ASM_CLAC
cld
/* /*
* If the entry is from userspace, switch stacks and treat it as * If the entry is from userspace, switch stacks and treat it as
...@@ -557,6 +560,7 @@ SYM_CODE_START(\asmsym) ...@@ -557,6 +560,7 @@ SYM_CODE_START(\asmsym)
UNWIND_HINT_IRET_REGS offset=8 UNWIND_HINT_IRET_REGS offset=8
ENDBR ENDBR
ASM_CLAC ASM_CLAC
cld
/* paranoid_entry returns GS information for paranoid_exit in EBX. */ /* paranoid_entry returns GS information for paranoid_exit in EBX. */
call paranoid_entry call paranoid_entry
...@@ -882,7 +886,6 @@ SYM_CODE_END(xen_failsafe_callback) ...@@ -882,7 +886,6 @@ SYM_CODE_END(xen_failsafe_callback)
*/ */
SYM_CODE_START_LOCAL(paranoid_entry) SYM_CODE_START_LOCAL(paranoid_entry)
UNWIND_HINT_FUNC UNWIND_HINT_FUNC
cld
PUSH_AND_CLEAR_REGS save_ret=1 PUSH_AND_CLEAR_REGS save_ret=1
ENCODE_FRAME_POINTER 8 ENCODE_FRAME_POINTER 8
...@@ -1000,7 +1003,6 @@ SYM_CODE_END(paranoid_exit) ...@@ -1000,7 +1003,6 @@ SYM_CODE_END(paranoid_exit)
*/ */
SYM_CODE_START_LOCAL(error_entry) SYM_CODE_START_LOCAL(error_entry)
UNWIND_HINT_FUNC UNWIND_HINT_FUNC
cld
testb $3, CS+8(%rsp) testb $3, CS+8(%rsp)
jz .Lerror_kernelspace jz .Lerror_kernelspace
...@@ -1134,6 +1136,7 @@ SYM_CODE_START(asm_exc_nmi) ...@@ -1134,6 +1136,7 @@ SYM_CODE_START(asm_exc_nmi)
*/ */
ASM_CLAC ASM_CLAC
cld
/* Use %rdx as our temp variable throughout */ /* Use %rdx as our temp variable throughout */
pushq %rdx pushq %rdx
...@@ -1153,7 +1156,6 @@ SYM_CODE_START(asm_exc_nmi) ...@@ -1153,7 +1156,6 @@ SYM_CODE_START(asm_exc_nmi)
*/ */
swapgs swapgs
cld
FENCE_SWAPGS_USER_ENTRY FENCE_SWAPGS_USER_ENTRY
SWITCH_TO_KERNEL_CR3 scratch_reg=%rdx SWITCH_TO_KERNEL_CR3 scratch_reg=%rdx
movq %rsp, %rdx movq %rsp, %rdx
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment