From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755640AbdKBLB0 (ORCPT ); Thu, 2 Nov 2017 07:01:26 -0400 Received: from terminus.zytor.com ([65.50.211.136]:49507 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755441AbdKBLBZ (ORCPT ); Thu, 2 Nov 2017 07:01:25 -0400 Date: Thu, 2 Nov 2017 03:56:51 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: peterz@infradead.org, brgerst@gmail.com, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org, dave.hansen@intel.com, linux-kernel@vger.kernel.org, mingo@kernel.org, bp@suse.de, luto@kernel.org, bpetkov@suse.de Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, bpetkov@suse.de, bp@suse.de, luto@kernel.org, brgerst@gmail.com, peterz@infradead.org, torvalds@linux-foundation.org, dave.hansen@intel.com, tglx@linutronix.de, hpa@zytor.com In-Reply-To: <856b15bee1f55017b8f79d3758b0d51c48a08cf8.1509609304.git.luto@kernel.org> References: <856b15bee1f55017b8f79d3758b0d51c48a08cf8.1509609304.git.luto@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/traps: Use a new on_thread_stack() helper to clean up an assertion Git-Commit-ID: 3383642c2f9d4f5b4fa37436db4a109a1a10018c 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: 3383642c2f9d4f5b4fa37436db4a109a1a10018c Gitweb: https://git.kernel.org/tip/3383642c2f9d4f5b4fa37436db4a109a1a10018c Author: Andy Lutomirski AuthorDate: Thu, 2 Nov 2017 00:59:17 -0700 Committer: Ingo Molnar CommitDate: Thu, 2 Nov 2017 11:04:49 +0100 x86/traps: Use a new on_thread_stack() helper to clean up an assertion Let's keep the stack-related logic together rather than open-coding a comparison in an assertion in the traps code. Signed-off-by: Andy Lutomirski Reviewed-by: Borislav Petkov Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/856b15bee1f55017b8f79d3758b0d51c48a08cf8.1509609304.git.luto@kernel.org Signed-off-by: Ingo Molnar --- arch/x86/include/asm/processor.h | 6 ++++++ arch/x86/kernel/traps.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index ae2ae6d..f10dae1 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -541,6 +541,12 @@ static inline unsigned long current_top_of_stack(void) #endif } +static inline bool on_thread_stack(void) +{ + return (unsigned long)(current_top_of_stack() - + current_stack_pointer) < THREAD_SIZE; +} + #ifdef CONFIG_PARAVIRT #include #else diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 67db4f4..42a9c44 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -141,8 +141,7 @@ void ist_begin_non_atomic(struct pt_regs *regs) * will catch asm bugs and any attempt to use ist_preempt_enable * from double_fault. */ - BUG_ON((unsigned long)(current_top_of_stack() - - current_stack_pointer) >= THREAD_SIZE); + BUG_ON(!on_thread_stack()); preempt_enable_no_resched(); }