On Wed, Jan 14, 2015 at 1:48 PM, Denys Vlasenko <dvlas...@redhat.com> wrote: > No code changes.
Steven, is this okay with you? --Andy > > Signed-off-by: Denys Vlasenko <dvlas...@redhat.com> > CC: Linus Torvalds <torva...@linux-foundation.org> > CC: Oleg Nesterov <o...@redhat.com> > CC: Borislav Petkov <b...@alien8.de> > CC: "H. Peter Anvin" <h...@zytor.com> > CC: Andy Lutomirski <l...@amacapital.net> > CC: Frederic Weisbecker <fweis...@gmail.com> > CC: X86 ML <x...@kernel.org> > CC: Alexei Starovoitov <a...@plumgrid.com> > CC: Will Drewry <w...@chromium.org> > CC: Kees Cook <keesc...@chromium.org> > 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 aacfa2c..71036fe 100644 > --- a/arch/x86/kernel/entry_64.S > +++ b/arch/x86/kernel/entry_64.S > @@ -1365,19 +1365,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 > @@ -1438,8 +1426,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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
