The patch titled Subject: vmcore: round-up offset of vmcore object in page-size boundary has been added to the -mm tree. Its filename is vmcore-round-up-offset-of-vmcore-object-in-page-size-boundary.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: round-up offset of vmcore object in page-size boundary To satisfy mmap()'s page-size bounary requirement, round-up offset of each vmcore objects in page-size boundary; each offset is connected to user-space virtual address through mapping of mmap(). 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 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff -puN fs/proc/vmcore.c~vmcore-round-up-offset-of-vmcore-object-in-page-size-boundary fs/proc/vmcore.c --- a/fs/proc/vmcore.c~vmcore-round-up-offset-of-vmcore-object-in-page-size-boundary +++ a/fs/proc/vmcore.c @@ -698,7 +698,7 @@ static int __init process_ptload_program } /* Sets offset fields of vmcore elements. */ -static void __init set_vmcore_list_offsets_elf64(char *elfptr, +static void __init set_vmcore_list_offsets_elf64(char *elfptr, size_t elfsz, struct list_head *vc_list) { loff_t vmcore_off; @@ -708,17 +708,16 @@ static void __init set_vmcore_list_offse ehdr_ptr = (Elf64_Ehdr *)elfptr; /* Skip Elf header and program headers. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr); + vmcore_off = elfsz; list_for_each_entry(m, vc_list, list) { m->offset = vmcore_off; - vmcore_off += m->size; + vmcore_off += roundup(m->size, PAGE_SIZE); } } /* Sets offset fields of vmcore elements. */ -static void __init set_vmcore_list_offsets_elf32(char *elfptr, +static void __init set_vmcore_list_offsets_elf32(char *elfptr, size_t elfsz, struct list_head *vc_list) { loff_t vmcore_off; @@ -728,12 +727,11 @@ static void __init set_vmcore_list_offse ehdr_ptr = (Elf32_Ehdr *)elfptr; /* Skip Elf header and program headers. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr); + vmcore_off = elfsz; list_for_each_entry(m, vc_list, list) { m->offset = vmcore_off; - vmcore_off += m->size; + vmcore_off += roundup(m->size, PAGE_SIZE); } } @@ -801,7 +799,7 @@ static int __init parse_crash_elf64_head get_order(elfcorebuf_sz_orig)); return rc; } - set_vmcore_list_offsets_elf64(elfcorebuf, &vmcore_list); + set_vmcore_list_offsets_elf64(elfcorebuf, elfcorebuf_sz, &vmcore_list); return 0; } @@ -869,7 +867,7 @@ static int __init parse_crash_elf32_head get_order(elfcorebuf_sz_orig)); return rc; } - set_vmcore_list_offsets_elf32(elfcorebuf, &vmcore_list); + set_vmcore_list_offsets_elf32(elfcorebuf, elfcorebuf_sz, &vmcore_list); return 0; } _ 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