From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992424AbbGZGGE (ORCPT ); Sun, 26 Jul 2015 02:06:04 -0400 Received: from mail.skyhub.de ([78.46.96.112]:43161 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751045AbbGZGGC (ORCPT ); Sun, 26 Jul 2015 02:06:02 -0400 Date: Sun, 26 Jul 2015 08:05:43 +0200 From: Borislav Petkov To: Andy Lutomirski Cc: X86 ML , linux-kernel@vger.kernel.org, Brian Gerst , Steven Rostedt , Willy Tarreau , Thomas Gleixner , Peter Zijlstra , Linus Torvalds Subject: Re: [PATCH v2 1/3] x86/entry/64: Refactor IRQ stacks and make them NMI-safe Message-ID: <20150726060543.GA18853@nazgul.tnic> References: <13a3ceb8d36e5fa77b3b9e7a2006245a72b25f5d.1437803711.git.luto@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <13a3ceb8d36e5fa77b3b9e7a2006245a72b25f5d.1437803711.git.luto@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jul 24, 2015 at 10:57:04PM -0700, Andy Lutomirski wrote: > This will allow IRQ stacks to nest inside NMIs or similar entries > that can happen during IRQ stack setup or teardown. > > The Xen code here has a confusing comment. > > The new macros won't work correctly if they're invoked with IRQs on. > Add a check under CONFIG_DEBUG_ENTRY to detect that. > > Signed-off-by: Andy Lutomirski > --- > arch/x86/Kconfig.debug | 2 - > arch/x86/entry/entry_64.S | 89 +++++++++++++++++++++++++++++--------------- > arch/x86/kernel/process_64.c | 4 ++ > 3 files changed, 63 insertions(+), 32 deletions(-) What does that apply against? I get conflicts against current Linus master: $ patch -p1 --dry-run -i /tmp/0001-x86-entry-64-refactor_irq_stacks_and_make_them_nmi-safe.patch checking file arch/x86/Kconfig.debug checking file arch/x86/entry/entry_64.S Hunk #1 succeeded at 544 (offset 54 lines). Hunk #2 FAILED at 568. Hunk #3 FAILED at 598. Hunk #4 succeeded at 1012 (offset 99 lines). Hunk #5 succeeded at 1033 (offset 99 lines). 2 out of 5 hunks FAILED checking file arch/x86/kernel/process_64.c -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --