Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 838feb47 authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, asm: Flip RESTORE_ARGS arguments logic 



... thus getting rid of the "else" part of the conditional statement in
the macro.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1306873314-32523-4-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent cac0e0a7

arch/x86/ia32/ia32entry.S

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ sysexit_from_sys_call: 
	andl  $~0x200,EFLAGS-R11(%rsp) 

	movl	RIP-R11(%rsp),%edx		/* User %eip */

	CFI_REGISTER rip,rdx

	RESTORE_ARGS 1,24,1,1,1,1

	RESTORE_ARGS 0,24,0,0,0,0

	xorq	%r8,%r8

	xorq	%r9,%r9

	xorq	%r10,%r10
@@ -328,7 +328,7 @@ cstar_dispatch: 
	jnz sysretl_audit

sysretl_from_sys_call:

	andl $~TS_COMPAT,TI_status(%r10)

	RESTORE_ARGS 1,-ARG_SKIP,1,1,1

	RESTORE_ARGS 0,-ARG_SKIP,0,0,0

	movl RIP-ARGOFFSET(%rsp),%ecx

	CFI_REGISTER rip,rcx

	movl EFLAGS-ARGOFFSET(%rsp),%r11d

arch/x86/include/asm/calling.h

+8 −13
Original line number Diff line number Diff line
@@ -109,32 +109,27 @@ For 32-bit we have the following conventions - kernel is built with 


#define ARG_SKIP	(9*8)



	.macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \

			    skipr8910=0, skiprdx=0

	.if \skipr11

	.else

	.macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \

			    rstor_r8910=1, rstor_rdx=1

	.if \rstor_r11

	movq_cfi_restore 0*8, r11

	.endif



	.if \skipr8910

	.else

	.if \rstor_r8910

	movq_cfi_restore 1*8, r10

	movq_cfi_restore 2*8, r9

	movq_cfi_restore 3*8, r8

	.endif



	.if \skiprax

	.else

	.if \rstor_rax

	movq_cfi_restore 4*8, rax

	.endif



	.if \skiprcx

	.else

	.if \rstor_rcx

	movq_cfi_restore 5*8, rcx

	.endif



	.if \skiprdx

	.else

	.if \rstor_rdx

	movq_cfi_restore 6*8, rdx

	.endif
@@ -193,7 +188,7 @@ For 32-bit we have the following conventions - kernel is built with 


	.macro RESTORE_ALL addskip=0

	RESTORE_REST

	RESTORE_ARGS 0, \addskip

	RESTORE_ARGS 1, \addskip

	.endm



	.macro icebp

arch/x86/kernel/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ sysret_check: 
	TRACE_IRQS_ON

	movq RIP-ARGOFFSET(%rsp),%rcx

	CFI_REGISTER	rip,rcx

	RESTORE_ARGS 0,-ARG_SKIP,1

	RESTORE_ARGS 1,-ARG_SKIP,0

	/*CFI_REGISTER	rflags,r11*/

	movq	PER_CPU_VAR(old_rsp), %rsp

	USERGS_SYSRET64
@@ -858,7 +858,7 @@ retint_restore_args: /* return to kernel space */ 
	 */

	TRACE_IRQS_IRETQ

restore_args:

	RESTORE_ARGS 0,8,0

	RESTORE_ARGS 1,8,1



irq_return:

	INTERRUPT_RETURN