From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752752AbbCDWya (ORCPT ); Wed, 4 Mar 2015 17:54:30 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41915 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752632AbbCDWy2 (ORCPT ); Wed, 4 Mar 2015 17:54:28 -0500 Date: Wed, 4 Mar 2015 14:53:59 -0800 From: tip-bot for Denys Vlasenko Message-ID: Cc: tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, luto@amacapital.net, fweisbec@gmail.com, ast@plumgrid.com, dvlasenk@redhat.com, bp@alien8.de, keescook@chromium.org, linux-kernel@vger.kernel.org, hpa@zytor.com, wad@chromium.org, oleg@redhat.com Reply-To: hpa@zytor.com, wad@chromium.org, keescook@chromium.org, linux-kernel@vger.kernel.org, bp@alien8.de, oleg@redhat.com, luto@amacapital.net, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, dvlasenk@redhat.com, ast@plumgrid.com, fweisbec@gmail.com In-Reply-To: <59d71848cee3ec9eb48c0252e602efd6bd560e3c.1424989793.git.luto@amacapital.net> References: <1421272101-16847-2-git-send-email-dvlasenk@redhat.com> <59d71848cee3ec9eb48c0252e602efd6bd560e3c.1424989793.git.luto@amacapital.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Shrink code in 'paranoid_exit' Git-Commit-ID: 0d55083698ed2f498e5682c5c252e6b7224890be X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0d55083698ed2f498e5682c5c252e6b7224890be Gitweb: http://git.kernel.org/tip/0d55083698ed2f498e5682c5c252e6b7224890be Author: Denys Vlasenko AuthorDate: Thu, 26 Feb 2015 14:40:29 -0800 Committer: Ingo Molnar CommitDate: Wed, 4 Mar 2015 22:50:50 +0100 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: Denys Vlasenko [ Cleaned up the labels. ] Signed-off-by: Andy Lutomirski Cc: Alexei Starovoitov Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Will Drewry 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: Ingo Molnar --- arch/x86/kernel/entry_64.S | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 695f4d4..8fafed9 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -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