From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751737AbcGMMUi (ORCPT ); Wed, 13 Jul 2016 08:20:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:58167 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbcGMMUc (ORCPT ); Wed, 13 Jul 2016 08:20:32 -0400 Subject: [PATCH 2/2] Allow kdump with crash_kexec_post_notifiers From: Petr Tesarik To: Juergen Gross , Josh Triplett , Ingo Molnar , Thomas Gleixner , Eric Biederman , "H. Peter Anvin" , Boris Ostrovsky , "Paul E. McKenney" , Dave Young , Andrew Morton , David Vrabel Cc: "moderated list:XEN HYPERVISOR INTERFACE" , "maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" , "open list:KEXEC" , open list Date: Wed, 13 Jul 2016 14:20:00 +0200 Message-ID: <20160713122000.14969.99963.stgit@hananiah.suse.cz> In-Reply-To: <20160713121950.14969.78606.stgit@hananiah.suse.cz> References: <20160713121950.14969.78606.stgit@hananiah.suse.cz> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If a crash kernel is loaded, do not crash the running domain. This is needed if the kernel is loaded with crash_kexec_post_notifiers, because panic notifiers are run before __crash_kexec() in that case, and this Xen hook prevents its being called later. Signed-off-by: Petr Tesarik --- arch/x86/xen/enlighten.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 760789a..6e3e7c6 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1325,7 +1325,8 @@ static void xen_crash_shutdown(struct pt_regs *regs) static int xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr) { - xen_reboot(SHUTDOWN_crash); + if (!kexec_crash_loaded()) + xen_reboot(SHUTDOWN_crash); return NOTIFY_DONE; }