Patchwork powerpc/kdump: Stop all other CPUs before running crash handlers

login
register
mail settings
Submitter Anton Blanchard
Date Aug. 3, 2010, 6:39 a.m.
Message ID <20100803063941.GM29316@kryten>
Download mbox | patch
Permalink /patch/60727/
State Accepted, archived
Commit 249ec2287579d578ea72593dc3b30a00121c4075
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Anton Blanchard - Aug. 3, 2010, 6:39 a.m.
During kdump we run the crash handlers first then stop all other CPUs.
We really want to stop all CPUs as close to the fail as possible and also
have a very controlled environment for running the crash handlers, so it
makes sense to reverse the order.

Signed-off-by: Anton Blanchard <anton@samba.org>
---
Matt Evans - Aug. 3, 2010, 11:12 p.m.
Anton Blanchard wrote:
> During kdump we run the crash handlers first then stop all other CPUs.
> We really want to stop all CPUs as close to the fail as possible and also
> have a very controlled environment for running the crash handlers, so it
> makes sense to reverse the order.
> 
> Signed-off-by: Anton Blanchard <anton@samba.org>

Looks like a sensible idea!

Acked-by: Matt Evans <matt@ozlabs.org>

> ---
> 
> Index: powerpc.git/arch/powerpc/kernel/crash.c
> ===================================================================
> --- powerpc.git.orig/arch/powerpc/kernel/crash.c	2010-07-15 20:49:39.941991306 +1000
> +++ powerpc.git/arch/powerpc/kernel/crash.c	2010-08-03 16:36:08.451991018 +1000
> @@ -402,6 +402,18 @@ void default_machine_crash_shutdown(stru
>  	 */
>  	hard_irq_disable();
>  
> +	/*
> +	 * Make a note of crashing cpu. Will be used in machine_kexec
> +	 * such that another IPI will not be sent.
> +	 */
> +	crashing_cpu = smp_processor_id();
> +	crash_save_cpu(regs, crashing_cpu);
> +	crash_kexec_prepare_cpus(crashing_cpu);
> +	cpu_set(crashing_cpu, cpus_in_crash);
> +#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
> +	crash_kexec_wait_realmode(crashing_cpu);
> +#endif
> +
>  	for_each_irq(i) {
>  		struct irq_desc *desc = irq_to_desc(i);
>  
> @@ -438,18 +450,8 @@ void default_machine_crash_shutdown(stru
>  	crash_shutdown_cpu = -1;
>  	__debugger_fault_handler = old_handler;
>  
> -	/*
> -	 * Make a note of crashing cpu. Will be used in machine_kexec
> -	 * such that another IPI will not be sent.
> -	 */
> -	crashing_cpu = smp_processor_id();
> -	crash_save_cpu(regs, crashing_cpu);
> -	crash_kexec_prepare_cpus(crashing_cpu);
> -	cpu_set(crashing_cpu, cpus_in_crash);
>  	crash_kexec_stop_spus();
> -#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
> -	crash_kexec_wait_realmode(crashing_cpu);
> -#endif
> +
>  	if (ppc_md.kexec_cpu_down)
>  		ppc_md.kexec_cpu_down(1, 0);
>  }

Patch

Index: powerpc.git/arch/powerpc/kernel/crash.c
===================================================================
--- powerpc.git.orig/arch/powerpc/kernel/crash.c	2010-07-15 20:49:39.941991306 +1000
+++ powerpc.git/arch/powerpc/kernel/crash.c	2010-08-03 16:36:08.451991018 +1000
@@ -402,6 +402,18 @@  void default_machine_crash_shutdown(stru
 	 */
 	hard_irq_disable();
 
+	/*
+	 * Make a note of crashing cpu. Will be used in machine_kexec
+	 * such that another IPI will not be sent.
+	 */
+	crashing_cpu = smp_processor_id();
+	crash_save_cpu(regs, crashing_cpu);
+	crash_kexec_prepare_cpus(crashing_cpu);
+	cpu_set(crashing_cpu, cpus_in_crash);
+#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
+	crash_kexec_wait_realmode(crashing_cpu);
+#endif
+
 	for_each_irq(i) {
 		struct irq_desc *desc = irq_to_desc(i);
 
@@ -438,18 +450,8 @@  void default_machine_crash_shutdown(stru
 	crash_shutdown_cpu = -1;
 	__debugger_fault_handler = old_handler;
 
-	/*
-	 * Make a note of crashing cpu. Will be used in machine_kexec
-	 * such that another IPI will not be sent.
-	 */
-	crashing_cpu = smp_processor_id();
-	crash_save_cpu(regs, crashing_cpu);
-	crash_kexec_prepare_cpus(crashing_cpu);
-	cpu_set(crashing_cpu, cpus_in_crash);
 	crash_kexec_stop_spus();
-#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
-	crash_kexec_wait_realmode(crashing_cpu);
-#endif
+
 	if (ppc_md.kexec_cpu_down)
 		ppc_md.kexec_cpu_down(1, 0);
 }