From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UcIKB-00044h-4Y for kexec@lists.infradead.org; Tue, 14 May 2013 16:43:40 +0000 Date: Tue, 14 May 2013 12:42:55 -0400 From: Vivek Goyal Subject: Re: [PATCH v5 6/8] vmcore: treat memory chunks referenced by PT_LOAD program header entries in page-size boundary in vmcore_list Message-ID: <20130514164255.GI13674@redhat.com> References: <20130514015622.18697.77191.stgit@localhost6.localdomain6> <20130514015740.18697.67638.stgit@localhost6.localdomain6> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20130514015740.18697.67638.stgit@localhost6.localdomain6> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: HATAYAMA Daisuke Cc: kexec@lists.infradead.org, linux-kernel@vger.kernel.org, lisa.mitchell@hp.com, linux-mm@kvack.org, kumagai-atsushi@mxc.nes.nec.co.jp, ebiederm@xmission.com, zhangyanfei@cn.fujitsu.com, akpm@linux-foundation.org, cpw@sgi.com, jingbai.ma@hp.com On Tue, May 14, 2013 at 10:57:40AM +0900, HATAYAMA Daisuke wrote: > Treat memory chunks referenced by PT_LOAD program header entries in > page-size boundary in vmcore_list. Formally, for each range [start, > end], we set up the corresponding vmcore object in vmcore_list to > [rounddown(start, PAGE_SIZE), roundup(end, PAGE_SIZE)]. > > This change affects layout of /proc/vmcore. The gaps generated by the > rearrangement are newly made visible to applications as > holes. Concretely, they are two ranges [rounddown(start, PAGE_SIZE), > start] and [end, roundup(end, PAGE_SIZE)]. > > Suppose variable m points at a vmcore object in vmcore_list, and > variable phdr points at the program header of PT_LOAD type the > variable m corresponds to. Then, pictorially: > > m->offset +---------------+ > | hole | > phdr->p_offset = +---------------+ > m->offset + (paddr - start) | |\ > | kernel memory | phdr->p_memsz > | |/ > +---------------+ > | hole | > m->offset + m->size +---------------+ > > where m->offset and m->offset + m->size are always page-size aligned. > > Signed-off-by: HATAYAMA Daisuke Looks good to me. I think this patch could be higher up in the series. Acked-by: Vivek Goyal Vivek > --- > > fs/proc/vmcore.c | 30 ++++++++++++++++++++++-------- > 1 files changed, 22 insertions(+), 8 deletions(-) > > diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c > index 795efd2..eb7ff29 100644 > --- a/fs/proc/vmcore.c > +++ b/fs/proc/vmcore.c > @@ -504,20 +504,27 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, > vmcore_off = elfsz + elfnotesegsz; > > for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { > + u64 paddr, start, end, size; > + > if (phdr_ptr->p_type != PT_LOAD) > continue; > > + paddr = phdr_ptr->p_offset; > + start = rounddown(paddr, PAGE_SIZE); > + end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE); > + size = end - start; > + > /* Add this contiguous chunk of memory to vmcore list.*/ > new = get_new_element(); > if (!new) > return -ENOMEM; > - new->paddr = phdr_ptr->p_offset; > - new->size = phdr_ptr->p_memsz; > + new->paddr = start; > + new->size = size; > list_add_tail(&new->list, vc_list); > > /* Update the program header offset. */ > - phdr_ptr->p_offset = vmcore_off; > - vmcore_off = vmcore_off + phdr_ptr->p_memsz; > + phdr_ptr->p_offset = vmcore_off + (paddr - start); > + vmcore_off = vmcore_off + size; > } > return 0; > } > @@ -540,20 +547,27 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, > vmcore_off = elfsz + elfnotesegsz; > > for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { > + u64 paddr, start, end, size; > + > if (phdr_ptr->p_type != PT_LOAD) > continue; > > + paddr = phdr_ptr->p_offset; > + start = rounddown(paddr, PAGE_SIZE); > + end = roundup(paddr + phdr_ptr->p_memsz, PAGE_SIZE); > + size = end - start; > + > /* Add this contiguous chunk of memory to vmcore list.*/ > new = get_new_element(); > if (!new) > return -ENOMEM; > - new->paddr = phdr_ptr->p_offset; > - new->size = phdr_ptr->p_memsz; > + new->paddr = start; > + new->size = size; > list_add_tail(&new->list, vc_list); > > /* Update the program header offset */ > - phdr_ptr->p_offset = vmcore_off; > - vmcore_off = vmcore_off + phdr_ptr->p_memsz; > + phdr_ptr->p_offset = vmcore_off + (paddr - start); > + vmcore_off = vmcore_off + size; > } > return 0; > } _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec