From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753791AbbDBMdr (ORCPT ); Thu, 2 Apr 2015 08:33:47 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60791 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753765AbbDBMdn (ORCPT ); Thu, 2 Apr 2015 08:33:43 -0400 Date: Thu, 2 Apr 2015 05:33:02 -0700 From: tip-bot for Denys Vlasenko Message-ID: Cc: bp@suse.de, rostedt@goodmis.org, dvlasenk@redhat.com, keescook@chromium.org, fweisbec@gmail.com, ast@plumgrid.com, wad@chromium.org, luto@amacapital.net, mingo@kernel.org, bp@alien8.de, linux-kernel@vger.kernel.org, hpa@zytor.com, oleg@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: rostedt@goodmis.org, bp@suse.de, keescook@chromium.org, fweisbec@gmail.com, dvlasenk@redhat.com, ast@plumgrid.com, wad@chromium.org, luto@amacapital.net, mingo@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, hpa@zytor.com, oleg@redhat.com, torvalds@linux-foundation.org, tglx@linutronix.de In-Reply-To: <1427899858-7165-1-git-send-email-dvlasenk@redhat.com> References: <1427899858-7165-1-git-send-email-dvlasenk@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/asm/entry/64: Fold the 'test_in_nmi' macro into its only user Git-Commit-ID: 0784b36448a2a85b95b6eb21a69b9045c896c065 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: 0784b36448a2a85b95b6eb21a69b9045c896c065 Gitweb: http://git.kernel.org/tip/0784b36448a2a85b95b6eb21a69b9045c896c065 Author: Denys Vlasenko AuthorDate: Wed, 1 Apr 2015 16:50:57 +0200 Committer: Ingo Molnar CommitDate: Thu, 2 Apr 2015 12:00:10 +0200 x86/asm/entry/64: Fold the 'test_in_nmi' macro into its only user No code changes. Signed-off-by: Denys Vlasenko Acked-by: Borislav Petkov 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/1427899858-7165-1-git-send-email-dvlasenk@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/kernel/entry_64.S | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 03c52e2..386375d 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1355,19 +1355,7 @@ ENTRY(error_exit) CFI_ENDPROC END(error_exit) -/* - * Test if a given stack is an NMI stack or not. - */ - .macro test_in_nmi reg stack nmi_ret normal_ret - cmpq %\reg, \stack - ja \normal_ret - subq $EXCEPTION_STKSZ, %\reg - cmpq %\reg, \stack - jb \normal_ret - jmp \nmi_ret - .endm - - /* runs on exception stack */ +/* Runs on exception stack */ ENTRY(nmi) INTR_FRAME PARAVIRT_ADJUST_EXCEPTION_FRAME @@ -1428,8 +1416,18 @@ ENTRY(nmi) * We check the variable because the first NMI could be in a * breakpoint routine using a breakpoint stack. */ - lea 6*8(%rsp), %rdx - test_in_nmi rdx, 4*8(%rsp), nested_nmi, first_nmi + lea 6*8(%rsp), %rdx + /* Compare the NMI stack (rdx) with the stack we came from (4*8(%rsp)) */ + cmpq %rdx, 4*8(%rsp) + /* If the stack pointer is above the NMI stack, this is a normal NMI */ + ja first_nmi + subq $EXCEPTION_STKSZ, %rdx + cmpq %rdx, 4*8(%rsp) + /* If it is below the NMI stack, it is a normal NMI */ + jb first_nmi + /* Ah, it is within the NMI stack, treat it as nested */ + jmp nested_nmi + CFI_REMEMBER_STATE nested_nmi: