From: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> To: vgoyal@redhat.com, ebiederm@xmission.com, cpw@sgi.com, kumagai-atsushi@mxc.nes.nec.co.jp, lisa.mitchell@hp.com, heiko.carstens@de.ibm.com, akpm@linux-foundation.org Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/20] vmcore: round up buffer size of ELF headers by PAGE_SIZE Date: Sat, 02 Mar 2013 17:36:16 +0900 [thread overview] Message-ID: <20130302083616.31252.73787.stgit@localhost6.localdomain6> (raw) In-Reply-To: <20130302083447.31252.93914.stgit@localhost6.localdomain6> To satisfy mmap() page-size boundary requirement, round up buffer size of ELF headers by PAGE_SIZE. The resulting value becomes offset of ELF note segments and it's assigned in unique PT_NOTE program header entry. Also, some part that assumes past ELF headers' size is replaced by this new rounded-up value. Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> --- fs/proc/vmcore.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 1b02d01..c511cf4 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -340,7 +340,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, phdr.p_flags = 0; note_off = ehdr_ptr->e_phoff + (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf64_Phdr); - phdr.p_offset = note_off; + phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; phdr.p_align = 0; @@ -353,6 +353,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, /* Modify e_phnum to reflect merged headers. */ ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; + *elfsz = roundup(*elfsz, PAGE_SIZE); out: return 0; } @@ -449,7 +450,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, phdr.p_flags = 0; note_off = ehdr_ptr->e_phoff + (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf32_Phdr); - phdr.p_offset = note_off; + phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; phdr.p_align = 0; @@ -462,6 +463,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, /* Modify e_phnum to reflect merged headers. */ ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; + *elfsz = roundup(*elfsz, PAGE_SIZE); out: return 0; } @@ -482,9 +484,8 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ /* First program header is PT_NOTE header. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr) + - phdr_ptr->p_memsz; /* Note sections */ + vmcore_off = phdr_ptr->p_offset + roundup(phdr_ptr->p_memsz, + PAGE_SIZE); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { if (phdr_ptr->p_type != PT_LOAD) @@ -519,9 +520,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ /* First program header is PT_NOTE header. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr) + - phdr_ptr->p_memsz; /* Note sections */ + vmcore_off = phdr_ptr->p_offset + roundup(phdr_ptr->p_memsz, + PAGE_SIZE); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { if (phdr_ptr->p_type != PT_LOAD)
WARNING: multiple messages have this Message-ID (diff)
From: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> To: vgoyal@redhat.com, ebiederm@xmission.com, cpw@sgi.com, kumagai-atsushi@mxc.nes.nec.co.jp, lisa.mitchell@hp.com, heiko.carstens@de.ibm.com, akpm@linux-foundation.org Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/20] vmcore: round up buffer size of ELF headers by PAGE_SIZE Date: Sat, 02 Mar 2013 17:36:16 +0900 [thread overview] Message-ID: <20130302083616.31252.73787.stgit@localhost6.localdomain6> (raw) In-Reply-To: <20130302083447.31252.93914.stgit@localhost6.localdomain6> To satisfy mmap() page-size boundary requirement, round up buffer size of ELF headers by PAGE_SIZE. The resulting value becomes offset of ELF note segments and it's assigned in unique PT_NOTE program header entry. Also, some part that assumes past ELF headers' size is replaced by this new rounded-up value. Signed-off-by: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com> --- fs/proc/vmcore.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c index 1b02d01..c511cf4 100644 --- a/fs/proc/vmcore.c +++ b/fs/proc/vmcore.c @@ -340,7 +340,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, phdr.p_flags = 0; note_off = ehdr_ptr->e_phoff + (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf64_Phdr); - phdr.p_offset = note_off; + phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; phdr.p_align = 0; @@ -353,6 +353,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, /* Modify e_phnum to reflect merged headers. */ ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; + *elfsz = roundup(*elfsz, PAGE_SIZE); out: return 0; } @@ -449,7 +450,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, phdr.p_flags = 0; note_off = ehdr_ptr->e_phoff + (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf32_Phdr); - phdr.p_offset = note_off; + phdr.p_offset = roundup(note_off, PAGE_SIZE); phdr.p_vaddr = phdr.p_paddr = 0; phdr.p_filesz = phdr.p_memsz = phdr_sz; phdr.p_align = 0; @@ -462,6 +463,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, /* Modify e_phnum to reflect merged headers. */ ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; + *elfsz = roundup(*elfsz, PAGE_SIZE); out: return 0; } @@ -482,9 +484,8 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ /* First program header is PT_NOTE header. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr) + - phdr_ptr->p_memsz; /* Note sections */ + vmcore_off = phdr_ptr->p_offset + roundup(phdr_ptr->p_memsz, + PAGE_SIZE); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { if (phdr_ptr->p_type != PT_LOAD) @@ -519,9 +520,8 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ /* First program header is PT_NOTE header. */ - vmcore_off = ehdr_ptr->e_phoff + - (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr) + - phdr_ptr->p_memsz; /* Note sections */ + vmcore_off = phdr_ptr->p_offset + roundup(phdr_ptr->p_memsz, + PAGE_SIZE); for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { if (phdr_ptr->p_type != PT_LOAD) _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2013-03-05 7:05 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-03-02 8:35 [PATCH v2 00/20] kdump, vmcore: support mmap() on /proc/vmcore HATAYAMA Daisuke 2013-03-02 8:35 ` HATAYAMA Daisuke 2013-03-02 8:35 ` [PATCH v2 01/20] vmcore: refer to e_phoff member explicitly HATAYAMA Daisuke 2013-03-02 8:35 ` HATAYAMA Daisuke 2013-03-05 7:35 ` Zhang Yanfei 2013-03-05 7:35 ` Zhang Yanfei 2013-03-10 6:46 ` Zhang Yanfei 2013-03-10 6:46 ` Zhang Yanfei 2013-03-11 0:31 ` HATAYAMA Daisuke 2013-03-11 0:31 ` HATAYAMA Daisuke 2013-03-11 17:36 ` Vivek Goyal 2013-03-11 17:36 ` Vivek Goyal 2013-03-02 8:35 ` [PATCH v2 02/20] vmcore: rearrange program headers without assuming consequtive PT_NOTE entries HATAYAMA Daisuke 2013-03-02 8:35 ` HATAYAMA Daisuke 2013-03-05 8:36 ` Zhang Yanfei 2013-03-05 8:36 ` Zhang Yanfei 2013-03-05 9:02 ` HATAYAMA Daisuke 2013-03-05 9:02 ` HATAYAMA Daisuke 2013-03-05 9:35 ` Zhang Yanfei 2013-03-05 9:35 ` Zhang Yanfei 2013-03-02 8:36 ` [PATCH v2 03/20] vmcore, sysfs: export ELF note segment size instead of vmcoreinfo data size HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-05 9:29 ` Zhang Yanfei 2013-03-05 9:29 ` Zhang Yanfei 2013-03-06 0:07 ` HATAYAMA Daisuke 2013-03-06 0:07 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 04/20] vmcore: allocate buffer for ELF headers on page-size alignment HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-06 6:57 ` Zhang Yanfei 2013-03-06 6:57 ` Zhang Yanfei 2013-03-06 9:14 ` HATAYAMA Daisuke 2013-03-06 9:14 ` HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke [this message] 2013-03-02 8:36 ` [PATCH v2 05/20] vmcore: round up buffer size of ELF headers by PAGE_SIZE HATAYAMA Daisuke 2013-03-06 15:51 ` Yanfei Zhang 2013-03-06 15:51 ` Yanfei Zhang 2013-03-02 8:36 ` [PATCH v2 06/20] vmcore, procfs: introduce a flag to distinguish objects copied in 2nd kernel HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-06 15:55 ` Yanfei Zhang 2013-03-06 15:55 ` Yanfei Zhang 2013-03-02 8:36 ` [PATCH v2 07/20] vmcore: copy non page-size aligned head and tail pages " HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-10 6:16 ` Zhang Yanfei 2013-03-10 6:16 ` Zhang Yanfei 2013-03-11 0:27 ` HATAYAMA Daisuke 2013-03-11 0:27 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 08/20] vmcore: modify vmcore clean-up function to free buffer on " HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 09/20] vmcore: clean up read_vmcore() HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 10/20] vmcore: read buffers for vmcore objects copied from old memory HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 11/20] vmcore: allocate per-cpu crash_notes objects on page-size boundary HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-02 8:36 ` [PATCH v2 12/20] kexec: allocate vmcoreinfo note buffer " HATAYAMA Daisuke 2013-03-02 8:36 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 13/20] kexec, elf: introduce NT_VMCORE_DEBUGINFO note type HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 14/20] elf: introduce NT_VMCORE_PAD type HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 15/20] kexec: fill note buffers by NT_VMCORE_PAD notes in page-size boundary HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-07 10:11 ` Zhang Yanfei 2013-03-07 10:11 ` Zhang Yanfei 2013-03-08 1:55 ` HATAYAMA Daisuke 2013-03-08 1:55 ` HATAYAMA Daisuke 2013-03-08 13:02 ` Yanfei Zhang 2013-03-08 13:02 ` Yanfei Zhang 2013-03-09 3:46 ` HATAYAMA Daisuke 2013-03-09 3:46 ` HATAYAMA Daisuke 2013-03-10 2:33 ` Zhang Yanfei 2013-03-10 2:33 ` Zhang Yanfei 2013-03-02 8:37 ` [PATCH v2 16/20] vmcore: check NT_VMCORE_PAD as a mark indicating the end of ELF note buffer HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 17/20] vmcore: check if vmcore objects satify mmap()'s page-size boundary requirement HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 18/20] vmcore: round-up offset of vmcore object in page-size boundary HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 19/20] vmcore: count holes generated by round-up operation for vmcore size HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke 2013-03-02 8:37 ` [PATCH v2 20/20] vmcore: introduce mmap_vmcore() HATAYAMA Daisuke 2013-03-02 8:37 ` HATAYAMA Daisuke
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130302083616.31252.73787.stgit@localhost6.localdomain6 \ --to=d.hatayama@jp.fujitsu.com \ --cc=akpm@linux-foundation.org \ --cc=cpw@sgi.com \ --cc=ebiederm@xmission.com \ --cc=heiko.carstens@de.ibm.com \ --cc=kexec@lists.infradead.org \ --cc=kumagai-atsushi@mxc.nes.nec.co.jp \ --cc=linux-kernel@vger.kernel.org \ --cc=lisa.mitchell@hp.com \ --cc=vgoyal@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.