Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756732AbbBEJAI (ORCPT ); Thu, 5 Feb 2015 04:00:08 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:49436 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755673AbbBEJAG (ORCPT ); Thu, 5 Feb 2015 04:00:06 -0500 X-SecurityPolicyCheck: OK by SHieldMailChecker v2.2.3 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20140219-2 Date: Thu, 05 Feb 2015 17:59:43 +0900 (JST) Message-Id: <20150205.175943.381586636.d.hatayama@jp.fujitsu.com> To: ebiederm@xmission.com, vgoyal@redhat.com Cc: masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org, kexec@lists.infradead.org Subject: [PATCH] kernel/panic/kexec: fix "crash_kexec_post_notifiers" option issue in oops path From: HATAYAMA Daisuke X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2222 Lines: 68 The commit f06e5153f4ae2e2f3b0300f0e260e40cb7fefd45 introduced "crash_kexec_post_notifiers" kernel boot option, which toggles wheather panic() calls crash_kexec() before or after panic_notifiers and dump kmsg. The problem is that the commit overlooks panic_on_oops kernel boot option. If it is enabled, crash_kexec() is called directly without going through panic() in oops path. To fix this issue, this patch adds a check to "crash_kexec_post_notifiers" in the condition of kexec_should_crash(). Signed-off-by: HATAYAMA Daisuke --- include/linux/kernel.h | 3 +++ kernel/kexec.c | 2 ++ kernel/panic.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 64ce58b..f47379f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -426,6 +426,9 @@ extern int panic_on_unrecovered_nmi; extern int panic_on_io_nmi; extern int panic_on_warn; extern int sysctl_panic_on_stackoverflow; + +extern bool crash_kexec_post_notifiers; + /* * Only to be used by arch init code. If the user over-wrote the default * CONFIG_PANIC_TIMEOUT, honor it. diff --git a/kernel/kexec.c b/kernel/kexec.c index 9a8a01a..0ecf252 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -84,6 +84,8 @@ struct resource crashk_low_res = { int kexec_should_crash(struct task_struct *p) { + if (crash_kexec_post_notifiers) + return 0; if (in_interrupt() || !p->pid || is_global_init(p) || panic_on_oops) return 1; return 0; diff --git a/kernel/panic.c b/kernel/panic.c index 4d8d6f9..6582546 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -32,7 +32,7 @@ static unsigned long tainted_mask; static int pause_on_oops; static int pause_on_oops_flag; static DEFINE_SPINLOCK(pause_on_oops_lock); -static bool crash_kexec_post_notifiers; +bool crash_kexec_post_notifiers; int panic_on_warn __read_mostly; int panic_timeout = CONFIG_PANIC_TIMEOUT; -- 1.9.3 -- 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/