Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752761AbbBXAek (ORCPT ); Mon, 23 Feb 2015 19:34:40 -0500 Received: from mail-qc0-f175.google.com ([209.85.216.175]:38536 "EHLO mail-qc0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751959AbbBXAeg (ORCPT ); Mon, 23 Feb 2015 19:34:36 -0500 MIME-Version: 1.0 In-Reply-To: <1424736744-13414-4-git-send-email-dvlasenk@redhat.com> References: <1424736744-13414-1-git-send-email-dvlasenk@redhat.com> <1424736744-13414-4-git-send-email-dvlasenk@redhat.com> From: Andy Lutomirski Date: Mon, 23 Feb 2015 16:34:15 -0800 Message-ID: Subject: Re: [PATCH 4/6] x86: entry_64.S: fold test_in_nmi macro into its only user To: Denys Vlasenko , Steven Rostedt Cc: Linus Torvalds , Oleg Nesterov , Borislav Petkov , "H. Peter Anvin" , Frederic Weisbecker , X86 ML , Alexei Starovoitov , Will Drewry , Kees Cook , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2385 Lines: 80 On Mon, Feb 23, 2015 at 4:12 PM, Denys Vlasenko wrote: > No code changes. This needs to address Steven's comments, I think, and I'd like his ack, too. --Andy > > Signed-off-by: Denys Vlasenko > CC: Linus Torvalds > CC: Oleg Nesterov > CC: Borislav Petkov > CC: "H. Peter Anvin" > CC: Andy Lutomirski > CC: Frederic Weisbecker > CC: X86 ML > CC: Alexei Starovoitov > CC: Will Drewry > CC: Kees Cook > CC: linux-kernel@vger.kernel.org > --- > arch/x86/kernel/entry_64.S | 24 +++++++++--------------- > 1 file changed, 9 insertions(+), 15 deletions(-) > > diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S > index 03498d0..c628a1b 100644 > --- a/arch/x86/kernel/entry_64.S > +++ b/arch/x86/kernel/entry_64.S > @@ -1378,19 +1378,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 > @@ -1451,8 +1439,14 @@ 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 > + cmpq %rdx, 4*8(%rsp) > + ja first_nmi > + subq $EXCEPTION_STKSZ, %rdx > + cmpq %rdx, 4*8(%rsp) > + jb first_nmi > + jmp nested_nmi > + > CFI_REMEMBER_STATE > > nested_nmi: > -- > 1.8.1.4 > -- Andy Lutomirski AMA Capital Management, LLC -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/