Skip to contentSkip to conversation

powerpc/crash: Fix non-smp kexec preparation

PATCH Applied Eddie James 3 participants 3 messages Feb 11, 2025 – May 4, 2025 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 powerpc/crash: Fix non-smp kexec preparation

In non-smp configurations, crash_kexec_prepare is never called in the crash shutdown path. One result of this is that the crashing_cpu variable is never set, preventing crash_save_cpu from storing the NT_PRSTATUS elf note in the core dump.

Fixes c7255058b543 ("powerpc/crash: save cpu register data in crash_smp_send_stop()")

---
Changes since v1:
- Use if (IS_ENABLED(CONFIG_SMP)) instead of #ifdef CONFIG_SMP

 arch/powerpc/kexec/crash.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kexec/crash.c +4 -1
index 9ac3266e49652..a325c1c02f96d 100644
@@ -359,7 +359,10 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
 	if (TRAP(regs) == INTERRUPT_SYSTEM_RESET)
 		is_via_system_reset = 1;
 
-	crash_smp_send_stop();
+	if (IS_ENABLED(CONFIG_SMP))
+		crash_smp_send_stop();
+	else
+		crash_kexec_prepare();
 
 	crash_save_cpu(regs, crashing_cpu);
 
Signature · 1 line
2.43.5
Reviewed-by on v2 1/1
#1 lore raw

Hi Eddie,

Quoted 5 lines · Eddie James

In non-smp configurations, crash_kexec_prepare is never called in the crash shutdown path. One result of this is that the crashing_cpu variable is never set, preventing crash_save_cpu from storing the NT_PRSTATUS elf note in the core dump.

Thanks for fixing this.
Looks good to me.

Quoted 25 lines
Fixes c7255058b543 ("powerpc/crash: save cpu register data in crash_smp_send_stop()")

---
Changes since v1:
- Use if (IS_ENABLED(CONFIG_SMP)) instead of #ifdef CONFIG_SMP

  arch/powerpc/kexec/crash.c | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
arch/powerpc/kexec/crash.c +4 -1
index 9ac3266e49652..a325c1c02f96d 100644
@@ -359,7 +359,10 @@ void default_machine_crash_shutdown(struct pt_regs *regs)
  	if (TRAP(regs) == INTERRUPT_SYSTEM_RESET)
  		is_via_system_reset = 1;
 
-	crash_smp_send_stop();
+	if (IS_ENABLED(CONFIG_SMP))
+		crash_smp_send_stop();
+	else
+		crash_kexec_prepare();
 
  	crash_save_cpu(regs, crashing_cpu);
 
maintainer Applied
#2 lore raw
In reply to Eddie James
Quoted 6 lines · Eddie James

In non-smp configurations, crash_kexec_prepare is never called in the crash shutdown path. One result of this is that the crashing_cpu variable is never set, preventing crash_save_cpu from storing the NT_PRSTATUS elf note in the core dump.

Applied to powerpc/next.

[1/1] powerpc/crash: Fix non-smp kexec preparation

      https://git.kernel.org/powerpc/c/882b25af265de8e05c66f72b9a29f6047102958f

Thanks