From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755577AbdKBKzo (ORCPT ); Thu, 2 Nov 2017 06:55:44 -0400 Received: from terminus.zytor.com ([65.50.211.136]:43467 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755556AbdKBKzR (ORCPT ); Thu, 2 Nov 2017 06:55:17 -0400 Date: Thu, 2 Nov 2017 03:50:42 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, dave.hansen@intel.com, hpa@zytor.com, bpetkov@suse.de, brgerst@gmail.com, luto@kernel.org, torvalds@linux-foundation.org, mingo@kernel.org Reply-To: brgerst@gmail.com, luto@kernel.org, bpetkov@suse.de, torvalds@linux-foundation.org, mingo@kernel.org, dave.hansen@intel.com, tglx@linutronix.de, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <510d66a1895cda9473c84b1086f0bb974f22de6a.1509609304.git.luto@kernel.org> References: <510d66a1895cda9473c84b1086f0bb974f22de6a.1509609304.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry/64: Shrink paranoid_exit_restore and make labels local Git-Commit-ID: e53178328c9b96fbdbc719e78c93b5687ee007c3 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: e53178328c9b96fbdbc719e78c93b5687ee007c3 Gitweb: https://git.kernel.org/tip/e53178328c9b96fbdbc719e78c93b5687ee007c3 Author: Andy Lutomirski AuthorDate: Thu, 2 Nov 2017 00:59:02 -0700 Committer: Ingo Molnar CommitDate: Thu, 2 Nov 2017 11:04:39 +0100 x86/entry/64: Shrink paranoid_exit_restore and make labels local paranoid_exit_restore was a copy of restore_regs_and_return_to_kernel. Merge them and make the paranoid_exit internal labels local. Keeping .Lparanoid_exit makes the code a bit shorter because it allows a 2-byte jnz instead of a 5-byte jnz. Saves 96 bytes of text. ( This is still a bit suboptimal in a non-CONFIG_TRACE_IRQFLAGS kernel, but fixing that would make the code rather messy. ) Signed-off-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/510d66a1895cda9473c84b1086f0bb974f22de6a.1509609304.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/entry_64.S | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 925d562..15539644 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1123,17 +1123,14 @@ ENTRY(paranoid_exit) DISABLE_INTERRUPTS(CLBR_ANY) TRACE_IRQS_OFF_DEBUG testl %ebx, %ebx /* swapgs needed? */ - jnz paranoid_exit_no_swapgs + jnz .Lparanoid_exit_no_swapgs TRACE_IRQS_IRETQ SWAPGS_UNSAFE_STACK - jmp paranoid_exit_restore -paranoid_exit_no_swapgs: + jmp .Lparanoid_exit_restore +.Lparanoid_exit_no_swapgs: TRACE_IRQS_IRETQ_DEBUG -paranoid_exit_restore: - RESTORE_EXTRA_REGS - RESTORE_C_REGS - REMOVE_PT_GPREGS_FROM_STACK 8 - INTERRUPT_RETURN +.Lparanoid_exit_restore: + jmp restore_regs_and_return_to_kernel END(paranoid_exit) /*