[IA64] kdump: Try INIT regardless of

kdump_on_init

CPUs should be frozen if possible, otherwise it might hinder kdump.
So if there are CPUs not respond to IPI, try INIT to stop them.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Haren Myneni <hbabu@us.ibm.com>
Cc: kexec@lists.infradead.org
Acked-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Hidetoshi Seto 2009-08-06 14:51:57 -07:00 committed by Tony Luck
parent 1726b0883d
commit 5959906ee9
1 changed files with 21 additions and 22 deletions

View File

@ -138,8 +138,10 @@ machine_crash_shutdown(struct pt_regs *pt)
*/ */
kdump_smp_send_stop(); kdump_smp_send_stop();
/* not all cpu response to IPI, send INIT to freeze them */ /* not all cpu response to IPI, send INIT to freeze them */
if (kdump_wait_cpu_freeze() && kdump_on_init) { if (kdump_wait_cpu_freeze()) {
kdump_smp_send_init(); kdump_smp_send_init();
/* wait again, don't go ahead if possible */
kdump_wait_cpu_freeze();
} }
#endif #endif
} }
@ -178,6 +180,19 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
struct ia64_mca_notify_die *nd; struct ia64_mca_notify_die *nd;
struct die_args *args = data; struct die_args *args = data;
if (atomic_read(&kdump_in_progress)) {
switch (val) {
case DIE_INIT_MONARCH_LEAVE:
if (!kdump_freeze_monarch)
break;
/* fall through */
case DIE_INIT_SLAVE_LEAVE:
case DIE_MCA_RENDZVOUS_LEAVE:
unw_init_running(kdump_cpu_freeze, NULL);
break;
}
}
if (!kdump_on_init && !kdump_on_fatal_mca) if (!kdump_on_init && !kdump_on_fatal_mca)
return NOTIFY_DONE; return NOTIFY_DONE;
@ -190,41 +205,25 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
} }
if (val != DIE_INIT_MONARCH_LEAVE && if (val != DIE_INIT_MONARCH_LEAVE &&
val != DIE_INIT_SLAVE_LEAVE &&
val != DIE_INIT_MONARCH_PROCESS && val != DIE_INIT_MONARCH_PROCESS &&
val != DIE_MCA_RENDZVOUS_LEAVE &&
val != DIE_MCA_MONARCH_LEAVE) val != DIE_MCA_MONARCH_LEAVE)
return NOTIFY_DONE; return NOTIFY_DONE;
nd = (struct ia64_mca_notify_die *)args->err; nd = (struct ia64_mca_notify_die *)args->err;
/* Reason code 1 means machine check rendezvous*/
if ((val == DIE_INIT_MONARCH_LEAVE || val == DIE_INIT_SLAVE_LEAVE
|| val == DIE_INIT_MONARCH_PROCESS) && nd->sos->rv_rc == 1)
return NOTIFY_DONE;
switch (val) { switch (val) {
case DIE_INIT_MONARCH_PROCESS: case DIE_INIT_MONARCH_PROCESS:
if (kdump_on_init) { /* Reason code 1 means machine check rendezvous*/
if (kdump_on_init && (nd->sos->rv_rc != 1)) {
if (atomic_inc_return(&kdump_in_progress) != 1) if (atomic_inc_return(&kdump_in_progress) != 1)
kdump_freeze_monarch = 1; kdump_freeze_monarch = 1;
*(nd->monarch_cpu) = -1; *(nd->monarch_cpu) = -1;
} }
break; break;
case DIE_INIT_MONARCH_LEAVE: case DIE_INIT_MONARCH_LEAVE:
if (kdump_on_init) { /* Reason code 1 means machine check rendezvous*/
if (kdump_freeze_monarch) if (kdump_on_init && (nd->sos->rv_rc != 1))
unw_init_running(kdump_cpu_freeze, NULL); machine_kdump_on_init();
else
machine_kdump_on_init();
}
break;
case DIE_INIT_SLAVE_LEAVE:
if (atomic_read(&kdump_in_progress))
unw_init_running(kdump_cpu_freeze, NULL);
break;
case DIE_MCA_RENDZVOUS_LEAVE:
if (atomic_read(&kdump_in_progress))
unw_init_running(kdump_cpu_freeze, NULL);
break; break;
case DIE_MCA_MONARCH_LEAVE: case DIE_MCA_MONARCH_LEAVE:
/* *(nd->data) indicate if MCA is recoverable */ /* *(nd->data) indicate if MCA is recoverable */