Skip to content

Commit

Permalink
x86 kdump: make kdump_nmi_callback() a function ptr on crash_nmi_call…
Browse files Browse the repository at this point in the history
…back()

Impact: extend nmi_shootdown_cpus() with a callback

The reboot code will use a different function on crash_nmi_callback().
Adding a function pointer parameter to nmi_shootdown_cpus() for that.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Eduardo Habkost authored and Ingo Molnar committed Nov 12, 2008
1 parent d1e7b91 commit 8e29478
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions arch/x86/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@

#include <mach_ipi.h>

typedef void (*nmi_shootdown_cb)(int, struct die_args*);

#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)

/* This keeps a track of which one is crashing cpu. */
static int crashing_cpu;
static nmi_shootdown_cb shootdown_callback;

static atomic_t waiting_for_crash_ipi;

Expand Down Expand Up @@ -74,7 +77,7 @@ static int crash_nmi_callback(struct notifier_block *self,
return NOTIFY_STOP;
local_irq_disable();

kdump_nmi_callback(cpu, (struct die_args *)data);
shootdown_callback(cpu, (struct die_args *)data);

atomic_dec(&waiting_for_crash_ipi);
/* Assume hlt works */
Expand All @@ -97,13 +100,15 @@ static struct notifier_block crash_nmi_nb = {
.notifier_call = crash_nmi_callback,
};

static void nmi_shootdown_cpus(void)
static void nmi_shootdown_cpus(nmi_shootdown_cb callback)
{
unsigned long msecs;

/* Make a note of crashing cpu. Will be used in NMI callback.*/
crashing_cpu = safe_smp_processor_id();

shootdown_callback = callback;

atomic_set(&waiting_for_crash_ipi, num_online_cpus() - 1);
/* Would it be better to replace the trap vector here? */
if (register_die_notifier(&crash_nmi_nb))
Expand All @@ -126,7 +131,7 @@ static void nmi_shootdown_cpus(void)

static void kdump_nmi_shootdown_cpus(void)
{
nmi_shootdown_cpus();
nmi_shootdown_cpus(kdump_nmi_callback);

disable_local_APIC();
}
Expand Down

0 comments on commit 8e29478

Please sign in to comment.