From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754728Ab3CEJDC (ORCPT ); Tue, 5 Mar 2013 04:03:02 -0500 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:50783 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754903Ab3CEJCw (ORCPT ); Tue, 5 Mar 2013 04:02:52 -0500 Date: Tue, 05 Mar 2013 18:02:43 +0900 (JST) Message-Id: <20130305.180243.45653001.d.hatayama@jp.fujitsu.com> To: zhangyanfei@cn.fujitsu.com Cc: kexec@lists.infradead.org, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, lisa.mitchell@hp.com, kumagai-atsushi@mxc.nes.nec.co.jp, ebiederm@xmission.com, akpm@linux-foundation.org, cpw@sgi.com, vgoyal@redhat.com Subject: Re: [PATCH v2 02/20] vmcore: rearrange program headers without assuming consequtive PT_NOTE entries From: HATAYAMA Daisuke In-Reply-To: <5135AEA5.7000605@cn.fujitsu.com> References: <20130302083447.31252.93914.stgit@localhost6.localdomain6> <20130302083559.31252.60341.stgit@localhost6.localdomain6> <5135AEA5.7000605@cn.fujitsu.com> X-Mailer: Mew version 6.3 on Emacs 24.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=iso-2022-jp Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhang Yanfei Subject: Re: [PATCH v2 02/20] vmcore: rearrange program headers without assuming consequtive PT_NOTE entries Date: Tue, 5 Mar 2013 16:36:53 +0800 > 于 2013年03月02日 16:35, HATAYAMA Daisuke 写道: >> Current code assumes all PT_NOTE headers are placed at the beginning >> of program header table and they are consequtive. But the assumption >> could be broken by future changes on either kexec-tools or the 1st >> kernel. This patch removes the assumption and rearranges program >> headers as the following conditions are satisfied: >> >> - PT_NOTE entry is unique at the first entry, >> >> - the order of program headers are unchanged during this >> rearrangement, only their positions are changed in positive >> direction. >> >> - unused part that occurs in the bottom of program headers are filled >> with 0. >> >> Also, this patch adds one exceptional case where the number of PT_NOTE >> entries is somehow 0. Then, immediately go out of the function. >> >> Signed-off-by: HATAYAMA Daisuke >> --- >> >> fs/proc/vmcore.c | 92 +++++++++++++++++++++++++++++++++++++++++++----------- >> 1 files changed, 74 insertions(+), 18 deletions(-) >> >> diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c >> index abf4f01..b5c9e33 100644 >> --- a/fs/proc/vmcore.c >> +++ b/fs/proc/vmcore.c >> @@ -251,8 +251,7 @@ static u64 __init get_vmcore_size_elf32(char *elfptr) >> static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> struct list_head *vc_list) >> { >> - int i, nr_ptnote=0, rc=0; >> - char *tmp; >> + int i, j, nr_ptnote=0, i_ptnote, rc=0; > > After applying the patch, there are two "j" defined. > > 251 static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, > 252 struct list_head *vc_list) > 253 { > 254 int i, j, nr_ptnote=0, i_ptnote, rc=0; > 255 Elf64_Ehdr *ehdr_ptr; > 256 Elf64_Phdr phdr, *phdr_ptr; > 257 Elf64_Nhdr *nhdr_ptr; > 258 u64 phdr_sz = 0, note_off; > 259 > 260 ehdr_ptr = (Elf64_Ehdr *)elfptr; > 261 phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); > 262 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { > 263 int j; > 264 void *notes_section; > 265 struct vmcore *new; > > > line 254 and 263. > I've already noticed the name of the inner j is never best in meaning under development but I didn't make patch for it; it's beyond the scope of this patch series. I'll replace the outer j by another incremental variable like k. > >> Elf64_Ehdr *ehdr_ptr; >> Elf64_Phdr phdr, *phdr_ptr; >> Elf64_Nhdr *nhdr_ptr; >> @@ -302,6 +301,39 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> kfree(notes_section); >> } >> >> + if (nr_ptnote == 0) >> + goto out; >> + >> + phdr_ptr = (Elf64_Phdr *)(elfptr + ehdr_ptr->e_phoff); >> + >> + /* Remove unwanted PT_NOTE program headers. */ >> + >> + /* - 1st pass shifts non-PT_NOTE entries until the first >> + PT_NOTE entry. */ >> + i_ptnote = -1; >> + for (i = 0; i < ehdr_ptr->e_phnum; ++i) { >> + if (phdr_ptr[i].p_type == PT_NOTE) { >> + i_ptnote = i; >> + break; >> + } >> + } >> + BUG_ON(i_ptnote == -1); /* impossible case since nr_ptnote > 0. */ >> + memmove(phdr_ptr + 1, phdr_ptr, i_ptnote * sizeof(Elf64_Phdr)); > > is there any problem with this move? What is the batch bytes for every loop > of memmove? > > if i_ptnode == 2, so we have > > ------------------------------------- > | PT_LOAD 1 | PT_LOAD 2 | PT_NOTE 1 | > ------------------------------------- > > --> > > ------------------------------------- > | | PT_LOAD 1 | PT_LOAD 2 | > ------------------------------------- > > right? In the move, Does PT_LOAD 1 overwrite the original PT_LOAD 2? > Right and yes, see man memmove and man memcpy, and please compare them. Thanks. HATAYAMA, Daisuke From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UCnlv-0001fQ-83 for kexec@lists.infradead.org; Tue, 05 Mar 2013 09:02:56 +0000 Received: from m3.gw.fujitsu.co.jp (unknown [10.0.50.73]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id 9C4A13EE0B6 for ; Tue, 5 Mar 2013 18:02:50 +0900 (JST) Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 85E5C45DEC0 for ; Tue, 5 Mar 2013 18:02:50 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 6DC7045DEB5 for ; Tue, 5 Mar 2013 18:02:50 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 5B2EB1DB803E for ; Tue, 5 Mar 2013 18:02:50 +0900 (JST) Received: from ml14.s.css.fujitsu.com (ml14.s.css.fujitsu.com [10.240.81.134]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id D858FE08009 for ; Tue, 5 Mar 2013 18:02:49 +0900 (JST) Date: Tue, 05 Mar 2013 18:02:43 +0900 (JST) Message-Id: <20130305.180243.45653001.d.hatayama@jp.fujitsu.com> Subject: Re: [PATCH v2 02/20] vmcore: rearrange program headers without assuming consequtive PT_NOTE entries From: HATAYAMA Daisuke In-Reply-To: <5135AEA5.7000605@cn.fujitsu.com> References: <20130302083447.31252.93914.stgit@localhost6.localdomain6> <20130302083559.31252.60341.stgit@localhost6.localdomain6> <5135AEA5.7000605@cn.fujitsu.com> Mime-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: zhangyanfei@cn.fujitsu.com Cc: kexec@lists.infradead.org, heiko.carstens@de.ibm.com, linux-kernel@vger.kernel.org, lisa.mitchell@hp.com, kumagai-atsushi@mxc.nes.nec.co.jp, ebiederm@xmission.com, akpm@linux-foundation.org, cpw@sgi.com, vgoyal@redhat.com From: Zhang Yanfei Subject: Re: [PATCH v2 02/20] vmcore: rearrange program headers without assuming consequtive PT_NOTE entries Date: Tue, 5 Mar 2013 16:36:53 +0800 > 于 2013年03月02日 16:35, HATAYAMA Daisuke 写道: >> Current code assumes all PT_NOTE headers are placed at the beginning >> of program header table and they are consequtive. But the assumption >> could be broken by future changes on either kexec-tools or the 1st >> kernel. This patch removes the assumption and rearranges program >> headers as the following conditions are satisfied: >> >> - PT_NOTE entry is unique at the first entry, >> >> - the order of program headers are unchanged during this >> rearrangement, only their positions are changed in positive >> direction. >> >> - unused part that occurs in the bottom of program headers are filled >> with 0. >> >> Also, this patch adds one exceptional case where the number of PT_NOTE >> entries is somehow 0. Then, immediately go out of the function. >> >> Signed-off-by: HATAYAMA Daisuke >> --- >> >> fs/proc/vmcore.c | 92 +++++++++++++++++++++++++++++++++++++++++++----------- >> 1 files changed, 74 insertions(+), 18 deletions(-) >> >> diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c >> index abf4f01..b5c9e33 100644 >> --- a/fs/proc/vmcore.c >> +++ b/fs/proc/vmcore.c >> @@ -251,8 +251,7 @@ static u64 __init get_vmcore_size_elf32(char *elfptr) >> static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> struct list_head *vc_list) >> { >> - int i, nr_ptnote=0, rc=0; >> - char *tmp; >> + int i, j, nr_ptnote=0, i_ptnote, rc=0; > > After applying the patch, there are two "j" defined. > > 251 static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, > 252 struct list_head *vc_list) > 253 { > 254 int i, j, nr_ptnote=0, i_ptnote, rc=0; > 255 Elf64_Ehdr *ehdr_ptr; > 256 Elf64_Phdr phdr, *phdr_ptr; > 257 Elf64_Nhdr *nhdr_ptr; > 258 u64 phdr_sz = 0, note_off; > 259 > 260 ehdr_ptr = (Elf64_Ehdr *)elfptr; > 261 phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); > 262 for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { > 263 int j; > 264 void *notes_section; > 265 struct vmcore *new; > > > line 254 and 263. > I've already noticed the name of the inner j is never best in meaning under development but I didn't make patch for it; it's beyond the scope of this patch series. I'll replace the outer j by another incremental variable like k. > >> Elf64_Ehdr *ehdr_ptr; >> Elf64_Phdr phdr, *phdr_ptr; >> Elf64_Nhdr *nhdr_ptr; >> @@ -302,6 +301,39 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> kfree(notes_section); >> } >> >> + if (nr_ptnote == 0) >> + goto out; >> + >> + phdr_ptr = (Elf64_Phdr *)(elfptr + ehdr_ptr->e_phoff); >> + >> + /* Remove unwanted PT_NOTE program headers. */ >> + >> + /* - 1st pass shifts non-PT_NOTE entries until the first >> + PT_NOTE entry. */ >> + i_ptnote = -1; >> + for (i = 0; i < ehdr_ptr->e_phnum; ++i) { >> + if (phdr_ptr[i].p_type == PT_NOTE) { >> + i_ptnote = i; >> + break; >> + } >> + } >> + BUG_ON(i_ptnote == -1); /* impossible case since nr_ptnote > 0. */ >> + memmove(phdr_ptr + 1, phdr_ptr, i_ptnote * sizeof(Elf64_Phdr)); > > is there any problem with this move? What is the batch bytes for every loop > of memmove? > > if i_ptnode == 2, so we have > > ------------------------------------- > | PT_LOAD 1 | PT_LOAD 2 | PT_NOTE 1 | > ------------------------------------- > > --> > > ------------------------------------- > | | PT_LOAD 1 | PT_LOAD 2 | > ------------------------------------- > > right? In the move, Does PT_LOAD 1 overwrite the original PT_LOAD 2? > Right and yes, see man memmove and man memcpy, and please compare them. Thanks. HATAYAMA, Daisuke _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec