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

mips/panic: replace smp_send_stop() with kdump friendly version in panic path

Daniel Walker reported problems which happens when
crash_kexec_post_notifiers kernel option is enabled
(https://lkml.org/lkml/2015/6/24/44).

In that case, smp_send_stop() is called before entering kdump routines
which assume other CPUs are still online. As the result, kdump
routines fail to save other CPUs' registers. Additionally for MIPS
OCTEON, it misses to stop the watchdog timer.

To fix this problem, call a new kdump friendly function,
crash_smp_send_stop(), instead of the smp_send_stop() when
crash_kexec_post_notifiers is enabled. crash_smp_send_stop() is a
weak function, and it just call smp_send_stop(). Architecture
codes should override it so that kdump can work appropriately.
This patch provides MIPS version.

Fixes: f06e5153f4ae (kernel/panic.c: add "crash_kexec_post_notifiers" option)
Link: http://lkml.kernel.org/r/20160810080950.11028.28000.stgit@sysi4-13.yrl.intra.hitachi.co.jp
Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com>
Reported-by: Daniel Walker <dwalker@fifo99.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Daniel Walker <dwalker@fifo99.com>
Cc: Xunlei Pang <xpang@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: "Steven J. Hill" <steven.hill@cavium.com>
Cc: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Hidehiro Kawai and committed by
Linus Torvalds
54c721b8 0ee59413

+33 -1
+14
arch/mips/cavium-octeon/setup.c
··· 267 267 default_machine_crash_shutdown(regs); 268 268 } 269 269 270 + #ifdef CONFIG_SMP 271 + void octeon_crash_smp_send_stop(void) 272 + { 273 + int cpu; 274 + 275 + /* disable watchdogs */ 276 + for_each_online_cpu(cpu) 277 + cvmx_write_csr(CVMX_CIU_WDOGX(cpu_logical_map(cpu)), 0); 278 + } 279 + #endif 280 + 270 281 #endif /* CONFIG_KEXEC */ 271 282 272 283 #ifdef CONFIG_CAVIUM_RESERVE32 ··· 922 911 _machine_kexec_shutdown = octeon_shutdown; 923 912 _machine_crash_shutdown = octeon_crash_shutdown; 924 913 _machine_kexec_prepare = octeon_kexec_prepare; 914 + #ifdef CONFIG_SMP 915 + _crash_smp_send_stop = octeon_crash_smp_send_stop; 916 + #endif 925 917 #endif 926 918 927 919 octeon_user_io_init();
+1
arch/mips/include/asm/kexec.h
··· 45 45 extern unsigned long secondary_kexec_args[4]; 46 46 extern void (*relocated_kexec_smp_wait) (void *); 47 47 extern atomic_t kexec_ready_to_reboot; 48 + extern void (*_crash_smp_send_stop)(void); 48 49 #endif 49 50 #endif 50 51
+17 -1
arch/mips/kernel/crash.c
··· 47 47 48 48 static void crash_kexec_prepare_cpus(void) 49 49 { 50 + static int cpus_stopped; 50 51 unsigned int msecs; 52 + unsigned int ncpus; 51 53 52 - unsigned int ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */ 54 + if (cpus_stopped) 55 + return; 56 + 57 + ncpus = num_online_cpus() - 1;/* Excluding the panic cpu */ 53 58 54 59 dump_send_ipi(crash_shutdown_secondary); 55 60 smp_wmb(); ··· 69 64 cpu_relax(); 70 65 mdelay(1); 71 66 } 67 + 68 + cpus_stopped = 1; 69 + } 70 + 71 + /* Override the weak function in kernel/panic.c */ 72 + void crash_smp_send_stop(void) 73 + { 74 + if (_crash_smp_send_stop) 75 + _crash_smp_send_stop(); 76 + 77 + crash_kexec_prepare_cpus(); 72 78 } 73 79 74 80 #else /* !defined(CONFIG_SMP) */
+1
arch/mips/kernel/machine_kexec.c
··· 25 25 #ifdef CONFIG_SMP 26 26 void (*relocated_kexec_smp_wait) (void *); 27 27 atomic_t kexec_ready_to_reboot = ATOMIC_INIT(0); 28 + void (*_crash_smp_send_stop)(void) = NULL; 28 29 #endif 29 30 30 31 int