Kexec / Kdump: Unify elf note code
PATCH 1/1 Kexec / Kdump: Unify elf note code
[PATCH] Kexec / Kdump: Unify elf note code
The elf note saving code is currently duplicated over several architectures. This cleanup patch simply adds code to a common file and then replaces the arch-specific code with calls to the newly added code.
The only drawback with this approach is that s390 doesn't fully support kexec-on-panic which for that arch leads to introduction of unused code.
Signed-off-by Magnus Damm <[email protected]>
---
Applies on top of linux-2.6.19.
Builds on i386 and x86_64.
arch/i386/kernel/crash.c | 66 +---------------------------------------- arch/powerpc/kernel/crash.c | 59 +----------------------------------- arch/x86_64/kernel/crash.c | 69 +------------------------------------------ include/linux/kexec.h | 1 kernel/kexec.c | 56 ++++++++++++++++++++++++++++++++++ 5 files changed, 63 insertions(+), 188 deletions(-)
arch/i386/kernel/crash.c +2 -64
@@ -31,68 +31,6 @@/* This keeps a track of which one is crashing cpu. */ static int crashing_cpu; -static u32 *append_elf_note (u32 *buf,char *name,unsigned type,void *data, -size_t data_len) -{ -struct elf_note note; - - note.n_namesz =strlen (name) +1 ; - note.n_descsz = data_len; - note.n_type = type; -memcpy (buf, ¬e,sizeof (note)); - buf += (sizeof (note) +3 )/4 ; -memcpy (buf, name, note.n_namesz); - buf += (note.n_namesz +3 )/4 ; -memcpy (buf, data, note.n_descsz); - buf += (note.n_descsz +3 )/4 ; - -return buf; -} - -static void final_note (u32 *buf) -{ -struct elf_note note; - - note.n_namesz =0 ; - note.n_descsz =0 ; - note.n_type =0 ; -memcpy (buf, ¬e,sizeof (note)); -} - -static void crash_save_this_cpu (struct pt_regs *regs,int cpu) -{ -struct elf_prstatus prstatus; -u32 *buf; - -if ((cpu <0 ) || (cpu >=NR_CPUS )) -return ; - -/* Using ELF notes here is opportunistic. -* I need a well defined structure format -* for the data I pass, and I need tags -* on the data to indicate what information I have -* squirrelled away. ELF notes happen to provide -* all of that, so there is no need to invent something new. -*/ - buf = (u32 *)per_cpu_ptr (crash_notes, cpu); -if (!buf) -return ; -memset (&prstatus,0 ,sizeof (prstatus)); - prstatus.pr_pid = current->pid; -elf_core_copy_regs (&prstatus.pr_reg, regs); - buf =append_elf_note (buf,"CORE" ,NT_PRSTATUS , &prstatus, -sizeof (prstatus)); -final_note (buf); -} - -static void crash_save_self (struct pt_regs *regs) -{ -int cpu; - - cpu =safe_smp_processor_id (); -crash_save_this_cpu (regs, cpu); -} -#if defined(CONFIG_SMP ) && defined(CONFIG_X86_LOCAL_APIC )static atomic_t waiting_for_crash_ipi;
@@ -121,7 +59,7 @@ static int crash_nmi_callback(struct notcrash_fixup_ss_esp (&fixed_regs, regs); regs = &fixed_regs; } -crash_save_this_cpu (regs, cpu); +crash_save_cpu (regs, cpu);disable_local_APIC ();atomic_dec (&waiting_for_crash_ipi);/* Assume hlt works */
@@ -195,5 +133,5 @@ void machine_crash_shutdown(struct pt_re#if defined(CONFIG_X86_IO_APIC )disable_IO_APIC ();#endif -crash_save_self (regs); +crash_save_cpu (regs,safe_smp_processor_id ()); }
arch/powerpc/kernel/crash.c +2 -57
77 lines not on this page · raw message
arch/x86_64/kernel/crash.c +2 -67
85 lines not on this page · raw message
include/linux/kexec.h +1 -0
@@ -105,6 +105,7 @@ extern struct page *kimage_alloc_control unsigned int order);extern void crash_kexec (struct pt_regs *);int kexec_should_crash (struct task_struct *); +void crash_save_cpu (struct pt_regs *regs,int cpu);extern struct kimage *kexec_image;extern struct kimage *kexec_crash_image;
kernel/kexec.c +56 -0
68 lines not on this page · raw message