The patch titled Subject: vmcore: count holes generated by round-up operation for vmcore size has been added to the -mm tree. Its filename is vmcore-count-holes-generated-by-round-up-operation-for-vmcore-size.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: HATAYAMA Daisuke <d.hatayama@xxxxxxxxxxxxxx> Subject: vmcore: count holes generated by round-up operation for vmcore size The previous patch changed offsets of each vmcore objects by round-up operation. vmcore size must count the holes. Signed-off-by: HATAYAMA Daisuke <d.hatayama@xxxxxxxxxxxxxx> Cc: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx> Cc: Vivek Goyal <vgoyal@xxxxxxxxxx> Cc: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/vmcore.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN fs/proc/vmcore.c~vmcore-count-holes-generated-by-round-up-operation-for-vmcore-size fs/proc/vmcore.c --- a/fs/proc/vmcore.c~vmcore-count-holes-generated-by-round-up-operation-for-vmcore-size +++ a/fs/proc/vmcore.c @@ -195,7 +195,7 @@ static struct vmcore* __init get_new_ele return kzalloc(sizeof(struct vmcore), GFP_KERNEL); } -static u64 __init get_vmcore_size_elf64(char *elfptr) +static u64 __init get_vmcore_size_elf64(char *elfptr, size_t elfsz) { int i; u64 size; @@ -204,15 +204,15 @@ static u64 __init get_vmcore_size_elf64( ehdr_ptr = (Elf64_Ehdr *)elfptr; phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); - size = ehdr_ptr->e_phoff + ((ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr)); + size = elfsz; for (i = 0; i < ehdr_ptr->e_phnum; i++) { - size += phdr_ptr->p_memsz; + size += roundup(phdr_ptr->p_memsz, PAGE_SIZE); phdr_ptr++; } return size; } -static u64 __init get_vmcore_size_elf32(char *elfptr) +static u64 __init get_vmcore_size_elf32(char *elfptr, size_t elfsz) { int i; u64 size; @@ -221,9 +221,9 @@ static u64 __init get_vmcore_size_elf32( ehdr_ptr = (Elf32_Ehdr *)elfptr; phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); - size = ehdr_ptr->e_phoff + ((ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr)); + size = elfsz; for (i = 0; i < ehdr_ptr->e_phnum; i++) { - size += phdr_ptr->p_memsz; + size += roundup(phdr_ptr->p_memsz, PAGE_SIZE); phdr_ptr++; } return size; @@ -892,14 +892,14 @@ static int __init parse_crash_elf_header return rc; /* Determine vmcore size. */ - vmcore_size = get_vmcore_size_elf64(elfcorebuf); + vmcore_size = get_vmcore_size_elf64(elfcorebuf, elfcorebuf_sz); } else if (e_ident[EI_CLASS] == ELFCLASS32) { rc = parse_crash_elf32_headers(); if (rc) return rc; /* Determine vmcore size. */ - vmcore_size = get_vmcore_size_elf32(elfcorebuf); + vmcore_size = get_vmcore_size_elf32(elfcorebuf, elfcorebuf_sz); } else { pr_warn("Warning: Core image elf header is not sane\n"); return -EINVAL; _ Patches currently in -mm which might be from d.hatayama@xxxxxxxxxxxxxx are vmcore-reference-e_phoff-member-explicitly-to-get-position-of-program-header-table.patch vmcore-clean-up-by-removing-unnecessary-variable.patch vmcore-rearrange-program-headers-without-assuming-consequtive-pt_note-entries.patch vmcore-sysfs-export-elf-note-segment-size-instead-of-vmcoreinfo-data-size.patch vmcore-allocate-buffer-for-elf-headers-on-page-size-alignment.patch vmcore-round-up-buffer-size-of-elf-headers-by-page_size.patch vmcore-procfs-introduce-a-flag-to-distinguish-objects-copied-in-2nd-kernel.patch vmcore-copy-non-page-size-aligned-head-and-tail-pages-in-2nd-kernel.patch vmcore-modify-vmcore-clean-up-function-to-free-buffer-on-2nd-kernel.patch vmcore-clean-up-read_vmcore.patch vmcore-read-buffers-for-vmcore-objects-copied-from-old-memory.patch vmcore-allocate-per-cpu-crash_notes-objects-on-page-size-boundary.patch kexec-allocate-vmcoreinfo-note-buffer-on-page-size-boundary.patch kexec-elf-introduce-nt_vmcore_debuginfo-note-type.patch elf-introduce-nt_vmcore_pad-type.patch kexec-fill-note-buffers-by-nt_vmcore_pad-notes-in-page-size-boundary.patch vmcore-check-nt_vmcore_pad-as-a-mark-indicating-the-end-of-elf-note-buffer.patch vmcore-check-if-vmcore-objects-satify-mmaps-page-size-boundary-requirement.patch vmcore-round-up-offset-of-vmcore-object-in-page-size-boundary.patch vmcore-count-holes-generated-by-round-up-operation-for-vmcore-size.patch vmcore-introduce-mmap_vmcore.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html