Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kernel/panic/kexec: fix "crash_kexec_post_notifiers" option issue in oops path

Commit f06e5153f4ae2e ("kernel/panic.c: add "crash_kexec_post_notifiers"
option for kdump after panic_notifers") introduced
"crash_kexec_post_notifiers" kernel boot option, which toggles wheather
panic() calls crash_kexec() before panic_notifiers and dump kmsg or after.

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().

Also, put a comment in kexec_should_crash() to explain not obvious things
on this patch.

Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Acked-by: Baoquan He <bhe@redhat.com>
Tested-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Reviewed-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Cc: Baoquan He <bhe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

HATAYAMA Daisuke and committed by
Linus Torvalds
5375b708 f45d85ff

+15 -1
+3
include/linux/kernel.h
··· 439 439 extern int panic_on_io_nmi; 440 440 extern int panic_on_warn; 441 441 extern int sysctl_panic_on_stackoverflow; 442 + 443 + extern bool crash_kexec_post_notifiers; 444 + 442 445 /* 443 446 * Only to be used by arch init code. If the user over-wrote the default 444 447 * CONFIG_PANIC_TIMEOUT, honor it.
+11
kernel/kexec.c
··· 84 84 85 85 int kexec_should_crash(struct task_struct *p) 86 86 { 87 + /* 88 + * If crash_kexec_post_notifiers is enabled, don't run 89 + * crash_kexec() here yet, which must be run after panic 90 + * notifiers in panic(). 91 + */ 92 + if (crash_kexec_post_notifiers) 93 + return 0; 94 + /* 95 + * There are 4 panic() calls in do_exit() path, each of which 96 + * corresponds to each of these 4 conditions. 97 + */ 87 98 if (in_interrupt() || !p->pid || is_global_init(p) || panic_on_oops) 88 99 return 1; 89 100 return 0;
+1 -1
kernel/panic.c
··· 32 32 static int pause_on_oops; 33 33 static int pause_on_oops_flag; 34 34 static DEFINE_SPINLOCK(pause_on_oops_lock); 35 - static bool crash_kexec_post_notifiers; 35 + bool crash_kexec_post_notifiers; 36 36 int panic_on_warn __read_mostly; 37 37 38 38 int panic_timeout = CONFIG_PANIC_TIMEOUT;