powerpc, kexec: Fix race in kexec shutdown
Subsystems (3)
PATCH 1/1 powerpc, kexec: Fix race in kexec shutdown
In kexec_prepare_cpus cpu, the primary CPU IPIs the secondary CPUs to kexec_smp_down(). kexec_smp_down() calls kexec_smp_wait() which sets the hw_cpu_id() to -1. The primary does this while leaving IRQs on which means the primary can take a timer interrupt which can lead to the primary IPIing one of the secondary CPUs (say, for a scheduler re-balance) but since the secondary CPU now has a hw_cpu_id = -1, we IPI CPU -1... Kaboom!
We are hitting this case regularly on POWER7 machines.
Also, the secondaries are clearing out any pending IPIs before guaranteeing that no more will be received.
This changes kexec_prepare_cpus() so that we turn off IRQs in the primary CPU much earlier. It adds a paca flag to say that the secondaries have entered the kexec_smp_down() IPI and turned off IRQs, rather than overloading hw_cpu_id with -1.
It also ensures that all CPUs have their IRQs off before we clear out any pending IPI requests (in kexec_cpu_down()) to ensure there are no trailing IPIs left unacknowledged.
---
arch/powerpc/include/asm/paca.h | 1 + arch/powerpc/kernel/machine_kexec_64.c | 28 ++++++++++++++++++++-------- arch/powerpc/kernel/misc_64.S | 3 --- 3 files changed, 21 insertions(+), 11 deletions(-)
arch/powerpc/include/asm/paca.h +1 -0
@@ -82,6 +82,7 @@ struct paca_struct {s16 hw_cpu_id;/* Physical processor number */ u8 cpu_start;/* At startup, processor spins until */ /* this becomes non-zero. */ +u8 kexec_irqs_off;/* set when kexec down has irqs off */ #ifdef CONFIG_PPC_STD_MMU_64 struct slb_shadow *slb_shadow_ptr;
arch/powerpc/kernel/machine_kexec_64.c +20 -8
@@ -155,16 +155,23 @@ void kexec_copy_flush(struct kimage *ima#ifdef CONFIG_SMP -/* FIXME: we should schedule this function to be called on all cpus based -* on calling the interrupts, but we would like to call it off irq level -* so that the interrupt controller is clean. -*/ +static int kexec_all_irq_disabled =0 ; +static void kexec_smp_down (void *arg) { +local_irq_disable (); +mb ();/* make sure our irqs are disabled before we say they are */ +get_paca ()->kexec_irqs_off =1 ; +while (kexec_all_irq_disabled ==0 ) +cpu_relax (); +mb ();/* make sure all irqs are disabled before this */ +/* +* Now every CPU has IRQs off, we can clear out any pending +* IPIs and be sure that no more will come in after this. +*/ if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,1 ); -local_irq_disable ();kexec_smp_wait ();/* NOTREACHED */ }
@@ -174,14 +181,17 @@ static void kexec_prepare_cpus(void)int my_cpu, i, notified=-1 ;smp_call_function (kexec_smp_down,NULL ,/* wait */ 0 ); +local_irq_disable (); +mb ();/* make sure IRQs are disabled before we say they are */ +get_paca ()->kexec_irqs_off =1 ; my_cpu =get_cpu (); -/* check the others cpus are now down (via paca hw cpu id == -1) */ +/* check the others cpus are now down (via paca kexec_irqs_off == 1) */ for (i=0 ; i <NR_CPUS ; i++) {if (i == my_cpu)continue ; -while (paca[i].hw_cpu_id !=-1 ) { +while (paca[i].kexec_irqs_off !=1 ) {barrier ();if (!cpu_possible (i)) { printk("kexec: cpu %d hw_cpu_id %d is not"
@@ -207,6 +217,9 @@ static void kexec_prepare_cpus(void) } } } +mb (); +/* we are sure every CPU has IRQs off at this point */ + kexec_all_irq_disabled =1 ;/* after we tell the others to go down */ if (ppc_md.kexec_cpu_down)
@@ -214,7 +227,6 @@ static void kexec_prepare_cpus(void) put_cpu(); - local_irq_disable(); }#else /* ! SMP */
arch/powerpc/kernel/misc_64.S +0 -3
@@ -494,14 +494,11 @@ kexec_flag: * note: this is a terminal routine, it does not save lr * * get phys id from paca - * set paca id to -1 to say we got here * switch to real mode * join other cpus in kexec_wait(phys_id) */ _GLOBAL(kexec_smp_wait) lhz r3,PACAHWCPUID(r13) - li r4,-1 - sth r4,PACAHWCPUID(r13) /* let others know we left */ bl real_mode b .kexec_wait
PATCH 1/2 powerpc, kexec: Fix race in kexec shutdown
In kexec_prepare_cpus, the primary CPU IPIs the secondary CPUs to kexec_smp_down(). kexec_smp_down() calls kexec_smp_wait() which sets the hw_cpu_id() to -1. The primary does this while leaving IRQs on which means the primary can take a timer interrupt which can lead to the IPIing one of the secondary CPUs (say, for a scheduler re-balance) but since the secondary CPU now has a hw_cpu_id = -1, we IPI CPU -1... Kaboom!
We are hitting this case regularly on POWER7 machines.
There is also a second race, where the primary will tear down the MMU mappings before knowing the secondaries have entered real mode.
Also, the secondaries are clearing out any pending IPIs before guaranteeing that no more will be received.
This changes kexec_prepare_cpus() so that we turn off IRQs in the primary CPU much earlier. It adds a paca flag to say that the secondaries have entered the kexec_smp_down() IPI and turned off IRQs, rather than overloading hw_cpu_id with -1. This new paca flag is again used to in indicate when the secondaries has entered real mode.
It also ensures that all CPUs have their IRQs off before we clear out any pending IPI requests (in kexec_cpu_down()) to ensure there are no trailing IPIs left unacknowledged.
---
arch/powerpc/include/asm/kexec.h | 4 ++ arch/powerpc/include/asm/paca.h | 1 arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/machine_kexec_64.c | 48 +++++++++++++++++++++++---------- arch/powerpc/kernel/misc_64.S | 8 +++-- arch/powerpc/kernel/paca.c | 2 + 6 files changed, 47 insertions(+), 17 deletions(-)
arch/powerpc/include/asm/kexec.h +4 -0
@@ -31,6 +31,10 @@#define KEXEC_ARCH KEXEC_ARCH_PPC#endif +#define KEXEC_STATE_NONE 0 +#define KEXEC_STATE_IRQS_OFF 1 +#define KEXEC_STATE_REAL_MODE 2 +#ifndef __ASSEMBLY__#include <linux/cpumask.h> #include <asm/reg.h>
arch/powerpc/include/asm/paca.h +1 -0
@@ -82,6 +82,7 @@ struct paca_struct {s16 hw_cpu_id;/* Physical processor number */ u8 cpu_start;/* At startup, processor spins until */ /* this becomes non-zero. */ +u8 kexec_state;/* set when kexec down has irqs off */ #ifdef CONFIG_PPC_STD_MMU_64 struct slb_shadow *slb_shadow_ptr;
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -184,6 +184,7 @@ int main(void)#endif /* CONFIG_PPC_STD_MMU_64 */ DEFINE (PACAEMERGSP , offsetof(struct paca_struct , emergency_sp));DEFINE (PACAHWCPUID , offsetof(struct paca_struct , hw_cpu_id)); +DEFINE (PACAKEXECSTATE , offsetof(struct paca_struct , kexec_state));DEFINE (PACA_STARTPURR , offsetof(struct paca_struct , startpurr));DEFINE (PACA_STARTSPURR , offsetof(struct paca_struct , startspurr));DEFINE (PACA_USER_TIME , offsetof(struct paca_struct , user_time));
arch/powerpc/kernel/machine_kexec_64.c +34 -14
87 lines not on this page · raw message
arch/powerpc/kernel/misc_64.S +5 -3
@@ -24,6 +24,7 @@ #include <asm/asm-offsets.h> #include <asm/cputable.h> #include <asm/thread_info.h> +#include <asm/kexec.h> .text
@@ -471,6 +472,10 @@ _GLOBAL(kexec_wait) 1: mflr r5 addi r5,r5,kexec_flag-1b + li r4,KEXEC_STATE_REAL_MODE + stb r4,PACAKEXECSTATE(r13) + SYNC + 99: HMT_LOW #ifdef CONFIG_KEXEC /* use no memory without kexec */ lwz r4,0(r5)
@@ -494,14 +499,11 @@ kexec_flag: * note: this is a terminal routine, it does not save lr * * get phys id from paca - * set paca id to -1 to say we got here * switch to real mode * join other cpus in kexec_wait(phys_id) */ _GLOBAL(kexec_smp_wait) lhz r3,PACAHWCPUID(r13) - li r4,-1 - sth r4,PACAHWCPUID(r13) /* let others know we left */ bl real_mode b .kexec_wait
arch/powerpc/kernel/paca.c +2 -0
@@ -18,6 +18,7 @@#include <asm/pgtable.h> #include <asm/iseries/lpar_map.h> #include <asm/iseries/hv_types.h> +#include <asm/kexec.h> /* This symbol is provided by the linker - let it fill in the paca * field correctly */
@@ -97,6 +98,7 @@ void __init initialise_paca(struct paca_ new_paca->kernelbase = (unsigned long ) _stext; new_paca->kernel_msr =MSR_KERNEL ; new_paca->hw_cpu_id =0xffff ; + new_paca->kexec_state =KEXEC_STATE_NONE ; new_paca->__current = &init_task;#ifdef CONFIG_PPC_STD_MMU_64 new_paca->slb_shadow_ptr = &slb_shadow[cpu];
PATCH 1/2 powerpc, kexec: Fix race in kexec shutdown
In kexec_prepare_cpus, the primary CPU IPIs the secondary CPUs to kexec_smp_down(). kexec_smp_down() calls kexec_smp_wait() which sets the hw_cpu_id() to -1. The primary does this while leaving IRQs on which means the primary can take a timer interrupt which can lead to the IPIing one of the secondary CPUs (say, for a scheduler re-balance) but since the secondary CPU now has a hw_cpu_id = -1, we IPI CPU -1... Kaboom!
We are hitting this case regularly on POWER7 machines.
There is also a second race, where the primary will tear down the MMU mappings before knowing the secondaries have entered real mode.
Also, the secondaries are clearing out any pending IPIs before guaranteeing that no more will be received.
This changes kexec_prepare_cpus() so that we turn off IRQs in the primary CPU much earlier. It adds a paca flag to say that the secondaries have entered the kexec_smp_down() IPI and turned off IRQs, rather than overloading hw_cpu_id with -1. This new paca flag is again used to in indicate when the secondaries has entered real mode.
It also ensures that all CPUs have their IRQs off before we clear out any pending IPI requests (in kexec_cpu_down()) to ensure there are no trailing IPIs left unacknowledged.
---
Oops, missed quilt refresh in the last version...
---
arch/powerpc/include/asm/kexec.h | 4 ++ arch/powerpc/include/asm/paca.h | 1 arch/powerpc/kernel/asm-offsets.c | 1 arch/powerpc/kernel/machine_kexec_64.c | 48 +++++++++++++++++++++++---------- arch/powerpc/kernel/misc_64.S | 8 +++-- arch/powerpc/kernel/paca.c | 2 + 6 files changed, 47 insertions(+), 17 deletions(-)
arch/powerpc/include/asm/kexec.h +4 -0
@@ -31,6 +31,10 @@#define KEXEC_ARCH KEXEC_ARCH_PPC#endif +#define KEXEC_STATE_NONE 0 +#define KEXEC_STATE_IRQS_OFF 1 +#define KEXEC_STATE_REAL_MODE 2 +#ifndef __ASSEMBLY__#include <linux/cpumask.h> #include <asm/reg.h>
arch/powerpc/include/asm/paca.h +1 -0
@@ -82,6 +82,7 @@ struct paca_struct {s16 hw_cpu_id;/* Physical processor number */ u8 cpu_start;/* At startup, processor spins until */ /* this becomes non-zero. */ +u8 kexec_state;/* set when kexec down has irqs off */ #ifdef CONFIG_PPC_STD_MMU_64 struct slb_shadow *slb_shadow_ptr;
arch/powerpc/kernel/asm-offsets.c +1 -0
@@ -184,6 +184,7 @@ int main(void)#endif /* CONFIG_PPC_STD_MMU_64 */ DEFINE (PACAEMERGSP , offsetof(struct paca_struct , emergency_sp));DEFINE (PACAHWCPUID , offsetof(struct paca_struct , hw_cpu_id)); +DEFINE (PACAKEXECSTATE , offsetof(struct paca_struct , kexec_state));DEFINE (PACA_STARTPURR , offsetof(struct paca_struct , startpurr));DEFINE (PACA_STARTSPURR , offsetof(struct paca_struct , startspurr));DEFINE (PACA_USER_TIME , offsetof(struct paca_struct , user_time));
arch/powerpc/kernel/machine_kexec_64.c +34 -14
87 lines not on this page · raw message
arch/powerpc/kernel/misc_64.S +5 -3
@@ -24,6 +24,7 @@ #include <asm/asm-offsets.h> #include <asm/cputable.h> #include <asm/thread_info.h> +#include <asm/kexec.h> .text
@@ -471,6 +472,10 @@ _GLOBAL(kexec_wait) 1: mflr r5 addi r5,r5,kexec_flag-1b + li r4,KEXEC_STATE_REAL_MODE + stb r4,PACAKEXECSTATE(r13) + SYNC + 99: HMT_LOW #ifdef CONFIG_KEXEC /* use no memory without kexec */ lwz r4,0(r5)
@@ -494,14 +499,11 @@ kexec_flag: * note: this is a terminal routine, it does not save lr * * get phys id from paca - * set paca id to -1 to say we got here * switch to real mode * join other cpus in kexec_wait(phys_id) */ _GLOBAL(kexec_smp_wait) lhz r3,PACAHWCPUID(r13) - li r4,-1 - sth r4,PACAHWCPUID(r13) /* let others know we left */ bl real_mode b .kexec_wait
arch/powerpc/kernel/paca.c +2 -0
@@ -18,6 +18,7 @@#include <asm/pgtable.h> #include <asm/iseries/lpar_map.h> #include <asm/iseries/hv_types.h> +#include <asm/kexec.h> /* This symbol is provided by the linker - let it fill in the paca * field correctly */
@@ -97,6 +98,7 @@ void __init initialise_paca(struct paca_ new_paca->kernelbase = (unsigned long ) _stext; new_paca->kernel_msr =MSR_KERNEL ; new_paca->hw_cpu_id =0xffff ; + new_paca->kexec_state =KEXEC_STATE_NONE ; new_paca->__current = &init_task;#ifdef CONFIG_PPC_STD_MMU_64 new_paca->slb_shadow_ptr = &slb_shadow[cpu];
PATCH 2/2 powerpc, kdump: Fix race in kdump shutdown
In reply to Michael NeulingWhen we are crashing, the crashing/primary CPU IPIs the secondaries to turn off IRQs, go into real mode and wait in kexec_wait. While this is happening, the primary tears down all the MMU maps. Unfortunately the primary doesn't check to make sure the secondaries have entered real mode before doing this.
On PHYP machines, the secondaries can take a long time shutting down the IRQ controller as RTAS calls are need. These RTAS calls need to be serialised which resilts in the secondaries contending in lock_rtas() and hence taking a long time to shut down.
We've hit this on large POWER7 machines, where some secondaries are still waiting in lock_rtas(), when the primary tears down the HPTEs.
This patch makes sure all secondaries are in real mode before the primary tears down the MMU. It uses the new kexec_state entry in the paca. It times out if the secondaries don't reach real mode after 10sec.
---
arch/powerpc/kernel/crash.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)
arch/powerpc/kernel/crash.c +27 -0
@@ -162,6 +162,32 @@ static void crash_kexec_prepare_cpus(int/* Leave the IPI callback set */ } +/* wait for all the CPUs to hit real mode but timeout if they don't come in */ +static void crash_kexec_wait_realmode (int cpu) +{ +unsigned int msecs; +int i; + + msecs =10000 ; +for (i=0 ; i <NR_CPUS && msecs >0 ; i++) { +if (i == cpu) +continue ; + +while (paca[i].kexec_state <KEXEC_STATE_REAL_MODE ) { +barrier (); +if (!cpu_possible (i)) { +break ; + } +if (!cpu_online (i)) { +break ; + } + msecs--; +mdelay (1 ); + } + } +mb (); +} +/* * This function will be called by secondary cpus or by kexec cpu * if soft-reset is activated to stop some CPUs.
@@ -412,6 +438,7 @@ void default_machine_crash_shutdown(strucrash_kexec_prepare_cpus (crashing_cpu);cpu_set (crashing_cpu, cpus_in_crash);crash_kexec_stop_spus (); +crash_kexec_wait_realmode (crashing_cpu);if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (1 ,0 ); }
Re: [PATCH 2/2] powerpc, kdump: Fix race in kdump shutdown
Quoted 63 lines · Michael Neuling
When we are crashing, the crashing/primary CPU IPIs the secondaries to turn off IRQs, go into real mode and wait in
kexec_wait. While this is happening, the primary tears down all the MMU maps. Unfortunately the primary doesn't check to make sure the secondaries have entered real mode before doing this.On PHYP machines, the secondaries can take a long time shutting down the IRQ controller as RTAS calls are need. These RTAS calls need to be serialised which resilts in the secondaries contending in
lock_rtas()and hence taking a long time to shut down.We've hit this on large POWER7 machines, where some secondaries are still waiting in
lock_rtas(), when the primary tears down the HPTEs.This patch makes sure all secondaries are in real mode before the primary tears down the MMU. It uses the new
kexec_stateentry in the paca. It times out if the secondaries don't reach real mode after 10sec.Signed-off-by Michael Neuling <[email protected]>---
arch/powerpc/kernel/crash.c| 27 +++++++++++++++++++++++++++1 file changed, 27 insertions(+)Index:
linux-2.6-ozlabs/arch/powerpc/kernel/crash.c
===================================================================arch/powerpc/kernel/crash.c +26
-0@@ -162,6 +162,32 @@ static void crash_kexec_prepare_cpus(int/* Leave the IPI callback set */ } +/* wait for all the CPUs to hit real mode but timeout if they don't come in */ +static void crash_kexec_wait_realmode (int cpu) +{ +unsigned int msecs; +int i; + + msecs =10000 ; +for (i=0 ; i <NR_CPUS && msecs >0 ; i++) { +if (i == cpu) +continue ; + +while (paca[i].kexec_state <KEXEC_STATE_REAL_MODE ) { +barrier (); +if (!cpu_possible (i)) { +break ; + } +if (!cpu_online (i)) { +break ; + } + msecs--; +mdelay (1 ); + } + } +mb (); +} +/* * This function will be called by secondary cpus or by kexec cpu * if soft-reset is activated to stop some CPUs.
arch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 440
Quoted 3 lines
arch/powerpc/kernel/crash.c +0
-0@@ -412,6 +438,7 @@ void default_machine_crash_shutdown(strucrash_kexec_prepare_cpus (crashing_cpu);cpu_set (crashing_cpu, cpus_in_crash);crash_kexec_stop_spus ();
should this be
#ifdef CONFIG_PPC_STD_MMU
arch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 441
Quoted 1 line
arch/powerpc/kernel/crash.c +1
-0+crash_kexec_wait_realmode (crashing_cpu);
#endif
- k
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 2/2] powerpc, kdump: Fix race in kdump shutdown
Quoted 72 lines · Kumar Gala
Quoted 63 lines · Michael Neuling
When we are crashing, the crashing/primary CPU IPIs the secondaries to turn off IRQs, go into real mode and wait in
kexec_wait. While this is happening, the primary tears down all the MMU maps. Unfortunately the primary doesn't check to make sure the secondaries have entered real mode before doing this.On PHYP machines, the secondaries can take a long time shutting down the IRQ controller as RTAS calls are need. These RTAS calls need to be serialised which resilts in the secondaries contending in
lock_rtas()and hence taking a long time to shut down.We've hit this on large POWER7 machines, where some secondaries are still waiting in
lock_rtas(), when the primary tears down the HPTEs.This patch makes sure all secondaries are in real mode before the primary tears down the MMU. It uses the new
kexec_stateentry in the paca. It times out if the secondaries don't reach real mode after 10sec.Signed-off-by Michael Neuling <[email protected]>---
arch/powerpc/kernel/crash.c| 27 +++++++++++++++++++++++++++1 file changed, 27 insertions(+)Index:
linux-2.6-ozlabs/arch/powerpc/kernel/crash.c
===================================================================arch/powerpc/kernel/crash.c +26
-0@@ -162,6 +162,32 @@ static void crash_kexec_prepare_cpus(int/* Leave the IPI callback set */ } +/* wait for all the CPUs to hit real mode but timeout if they don't come in */ +static void crash_kexec_wait_realmode (int cpu) +{ +unsigned int msecs; +int i; + + msecs =10000 ; +for (i=0 ; i <NR_CPUS && msecs >0 ; i++) { +if (i == cpu) +continue ; + +while (paca[i].kexec_state <KEXEC_STATE_REAL_MODE ) { +barrier (); +if (!cpu_possible (i)) { +break ; + } +if (!cpu_online (i)) { +break ; + } + msecs--; +mdelay (1 ); + } + } +mb (); +} +/* * This function will be called by secondary cpus or by kexec cpu * if soft-reset is activated to stop some CPUs. arch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 440
Quoted 3 lines
arch/powerpc/kernel/crash.c +0
-0@@ -412,6 +438,7 @@ void default_machine_crash_shutdown(strucrash_kexec_prepare_cpus (crashing_cpu);cpu_set (crashing_cpu, cpus_in_crash);crash_kexec_stop_spus ();should this be
Quoted 5 lines
#ifdef
CONFIG_PPC_STD_MMUarch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 441
Quoted 1 line
arch/powerpc/kernel/crash.c +1
-0+crash_kexec_wait_realmode (crashing_cpu);#endif
I'm going to make it CONFIG_PPC_STD_MMU_64 as part of a Kexec book-e patch
- k
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Re: [PATCH 2/2] powerpc, kdump: Fix race in kdump shutdown
In message <[email protected]> you wrote :
Quoted 81 lines · Kumar Gala
Quoted 5 lines
=20
On May 14, 2010, at 12:40 AM, Michael Neuling wrote:
=20Quoted 1 line
When we are crashing, the crashing/primary CPU IPIs the secondaries =
to
Quoted 18 lines
Quoted 18 lines
turn off IRQs, go into real mode and wait in
kexec_wait. While this is happening, the primary tears down all the MMU maps. Unfortunately the primary doesn't check to make sure the secondaries have entered real mode before doing this.
=20
On PHYP machines, the secondaries can take a long time shutting down the IRQ controller as RTAS calls are need. These RTAS calls need to be serialised which resilts in the secondaries contending inlock_rtas()and hence taking a long time to shut down.
=20
We've hit this on large POWER7 machines, where some secondaries are still waiting inlock_rtas(), when the primary tears down the HPTEs. =20
This patch makes sure all secondaries are in real mode before the primary tears down the MMU. It uses the newkexec_stateentry in the paca. It times out if the secondaries don't reach real mode after 10sec.
=20Quoted 8 lines
Quoted 8 lines
Signed-off-by Michael Neuling <[email protected]>---
=20arch/powerpc/kernel/crash.c| 27 +++++++++++++++++++++++++++1 file changed, 27 insertions(+)=20
Index:linux-2.6-ozlabs/arch/powerpc/kernel/crash.c=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D==3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Quoted 7 lines
Quoted 7 lines
arch/powerpc/kernel/crash.c +0
-0@@ -162,6 +162,32 @@ static void crash_kexec_prepare_cpus(int/* Leave the IPI callback set */ }=20
+/* wait for all the CPUs to hit real mode but timeout if they don't =come in */
Quoted 37 lines
Quoted 29 lines
arch/powerpc/kernel/crash.c +25
-0+static void crash_kexec_wait_realmode (int cpu) +{ +unsigned int msecs; +int i; + + msecs =3D 10000; + for (i=3D0; i < NR_CPUS && msecs > 0; i++) { + if (i =3D=3D cpu) +continue ; + +while (paca[i].kexec_state <KEXEC_STATE_REAL_MODE ) { +barrier (); +if (!cpu_possible (i)) { +break ; + } +if (!cpu_online (i)) { +break ; + } + msecs--; +mdelay (1 ); + } + } +mb (); +} +/*
* This function will be called by secondary cpus or by kexec cpu
* if soft-reset is activated to stop some CPUs.arch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 440
Quoted 3 lines
arch/powerpc/kernel/crash.c +0
-0@@ -412,6 +438,7 @@ void default_machine_crash_shutdown(strucrash_kexec_prepare_cpus (crashing_cpu);cpu_set (crashing_cpu, cpus_in_crash);crash_kexec_stop_spus ();=20
should this be
=20
#ifdefCONFIG_PPC_STD_MMU
=20
Quoted 6 lines
Quoted 3 lines
arch/powerpc/kernel/crash.c void default_machine_crash_shutdown(stru · line 441
Quoted 1 line
arch/powerpc/kernel/crash.c +1
-0+crash_kexec_wait_realmode (crashing_cpu);=20
#endifI'm going to make it
CONFIG_PPC_STD_MMU_64as part of a Kexec book-e = patch
Ok, thanks, I'll leave it up to you then
Mikey
PATCH 2/2 powerpc, kdump: Fix race in kdump shutdown
In reply to Michael NeulingWhen we are crashing, the crashing/primary CPU IPIs the secondaries to turn off IRQs, go into real mode and wait in kexec_wait. While this is happening, the primary tears down all the MMU maps. Unfortunately the primary doesn't check to make sure the secondaries have entered real mode before doing this.
On PHYP machines, the secondaries can take a long time shutting down the IRQ controller as RTAS calls are need. These RTAS calls need to be serialised which resilts in the secondaries contending in lock_rtas() and hence taking a long time to shut down.
We've hit this on large POWER7 machines, where some secondaries are still waiting in lock_rtas(), when the primary tears down the HPTEs.
This patch makes sure all secondaries are in real mode before the primary tears down the MMU. It uses the new kexec_state entry in the paca. It times out if the secondaries don't reach real mode after 10sec.
---
arch/powerpc/kernel/crash.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/powerpc/kernel/crash.c +28 -0
@@ -162,6 +162,33 @@ static void crash_kexec_prepare_cpus(int/* Leave the IPI callback set */ } +/* wait for all the CPUs to hit real mode but timeout if they don't come in */ +static void crash_kexec_wait_realmode (int cpu) +{ +unsigned int msecs; +int i; + +/* check the others cpus are now down (via paca kexec_irqs_off == 1) */ + msecs =10000 ; +for (i=0 ; i <NR_CPUS && msecs >0 ; i++) { +if (i == cpu) +continue ; + +while (paca[i].kexec_state <KEXEC_STATE_REAL_MODE ) { +barrier (); +if (!cpu_possible (i)) { +break ; + } +if (!cpu_online (i)) { +break ; + } + msecs--; +mdelay (1 ); + } + } +mb (); +} +/* * This function will be called by secondary cpus or by kexec cpu * if soft-reset is activated to stop some CPUs.
@@ -419,6 +446,7 @@ void default_machine_crash_shutdown(strucrash_kexec_prepare_cpus (crashing_cpu);cpu_set (crashing_cpu, cpus_in_crash);crash_kexec_stop_spus (); +crash_kexec_wait_realmode (crashing_cpu);if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (1 ,0 ); }