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

Commit 0d550836 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

x86/asm/entry/64: Shrink code in 'paranoid_exit' 



RESTORE_EXTRA_REGS + RESTORE_C_REGS looks small, but it's
a lot of instructions (fourteen). Let's reuse them.

Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
[ Cleaned up the labels. ]
Signed-off-by: default avatarAndy Lutomirski <luto@amacapital.net>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1421272101-16847-2-git-send-email-dvlasenk@redhat.com
Link: http://lkml.kernel.org/r/59d71848cee3ec9eb48c0252e602efd6bd560e3c.1424989793.git.luto@amacapital.net


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e90e147c

arch/x86/kernel/entry_64.S

+4 −6
Original line number Diff line number Diff line
@@ -1285,15 +1285,13 @@ ENTRY(paranoid_exit) 
	DISABLE_INTERRUPTS(CLBR_NONE)

	TRACE_IRQS_OFF_DEBUG

	testl %ebx,%ebx				/* swapgs needed? */

	jnz paranoid_restore

	jnz paranoid_exit_no_swapgs

	TRACE_IRQS_IRETQ 0

	SWAPGS_UNSAFE_STACK

	RESTORE_EXTRA_REGS

	RESTORE_C_REGS

	REMOVE_PT_GPREGS_FROM_STACK 8

	INTERRUPT_RETURN

paranoid_restore:

	jmp paranoid_exit_restore

paranoid_exit_no_swapgs:

	TRACE_IRQS_IRETQ_DEBUG 0

paranoid_exit_restore:

	RESTORE_EXTRA_REGS

	RESTORE_C_REGS

	REMOVE_PT_GPREGS_FROM_STACK 8