powerpc/crash: Remove the test for cpu_online in the IPI callback
PATCH v4 1/2 powerpc/crash: Remove the test for cpu_online in the IPI callback
Our check was extra cautious, we've audited crash_send_ipi and it sends an IPI only to online CPU's. Removal of this check should have not functional impact on crash kdump.
--- arch/powerpc/kernel/crash.c | 3 --- 1 file changed, 3 deletions(-)
arch/powerpc/kernel/crash.c +0 -3
@@ -69,9 +69,6 @@ static void crash_ipi_callback(struct pt_regs *regs)int cpu =smp_processor_id (); -if (!cpu_online (cpu)) -return ; -hard_irq_disable ();if (!cpumask_test_cpu (cpu, &cpus_state_saved)) {crash_save_cpu (regs, cpu);
Signature · 1 line
2.13.6
PATCH v4 2/2 powernv/kdump: Fix cases where the kdump kernel can get HMI's
Certain HMI's such as malfunction error propagate through all threads/core on the system. If a thread was offline prior to us crashing the system and jumping to the kdump kernel, bad things happen when it wakes up due to an HMI in the kdump kernel.
There are several possible ways to solve this problem
1. Put the offline cores in a state such that they are not woken up for machine check and HMI errors. This does not work, since we might need to wake up offline threads to handle TB errors
2. Ignore HMI errors, setup HMEER to mask HMI errors, but this still leads the window open for any MCEs and masking them for the duration of the dump might be a concern
3. Wake up offline CPUs, as in send them to crash_ipi_callback (not wake them up as in mark them online as seen by the hotplug). kexec does a wake_online_cpus() call, this patch does something similar, but instead sends an IPI and forces them to crash_ipi_callback()
This patch takes approach #3.
Care is taken to enable this only for powenv platforms via crash_wake_offline (a global value set at setup time). The crash code sends out IPI's to all CPU's which then move to crash_ipi_callback and kexec_smp_wait().
---
Changelog v4
- Handle the case for crash IPI's sent via non NMI
- Drop system reset via SCOM in non-power saving mode
arch/powerpc/include/asm/kexec.h | 2 ++ arch/powerpc/kernel/crash.c | 13 ++++++++++++- arch/powerpc/kernel/smp.c | 18 ++++++++++++++++++ arch/powerpc/platforms/powernv/smp.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-)
arch/powerpc/include/asm/kexec.h +2 -0
@@ -73,6 +73,8 @@ extern void kexec_smp_wait(void); /* get and clear naca physid, wait formaster to copy new code to 0 */ extern int crashing_cpu;extern void crash_send_ipi (void (*crash_ipi_callback)(struct pt_regs *)); +extern void crash_ipi_callback (struct pt_regs *); +extern int crash_wake_offline;struct kimage ;struct pt_regs ;
arch/powerpc/kernel/crash.c +12 -1
@@ -44,6 +44,14 @@#define REAL_MODE_TIMEOUT 10000static int time_to_dump; +/* +* crash_wake_offline should be set to 1 by platforms that intend to wake +* up offline cpus prior to jumping to a kdump kernel. Currently powernv +* sets it to 1, since we want to avoid things from happening when an +* offline CPU wakes up due to something like an HMI (malfunction error), +* which propagates to all threads. +*/ +int crash_wake_offline;#define CRASH_HANDLER_MAX 3/* List of shutdown handles */
@@ -63,7 +71,7 @@ static int handle_fault(struct pt_regs *regs)#ifdef CONFIG_SMP static atomic_t cpus_in_crash; -static void crash_ipi_callback (struct pt_regs *regs) +void crash_ipi_callback (struct pt_regs *regs) {static cpumask_t cpus_state_saved =CPU_MASK_NONE ;
@@ -106,6 +114,9 @@ static void crash_kexec_prepare_cpus(int cpu)printk (KERN_EMERG "Sending IPI to other CPUs\n" ); +if (crash_wake_offline) + ncpus =num_present_cpus () -1 ; +crash_send_ipi (crash_ipi_callback);smp_wmb ();
arch/powerpc/kernel/smp.c +18 -0
@@ -543,7 +543,25 @@ void smp_send_debugger_break(void)#ifdef CONFIG_KEXEC_CORE void crash_send_ipi (void (*crash_ipi_callback)(struct pt_regs *)) { +int cpu; +smp_send_nmi_ipi (NMI_IPI_ALL_OTHERS , crash_ipi_callback,1000000 ); +if (kdump_in_progress () && crash_wake_offline) { +for_each_present_cpu (cpu) { +if (cpu_online (cpu)) +continue ; +/* +* crash_ipi_callback will wait for +* all cpus, including offline CPUs. +* We don't care about nmi_ipi_function. +* Offline cpus will jump straight into +* crash_ipi_callback, we can skip the +* entire NMI dance and waiting for +* cpus to clear pending mask, etc. +*/ +do_smp_send_nmi_ipi (cpu); + } + } }#endif
arch/powerpc/platforms/powernv/smp.c +28 -0
@@ -37,6 +37,8 @@#include <asm/kvm_ppc.h> #include <asm/ppc-opcode.h> #include <asm/cpuidle.h> +#include <asm/kexec.h> +#include <asm/reg.h> #include "powernv.h"
@@ -209,9 +211,32 @@ static void pnv_smp_cpu_kill_self(void) }else if ((srr1 & wmask) ==SRR1_WAKEHDBELL ) {unsigned long msg =PPC_DBELL_TYPE (PPC_DBELL_SERVER ); asm volatile(PPC_MSGCLR(%0) : : "r" (msg)); + }else if ((srr1 & wmask) ==SRR1_WAKERESET ) { +irq_set_pending_from_srr1 (srr1); +/* Does not return */ } +smp_mb (); +/* +* For kdump kernels, we process the ipi and jump to +* crash_ipi_callback +*/ +if (kdump_in_progress ()) { +/* +* If we got to this point, we've not used +* NMI's, otherwise we would have gone +* via the SRR1_WAKERESET path. We are +* using regular IPI's for waking up offline +* threads. +*/ +struct pt_regs regs; + +ppc_save_regs (®s); +crash_ipi_callback (®s); +/* Does not return */ + } +if (cpu_core_split_required ())continue ;
@@ -371,5 +396,8 @@ void __init pnv_smp_init(void)#ifdef CONFIG_HOTPLUG_CPU ppc_md.cpu_die = pnv_smp_cpu_kill_self; +#ifdef CONFIG_KEXEC_CORE + crash_wake_offline =1 ; +#endif #endif }
Signature · 1 line
2.13.6
Re: [PATCH v4 2/2] powernv/kdump: Fix cases where the kdump kernel can get HMI's
Quoted 23 lines · On Fri, 15 Dec 2017 19:14:55 +1100 Balbir Singh <[email protected]> wrote:
Certain HMI's such as malfunction error propagate through all threads/core on the system. If a thread was offline prior to us crashing the system and jumping to the kdump kernel, bad things happen when it wakes up due to an HMI in the kdump kernel.
There are several possible ways to solve this problem
1. Put the offline cores in a state such that they are not woken up for machine check and HMI errors. This does not work, since we might need to wake up offline threads to handle TB errors
2. Ignore HMI errors, setup HMEER to mask HMI errors, but this still leads the window open for any MCEs and masking them for the duration of the dump might be a concern
3. Wake up offline CPUs, as in send them tocrash_ipi_callback(not wake them up as in mark them online as seen by the hotplug). kexec does awake_online_cpus()call, this patch does something similar, but instead sends an IPI and forces them tocrash_ipi_callback()
Quoted 7 lines
This patch takes approach #3.
Care is taken to enable this only for powenv platforms via
crash_wake_offline(a global value set at setup time). The crash code sends out IPI's to all CPU's which then move tocrash_ipi_callbackandkexec_smp_wait().
Quoted 150 lines
Signed-off-by Balbir Singh <[email protected]>---
Changelog v4
- Handle the case for crash IPI's sent via non NMI
- Drop system reset via SCOM in non-power saving modearch/powerpc/include/asm/kexec.h | 2 ++ arch/powerpc/kernel/crash.c | 13 ++++++++++++- arch/powerpc/kernel/smp.c | 18 ++++++++++++++++++ arch/powerpc/platforms/powernv/smp.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-)arch/powerpc/include/asm/kexec.h +2
-0@@ -73,6 +73,8 @@ extern void kexec_smp_wait(void); /* get and clear naca physid, wait formaster to copy new code to 0 */ extern int crashing_cpu;extern void crash_send_ipi (void (*crash_ipi_callback)(struct pt_regs *)); +extern void crash_ipi_callback (struct pt_regs *); +extern int crash_wake_offline;struct kimage ;struct pt_regs ;arch/powerpc/kernel/crash.c +12
-1@@ -44,6 +44,14 @@#define REAL_MODE_TIMEOUT 10000static int time_to_dump; +/* +* crash_wake_offline should be set to 1 by platforms that intend to wake +* up offline cpus prior to jumping to a kdump kernel. Currently powernv +* sets it to 1, since we want to avoid things from happening when an +* offline CPU wakes up due to something like an HMI (malfunction error), +* which propagates to all threads. +*/ +int crash_wake_offline;#define CRASH_HANDLER_MAX 3/* List of shutdown handles */ @@ -63,7 +71,7 @@ static int handle_fault(struct pt_regs *regs)#ifdef CONFIG_SMP static atomic_t cpus_in_crash; -static void crash_ipi_callback (struct pt_regs *regs) +void crash_ipi_callback (struct pt_regs *regs) {static cpumask_t cpus_state_saved =CPU_MASK_NONE ;@@ -106,6 +114,9 @@ static void crash_kexec_prepare_cpus(int cpu)printk (KERN_EMERG "Sending IPI to other CPUs\n" ); +if (crash_wake_offline) + ncpus =num_present_cpus () -1 ; +crash_send_ipi (crash_ipi_callback);smp_wmb ();arch/powerpc/kernel/smp.c +18
-0@@ -543,7 +543,25 @@ void smp_send_debugger_break(void)#ifdef CONFIG_KEXEC_CORE void crash_send_ipi (void (*crash_ipi_callback)(struct pt_regs *)) { +int cpu; +smp_send_nmi_ipi (NMI_IPI_ALL_OTHERS , crash_ipi_callback,1000000 ); +if (kdump_in_progress () && crash_wake_offline) { +for_each_present_cpu (cpu) { +if (cpu_online (cpu)) +continue ; +/* +* crash_ipi_callback will wait for +* all cpus, including offline CPUs. +* We don't care about nmi_ipi_function. +* Offline cpus will jump straight into +* crash_ipi_callback, we can skip the +* entire NMI dance and waiting for +* cpus to clear pending mask, etc. +*/ +do_smp_send_nmi_ipi (cpu); + } + } }#endif arch/powerpc/platforms/powernv/smp.c +28
-0@@ -37,6 +37,8 @@#include <asm/kvm_ppc.h> #include <asm/ppc-opcode.h> #include <asm/cpuidle.h> +#include <asm/kexec.h> +#include <asm/reg.h> #include "powernv.h" @@ -209,9 +211,32 @@ static void pnv_smp_cpu_kill_self(void) }else if ((srr1 & wmask) ==SRR1_WAKEHDBELL ) {unsigned long msg =PPC_DBELL_TYPE (PPC_DBELL_SERVER ); asm volatile(PPC_MSGCLR(%0) : : "r" (msg)); + }else if ((srr1 & wmask) ==SRR1_WAKERESET ) { +irq_set_pending_from_srr1 (srr1); +/* Does not return */ } +smp_mb (); +/* +* For kdump kernels, we process the ipi and jump to +* crash_ipi_callback +*/ +if (kdump_in_progress ()) { +/* +* If we got to this point, we've not used +* NMI's, otherwise we would have gone +* via the SRR1_WAKERESET path. We are +* using regular IPI's for waking up offline +* threads. +*/ +struct pt_regs regs; + +ppc_save_regs (®s); +crash_ipi_callback (®s); +/* Does not return */ + } +if (cpu_core_split_required ())continue ;@@ -371,5 +396,8 @@ void __init pnv_smp_init(void)#ifdef CONFIG_HOTPLUG_CPU ppc_md.cpu_die = pnv_smp_cpu_kill_self; +#ifdef CONFIG_KEXEC_CORE + crash_wake_offline =1 ; +#endif #endif }
Quoted 4 lines · On Fri, 15 Dec 2017 19:14:54 +1100 Balbir Singh <[email protected]> wrote:
Our check was extra cautious, we've audited
crash_send_ipiand it sends an IPI only to online CPU's. Removal of this check should have not functional impact on crash kdump.
Quoted 19 lines
Signed-off-by Balbir Singh <[email protected]>--- arch/powerpc/kernel/crash.c | 3 --- 1 file changed, 3 deletions(-)arch/powerpc/kernel/crash.c +0
-3@@ -69,9 +69,6 @@ static void crash_ipi_callback(struct pt_regs *regs)int cpu =smp_processor_id (); -if (!cpu_online (cpu)) -return ; -hard_irq_disable ();if (!cpumask_test_cpu (cpu, &cpus_state_saved)) {crash_save_cpu (regs, cpu);
Quoted 6 lines · Balbir Singh
Our check was extra cautious, we've audited
crash_send_ipiand it sends an IPI only to online CPU's. Removal of this check should have not functional impact on crash kdump.Signed-off-by Balbir Singh <[email protected]>Reviewed-by Nicholas Piggin <[email protected]>
Series applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/04b9c96eae72d862726f2f4bfcec20
cheers