From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756946AbbJINQI (ORCPT ); Fri, 9 Oct 2015 09:16:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:46261 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756648AbbJINQE (ORCPT ); Fri, 9 Oct 2015 09:16:04 -0400 Date: Fri, 9 Oct 2015 06:15:04 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: luto@amacapital.net, peterz@infradead.org, linux-kernel@vger.kernel.org, hpa@zytor.com, dvlasenk@redhat.com, luto@kernel.org, bp@alien8.de, tglx@linutronix.de, torvalds@linux-foundation.org, mingo@kernel.org, brgerst@gmail.com Reply-To: peterz@infradead.org, linux-kernel@vger.kernel.org, luto@amacapital.net, hpa@zytor.com, dvlasenk@redhat.com, luto@kernel.org, bp@alien8.de, tglx@linutronix.de, brgerst@gmail.com, mingo@kernel.org, torvalds@linux-foundation.org In-Reply-To: References: To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY Git-Commit-ID: 4aabd140f9cbe0361401a1368bac74df1010abf5 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: 4aabd140f9cbe0361401a1368bac74df1010abf5 Gitweb: http://git.kernel.org/tip/4aabd140f9cbe0361401a1368bac74df1010abf5 Author: Andy Lutomirski AuthorDate: Mon, 5 Oct 2015 17:48:21 -0700 Committer: Ingo Molnar CommitDate: Fri, 9 Oct 2015 09:41:12 +0200 x86/entry: Hide two syscall entry assertions behind CONFIG_DEBUG_ENTRY This shaves a few cycles off the slow paths. Signed-off-by: Andy Lutomirski Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Link: http://lkml.kernel.org/r/ce383fa9e129286ce6da6e00b53acd4c9fb5d06a.1444091585.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/entry/common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 08a945d..778ca70 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -71,7 +71,8 @@ unsigned long syscall_trace_enter_phase1(struct pt_regs *regs, u32 arch) unsigned long ret = 0; u32 work; - BUG_ON(regs != task_pt_regs(current)); + if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) + BUG_ON(regs != task_pt_regs(current)); work = ACCESS_ONCE(current_thread_info()->flags) & _TIF_WORK_SYSCALL_ENTRY; @@ -160,7 +161,8 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch, u32 work = ACCESS_ONCE(current_thread_info()->flags) & _TIF_WORK_SYSCALL_ENTRY; - BUG_ON(regs != task_pt_regs(current)); + if (IS_ENABLED(CONFIG_DEBUG_ENTRY)) + BUG_ON(regs != task_pt_regs(current)); /* * If we stepped into a sysenter/syscall insn, it trapped in