Hi, this is a(nother) minor update to this patch. Explanation below.
-- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/ [PATCH] kdump/kexec: calculate note size at compile time Currently the size of the per-cpu region reserved to save crash notes is set by the per-architecture value MAX_NOTE_BYTES. Which in turn is currently set to 1024 on all supported architectures. While testing ia64 I recently discovered that this value is in fact too small. The particular setup I was using actually needs 1172 bytes. This lead to very tedious failure mode where the tail of one elf note would overwrite the head of another if they ended up being alocated sequentially by kmalloc, which was often the case. It seems to me that a far better approach is to caclculate the size that the area needs to be. This patch does just that. If a simpler stop-gap patch for ia64 to be squeezed into 2.6.21(.X) is needed then this should be as easy as making MAX_NOTE_BYTES larger in arch/asm-ia64/kexec.h. Perhaps 2048 would be a good choice. However, I think that the approach in this patch is a much more robust idea. Update I: Changed KEXEC_NOTE_HEAD_BYTES to KEXEC_NOTE_DESC_BYTES in line with the name of the relevant field in struct elf_note Update II: * Use KEXEC_NOTE_NAME instead of "CORE" in kernel/kexec.c and arch/ia64/kernel/crash.c just to be extra sure that the data used to calculate the size, and the data stuffed into the reserved area is the same. Incidently, the ia64 code really ought to use the generic code. I am working on a patch for this. But it is not urgent. * Added Ack from Vivek, which was actually for the update I version of the patch. If this is wrong, please tell me. Acked-by: Vivek Goyal <[EMAIL PROTECTED]> Signed-off-by: Simon Horman <[EMAIL PROTECTED]> arch/ia64/kernel/crash.c | 2 +- include/asm-arm/kexec.h | 2 -- include/asm-i386/kexec.h | 2 -- include/asm-ia64/kexec.h | 2 -- include/asm-mips/kexec.h | 2 -- include/asm-powerpc/kexec.h | 2 -- include/asm-s390/kexec.h | 2 -- include/asm-sh/kexec.h | 2 -- include/asm-x86_64/kexec.h | 2 -- include/linux/kexec.h | 11 ++++++++++- kernel/kexec.c | 2 +- 11 files changed, 12 insertions(+), 19 deletions(-) Index: linux-2.6/include/asm-ia64/kexec.h =================================================================== --- linux-2.6.orig/include/asm-ia64/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-ia64/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -14,8 +14,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_IA_64 -#define MAX_NOTE_BYTES 1024 - #define kexec_flush_icache_page(page) do { \ unsigned long page_addr = (unsigned long)page_address(page); \ flush_icache_range(page_addr, page_addr + PAGE_SIZE); \ Index: linux-2.6/include/linux/kexec.h =================================================================== --- linux-2.6.orig/include/linux/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/linux/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -7,6 +7,8 @@ #include <linux/linkage.h> #include <linux/compat.h> #include <linux/ioport.h> +#include <linux/elfcore.h> +#include <linux/elf.h> #include <asm/kexec.h> /* Verify architecture specific macros are defined */ @@ -31,6 +33,13 @@ #error KEXEC_ARCH not defined #endif +#define KEXEC_NOTE_NAME "CORE" +#define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) +#define KEXEC_NOTE_NAME_BYTES ALIGN(strlen(KEXEC_NOTE_NAME) + 1, 4) +#define KEXEC_NOTE_DESC_BYTES ALIGN(sizeof(struct elf_prstatus), 4) +#define KEXEC_NOTE_BYTES ( (KEXEC_NOTE_HEAD_BYTES * 2) + \ + KEXEC_NOTE_NAME_BYTES + KEXEC_NOTE_DESC_BYTES ) + /* * This structure is used to hold the arguments that are used when loading * kernel binaries. @@ -136,7 +145,7 @@ /* Location of a reserved region to hold the crash kernel. */ extern struct resource crashk_res; -typedef u32 note_buf_t[MAX_NOTE_BYTES/4]; +typedef u32 note_buf_t[KEXEC_NOTE_BYTES/4]; extern note_buf_t *crash_notes; Index: linux-2.6/include/asm-arm/kexec.h =================================================================== --- linux-2.6.orig/include/asm-arm/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-arm/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -16,8 +16,6 @@ #ifndef __ASSEMBLY__ -#define MAX_NOTE_BYTES 1024 - struct kimage; /* Provide a dummy definition to avoid build failures. */ static inline void crash_setup_regs(struct pt_regs *newregs, Index: linux-2.6/include/asm-i386/kexec.h =================================================================== --- linux-2.6.orig/include/asm-i386/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-i386/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -47,8 +47,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_386 -#define MAX_NOTE_BYTES 1024 - /* CPU does not save ss and esp on stack if execution is already * running in kernel mode at the time of NMI occurrence. This code * fixes it. Index: linux-2.6/include/asm-mips/kexec.h =================================================================== --- linux-2.6.orig/include/asm-mips/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-mips/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -21,8 +21,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_MIPS -#define MAX_NOTE_BYTES 1024 - static inline void crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs) { Index: linux-2.6/include/asm-powerpc/kexec.h =================================================================== --- linux-2.6.orig/include/asm-powerpc/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-powerpc/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -108,8 +108,6 @@ struct pt_regs *oldregs) { } #endif /* !__powerpc64 __ */ -#define MAX_NOTE_BYTES 1024 - extern void kexec_smp_wait(void); /* get and clear naca physid, wait for master to copy new code to 0 */ extern int crashing_cpu; Index: linux-2.6/include/asm-s390/kexec.h =================================================================== --- linux-2.6.orig/include/asm-s390/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-s390/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -34,8 +34,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_S390 -#define MAX_NOTE_BYTES 1024 - /* Provide a dummy definition to avoid build failures. */ static inline void crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs) { } Index: linux-2.6/include/asm-sh/kexec.h =================================================================== --- linux-2.6.orig/include/asm-sh/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-sh/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -23,8 +23,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_SH -#define MAX_NOTE_BYTES 1024 - /* Provide a dummy definition to avoid build failures. */ static inline void crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs) { } Index: linux-2.6/include/asm-x86_64/kexec.h =================================================================== --- linux-2.6.orig/include/asm-x86_64/kexec.h 2007-03-28 18:50:25.000000000 +0900 +++ linux-2.6/include/asm-x86_64/kexec.h 2007-03-29 12:19:10.000000000 +0900 @@ -48,8 +48,6 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_X86_64 -#define MAX_NOTE_BYTES 1024 - /* * Saving the registers of the cpu on which panic occured in * crash_kexec to save a valid sp. The registers of other cpus Index: linux-2.6/arch/ia64/kernel/crash.c =================================================================== --- linux-2.6.orig/arch/ia64/kernel/crash.c 2007-03-29 12:22:07.000000000 +0900 +++ linux-2.6/arch/ia64/kernel/crash.c 2007-03-29 12:22:24.000000000 +0900 @@ -74,7 +74,7 @@ buf = (u64 *) per_cpu_ptr(crash_notes, cpu); if (!buf) return; - buf = append_elf_note(buf, "CORE", NT_PRSTATUS, prstatus, + buf = append_elf_note(buf, KEXEC_NOTE_NAME, NT_PRSTATUS, prstatus, sizeof(*prstatus)); final_note(buf); } Index: linux-2.6/kernel/kexec.c =================================================================== --- linux-2.6.orig/kernel/kexec.c 2007-03-29 12:22:07.000000000 +0900 +++ linux-2.6/kernel/kexec.c 2007-03-29 12:22:24.000000000 +0900 @@ -1118,7 +1118,7 @@ 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, + buf = append_elf_note(buf, KEXEC_NOTE_NAME, NT_PRSTATUS, &prstatus, sizeof(prstatus)); final_note(buf); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
