cpu shutdown rework
From: Heiko Carstens <[email protected]>
[S390] cpu shutdown rework
Let one master cpu kill all other cpus instead of sending an external interrupt to all other cpus so they can kill themselves. Simplifies reipl/shutdown functions a lot.
Signed-off-by Heiko Carstens <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
---
arch/s390/kernel/ipl.c | 24 --------- arch/s390/kernel/machine_kexec.c | 65 ++++++------------------ arch/s390/kernel/smp.c | 104 +++++++++++---------------------------- drivers/s390/char/sclp_quiesce.c | 37 ------------- include/asm-s390/smp.h | 8 +++ 5 files changed, 58 insertions(+), 180 deletions(-)
arch/s390/kernel/ipl.c +2 -22
@@ -576,23 +576,6 @@ static struct subsys_attribute dump_type static decl_subsys(dump, NULL, NULL); -#ifdef CONFIG_SMP -static void dump_smp_stop_all (void ) -{ -int cpu; -preempt_disable (); -for_each_online_cpu (cpu) { -if (cpu ==smp_processor_id ()) -continue ; -while (signal_processor (cpu, sigp_stop) == sigp_busy) -udelay (10 ); - } -preempt_enable (); -} -#else -#define dump_smp_stop_all () do { } while (0) -#endif -/* * Shutdown actions section */
@@ -724,13 +707,13 @@ static void do_dump(void)switch (dump_method) {case IPL_METHOD_CCW_CIO : -dump_smp_stop_all (); +smp_send_stop (); devid.devno = dump_block_ccw->ipl_info.ccw.devno; devid.ssid =0 ;reipl_ccw_dev (&devid);break ;case IPL_METHOD_CCW_VM : -dump_smp_stop_all (); +smp_send_stop ();sprintf (buf,"STORE STATUS" );__cpcmd (buf,NULL ,0 ,NULL );sprintf (buf,"IPL %X" , dump_block_ccw->ipl_info.ccw.devno);
@@ -1059,9 +1042,6 @@ void s390_reset_system(void) {struct _lowcore *lc; -/* Disable all interrupts/machine checks */ -__load_psw_mask (PSW_KERNEL_BITS & ~PSW_MASK_MCHECK ); -/* Stack for interrupt/machine check handler */ lc = (struct _lowcore *)(unsigned long )store_prefix (); lc->panic_stack = S390_lowcore.panic_stack;
arch/s390/kernel/machine_kexec.c +16 -49
112 lines not on this page · raw message
arch/s390/kernel/smp.c +31 -73
141 lines not on this page · raw message
drivers/s390/char/sclp_quiesce.c +1 -36
@@ -19,52 +19,17 @@#include "sclp.h" - -#ifdef CONFIG_SMP -/* Signal completion of shutdown process. All CPUs except the first to enter -* this function: go to stopped state. First CPU: wait until all other -* CPUs are in stopped or check stop state. Afterwards, load special PSW -* to indicate completion. */ -static void -do_load_quiesce_psw (void * __unused) -{ -static atomic_t cpuid =ATOMIC_INIT (-1 ); -psw_t quiesce_psw; -int cpu; - -if (atomic_cmpxchg (&cpuid,-1 ,smp_processor_id ()) !=-1 ) -signal_processor (smp_processor_id (), sigp_stop); -/* Wait for all other cpus to enter stopped state */ -for_each_online_cpu (cpu) { -if (cpu ==smp_processor_id ()) -continue ; -while (!smp_cpu_not_running (cpu)) -cpu_relax (); - } -/* Quiesce the last cpu with the special psw */ - quiesce_psw.mask =PSW_BASE_BITS |PSW_MASK_WAIT ; - quiesce_psw.addr =0xfff ; -__load_psw (quiesce_psw); -} - -/* Shutdown handler. Perform shutdown function on all CPUs. */ -static void -do_machine_quiesce (void ) -{ -on_each_cpu (do_load_quiesce_psw,NULL ,0 ,0 ); -} -#else /* Shutdown handler. Signal completion of shutdown by loading special PSW. */ static void do_machine_quiesce (void ) {psw_t quiesce_psw; +smp_send_stop (); quiesce_psw.mask =PSW_BASE_BITS |PSW_MASK_WAIT ; quiesce_psw.addr =0xfff ;__load_psw (quiesce_psw); } -#endif /* Handler for quiesce event. Start shutdown procedure. */ static void
include/asm-s390/smp.h +8 -0
@@ -18,6 +18,7 @@#include <asm/lowcore.h> #include <asm/sigp.h> +#include <asm/ptrace.h> /* s390 specific smp.c headers
@@ -101,6 +102,13 @@ smp_call_function_on(void (*func) (voidfunc (info);return 0 ; } + +static inline void smp_send_stop (void ) +{ +/* Disable all interrupts/machine checks */ +__load_psw_mask (PSW_KERNEL_BITS & ~PSW_MASK_MCHECK ); +} +#define smp_cpu_not_running (cpu) 1#define smp_get_cpu (cpu) ({ 0; })#define smp_put_cpu (cpu) ({ 0; })