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

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

arch/x86/entry/entry_64.S

+5 −3
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ SYM_CODE_START(\asmsym) 
	UNWIND_HINT_IRET_REGS offset=\has_error_code*8

	ENDBR

	ASM_CLAC

	cld



	.if \has_error_code == 0

		pushq	$-1			/* ORIG_RAX: no syscall to restart */
@@ -439,6 +440,7 @@ SYM_CODE_START(\asmsym) 
	UNWIND_HINT_IRET_REGS

	ENDBR

	ASM_CLAC

	cld



	pushq	$-1			/* ORIG_RAX: no syscall to restart */
@@ -495,6 +497,7 @@ SYM_CODE_START(\asmsym) 
	UNWIND_HINT_IRET_REGS

	ENDBR

	ASM_CLAC

	cld



	/*

	 * If the entry is from userspace, switch stacks and treat it as
@@ -557,6 +560,7 @@ SYM_CODE_START(\asmsym) 
	UNWIND_HINT_IRET_REGS offset=8

	ENDBR

	ASM_CLAC

	cld



	/* paranoid_entry returns GS information for paranoid_exit in EBX. */

	call	paranoid_entry
@@ -882,7 +886,6 @@ SYM_CODE_END(xen_failsafe_callback) 
 */

SYM_CODE_START_LOCAL(paranoid_entry)

	UNWIND_HINT_FUNC

	cld

	PUSH_AND_CLEAR_REGS save_ret=1

	ENCODE_FRAME_POINTER 8
@@ -1000,7 +1003,6 @@ SYM_CODE_END(paranoid_exit) 
 */

SYM_CODE_START_LOCAL(error_entry)

	UNWIND_HINT_FUNC

	cld

	testb	$3, CS+8(%rsp)

	jz	.Lerror_kernelspace
@@ -1134,6 +1136,7 @@ SYM_CODE_START(asm_exc_nmi) 
	 */



	ASM_CLAC

	cld



	/* Use %rdx as our temp variable throughout */

	pushq	%rdx
@@ -1153,7 +1156,6 @@ SYM_CODE_START(asm_exc_nmi) 
	 */



	swapgs

	cld

	FENCE_SWAPGS_USER_ENTRY

	SWITCH_TO_KERNEL_CR3 scratch_reg=%rdx

	movq	%rsp, %rdx