From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753286AbbDBM0Q (ORCPT ); Thu, 2 Apr 2015 08:26:16 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60448 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054AbbDBM0L (ORCPT ); Thu, 2 Apr 2015 08:26:11 -0400 Date: Thu, 2 Apr 2015 05:25:39 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: dvlasenk@redhat.com, mingo@kernel.org, wad@chromium.org, fweisbec@gmail.com, keescook@chromium.org, linux-kernel@vger.kernel.org, ast@plumgrid.com, torvalds@linux-foundation.org, bp@alien8.de, tglx@linutronix.de, oleg@redhat.com, rostedt@goodmis.org, luto@amacapital.net, hpa@zytor.com Reply-To: ast@plumgrid.com, linux-kernel@vger.kernel.org, keescook@chromium.org, fweisbec@gmail.com, mingo@kernel.org, wad@chromium.org, dvlasenk@redhat.com, tglx@linutronix.de, bp@alien8.de, torvalds@linux-foundation.org, rostedt@goodmis.org, oleg@redhat.com, hpa@zytor.com, luto@amacapital.net In-Reply-To: <1427821211-25099-3-git-send-email-dvlasenk@redhat.com> References: <1427821211-25099-3-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Simplify retint_kernel label usage, make retint_restore_args label local Git-Commit-ID: 6ba71b7617f1fa65f19bd34f4484a0694ef9a520 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: 6ba71b7617f1fa65f19bd34f4484a0694ef9a520 Gitweb: http://git.kernel.org/tip/6ba71b7617f1fa65f19bd34f4484a0694ef9a520 Author: Denys Vlasenko AuthorDate: Tue, 31 Mar 2015 19:00:05 +0200 Committer: Ingo Molnar CommitDate: Wed, 1 Apr 2015 13:17:38 +0200 x86/asm/entry/64: Simplify retint_kernel label usage, make retint_restore_args label local Get rid of #define obfuscation of retint_kernel in CONFIG_PREEMPT case by defining retint_kernel label always, not only for CONFIG_PREEMPT. Strip retint_kernel of .global-ness (ENTRY macro) - it has no users outside of this file. This looks like cosmetics, but it is not: "je LABEL" can be optimized to short jump by assember only if LABEL is not global, for global labels jump is always a near one with relocation. Convert retint_restore_args to a local numeric label, making it clearer that it is not used elsewhere in the file. Signed-off-by: Denys Vlasenko Cc: Alexei Starovoitov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Frederic Weisbecker Cc: H. Peter Anvin Cc: Kees Cook Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Steven Rostedt Cc: Will Drewry Link: http://lkml.kernel.org/r/1427821211-25099-3-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index f6e37de..1879c55 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -57,10 +57,6 @@ .section .entry.text, "ax" -#ifndef CONFIG_PREEMPT -#define retint_kernel retint_restore_args -#endif - #ifdef CONFIG_PARAVIRT ENTRY(native_usergs_sysret64) swapgs @@ -741,18 +737,18 @@ opportunistic_sysret_failed: jmp restore_args /* Returning to kernel space */ +retint_kernel: #ifdef CONFIG_PREEMPT /* Interrupts are off */ /* Check if we need preemption */ -ENTRY(retint_kernel) cmpl $0,PER_CPU_VAR(__preempt_count) - jnz retint_restore_args + jnz 1f bt $9,EFLAGS(%rsp) /* interrupts were off? */ - jnc retint_restore_args + jnc 1f call preempt_schedule_irq jmp exit_intr +1: #endif -retint_restore_args: DISABLE_INTERRUPTS(CLBR_ANY) /* * The iretq could re-enable interrupts: