From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UEa4M-0006aJ-7s for kexec@lists.infradead.org; Sun, 10 Mar 2013 06:49:20 +0000 Message-ID: <513C2C47.5020008@cn.fujitsu.com> Date: Sun, 10 Mar 2013 14:46:31 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: Re: [PATCH v2 01/20] vmcore: refer to e_phoff member explicitly References: <20130302083447.31252.93914.stgit@localhost6.localdomain6> <20130302083554.31252.30615.stgit@localhost6.localdomain6> <5135A054.7010401@cn.fujitsu.com> In-Reply-To: <5135A054.7010401@cn.fujitsu.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: HATAYAMA Daisuke 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 5LqOIDIwMTPlubQwM+aciDA15pelIDE1OjM1LCBaaGFuZyBZYW5mZWkg5YaZ6YGTOgo+IOS6jiAy MDEz5bm0MDPmnIgwMuaXpSAxNjozNSwgSEFUQVlBTUEgRGFpc3VrZSDlhpnpgZM6Cj4+IENvZGUg YXJvdW5kIC9wcm9jL3ZtY29yZSBjdXJyZW50bHkgYXNzdW1lcyBwcm9ncmFtIGhlYWRlciB0YWJs ZSBpcwo+PiBuZXh0IHRvIEVMRiBoZWFkZXIuIEJ1dCBmdXR1cmUgY2hhbmdlIGNhbiBicmVhayB0 aGUgYXNzdW1wdGlvbiBvbgo+PiBrZXhlYy10b29scyBhbmQgdGhlIDFzdCBrZXJuZWwuIFRvIGF2 b2lkIHdvcnN0IGNhc2UsIG5vdyByZWZlciB0bwo+PiBlX3Bob2ZmIG1lbWJlciB0aGF0IGluZGlj YXRlcyBwb3NpdGlvbiBvZiBwcm9ncmFtIGhlYWRlciB0YWJsZSBpbgo+PiBmaWxlLW9mZnNldC4K PiAKPiBSZXZpZXdlZC1ieTogWmhhbmcgWWFuZmVpIDx6aGFuZ3lhbmZlaUBjbi5mdWppdHN1LmNv bT4KPiAKPj4KPj4gU2lnbmVkLW9mZi1ieTogSEFUQVlBTUEgRGFpc3VrZSA8ZC5oYXRheWFtYUBq cC5mdWppdHN1LmNvbT4KPj4gLS0tCj4+Cj4+ICBmcy9wcm9jL3ZtY29yZS5jIHwgICA0MCArKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tCj4+ICAxIGZpbGVzIGNoYW5nZWQs IDIwIGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQo+Pgo+PiBkaWZmIC0tZ2l0IGEvZnMv cHJvYy92bWNvcmUuYyBiL2ZzL3Byb2Mvdm1jb3JlLmMKPj4gaW5kZXggYjg3MGY3NC4uYWJmNGYw MSAxMDA2NDQKPj4gLS0tIGEvZnMvcHJvYy92bWNvcmUuYwo+PiArKysgYi9mcy9wcm9jL3ZtY29y ZS5jCj4+IEBAIC0yMjEsOCArMjIxLDggQEAgc3RhdGljIHU2NCBfX2luaXQgZ2V0X3ZtY29yZV9z aXplX2VsZjY0KGNoYXIgKmVsZnB0cikKPj4gIAlFbGY2NF9QaGRyICpwaGRyX3B0cjsKPj4gIAo+ PiAgCWVoZHJfcHRyID0gKEVsZjY0X0VoZHIgKillbGZwdHI7Cj4+IC0JcGhkcl9wdHIgPSAoRWxm NjRfUGhkciopKGVsZnB0ciArIHNpemVvZihFbGY2NF9FaGRyKSk7Cj4+IC0Jc2l6ZSA9IHNpemVv ZihFbGY2NF9FaGRyKSArICgoZWhkcl9wdHItPmVfcGhudW0pICogc2l6ZW9mKEVsZjY0X1BoZHIp KTsKPj4gKwlwaGRyX3B0ciA9IChFbGY2NF9QaGRyKikoZWxmcHRyICsgZWhkcl9wdHItPmVfcGhv ZmYpOwo+PiArCXNpemUgPSBlaGRyX3B0ci0+ZV9waG9mZiArICgoZWhkcl9wdHItPmVfcGhudW0p ICogc2l6ZW9mKEVsZjY0X1BoZHIpKTsKPj4gIAlmb3IgKGkgPSAwOyBpIDwgZWhkcl9wdHItPmVf cGhudW07IGkrKykgewo+PiAgCQlzaXplICs9IHBoZHJfcHRyLT5wX21lbXN6Owo+PiAgCQlwaGRy X3B0cisrOwo+PiBAQCAtMjM4LDggKzIzOCw4IEBAIHN0YXRpYyB1NjQgX19pbml0IGdldF92bWNv cmVfc2l6ZV9lbGYzMihjaGFyICplbGZwdHIpCj4+ICAJRWxmMzJfUGhkciAqcGhkcl9wdHI7Cj4+ ICAKPj4gIAllaGRyX3B0ciA9IChFbGYzMl9FaGRyICopZWxmcHRyOwo+PiAtCXBoZHJfcHRyID0g KEVsZjMyX1BoZHIqKShlbGZwdHIgKyBzaXplb2YoRWxmMzJfRWhkcikpOwo+PiAtCXNpemUgPSBz aXplb2YoRWxmMzJfRWhkcikgKyAoKGVoZHJfcHRyLT5lX3BobnVtKSAqIHNpemVvZihFbGYzMl9Q aGRyKSk7Cj4+ICsJcGhkcl9wdHIgPSAoRWxmMzJfUGhkciopKGVsZnB0ciArIGVoZHJfcHRyLT5l X3Bob2ZmKTsKPj4gKwlzaXplID0gZWhkcl9wdHItPmVfcGhvZmYgKyAoKGVoZHJfcHRyLT5lX3Bo bnVtKSAqIHNpemVvZihFbGYzMl9QaGRyKSk7Cj4+ICAJZm9yIChpID0gMDsgaSA8IGVoZHJfcHRy LT5lX3BobnVtOyBpKyspIHsKPj4gIAkJc2l6ZSArPSBwaGRyX3B0ci0+cF9tZW1zejsKPj4gIAkJ cGhkcl9wdHIrKzsKPj4gQEAgLTI1OSw3ICsyNTksNyBAQCBzdGF0aWMgaW50IF9faW5pdCBtZXJn ZV9ub3RlX2hlYWRlcnNfZWxmNjQoY2hhciAqZWxmcHRyLCBzaXplX3QgKmVsZnN6LAo+PiAgCXU2 NCBwaGRyX3N6ID0gMCwgbm90ZV9vZmY7Cj4+ICAKPj4gIAllaGRyX3B0ciA9IChFbGY2NF9FaGRy ICopZWxmcHRyOwo+PiAtCXBoZHJfcHRyID0gKEVsZjY0X1BoZHIqKShlbGZwdHIgKyBzaXplb2Yo RWxmNjRfRWhkcikpOwo+PiArCXBoZHJfcHRyID0gKEVsZjY0X1BoZHIqKShlbGZwdHIgKyBlaGRy X3B0ci0+ZV9waG9mZik7Cj4+ICAJZm9yIChpID0gMDsgaSA8IGVoZHJfcHRyLT5lX3BobnVtOyBp KyssIHBoZHJfcHRyKyspIHsKPj4gIAkJaW50IGo7Cj4+ICAJCXZvaWQgKm5vdGVzX3NlY3Rpb247 Cj4+IEBAIC0zMDUsNyArMzA1LDcgQEAgc3RhdGljIGludCBfX2luaXQgbWVyZ2Vfbm90ZV9oZWFk ZXJzX2VsZjY0KGNoYXIgKmVsZnB0ciwgc2l6ZV90ICplbGZzeiwKPj4gIAkvKiBQcmVwYXJlIG1l cmdlZCBQVF9OT1RFIHByb2dyYW0gaGVhZGVyLiAqLwo+PiAgCXBoZHIucF90eXBlICAgID0gUFRf Tk9URTsKPj4gIAlwaGRyLnBfZmxhZ3MgICA9IDA7Cj4+IC0Jbm90ZV9vZmYgPSBzaXplb2YoRWxm NjRfRWhkcikgKwo+PiArCW5vdGVfb2ZmID0gZWhkcl9wdHItPmVfcGhvZmYgKwo+PiAgCQkJKGVo ZHJfcHRyLT5lX3BobnVtIC0gbnJfcHRub3RlICsxKSAqIHNpemVvZihFbGY2NF9QaGRyKTsKPj4g IAlwaGRyLnBfb2Zmc2V0ICA9IG5vdGVfb2ZmOwo+PiAgCXBoZHIucF92YWRkciAgID0gcGhkci5w X3BhZGRyID0gMDsKPj4gQEAgLTMxMywxNCArMzEzLDE0IEBAIHN0YXRpYyBpbnQgX19pbml0IG1l cmdlX25vdGVfaGVhZGVyc19lbGY2NChjaGFyICplbGZwdHIsIHNpemVfdCAqZWxmc3osCj4+ICAJ cGhkci5wX2FsaWduICAgPSAwOwo+PiAgCj4+ICAJLyogQWRkIG1lcmdlZCBQVF9OT1RFIHByb2dy YW0gaGVhZGVyKi8KPj4gLQl0bXAgPSBlbGZwdHIgKyBzaXplb2YoRWxmNjRfRWhkcik7Cj4+ICsJ dG1wID0gZWxmcHRyICsgZWhkcl9wdHItPmVfcGhvZmY7Cj4+ICAJbWVtY3B5KHRtcCwgJnBoZHIs IHNpemVvZihwaGRyKSk7Cj4+ICAJdG1wICs9IHNpemVvZihwaGRyKTsKPj4gIAo+PiAgCS8qIFJl bW92ZSB1bndhbnRlZCBQVF9OT1RFIHByb2dyYW0gaGVhZGVycy4gKi8KPj4gIAlpID0gKG5yX3B0 bm90ZSAtIDEpICogc2l6ZW9mKEVsZjY0X1BoZHIpOwo+PiAgCSplbGZzeiA9ICplbGZzeiAtIGk7 Cj4+IC0JbWVtbW92ZSh0bXAsIHRtcCtpLCAoKCplbGZzeiktc2l6ZW9mKEVsZjY0X0VoZHIpLXNp emVvZihFbGY2NF9QaGRyKSkpOwo+PiArCW1lbW1vdmUodG1wLCB0bXAraSwgKCgqZWxmc3opLWVo ZHJfcHRyLT5lX3Bob2ZmLXNpemVvZihFbGY2NF9QaGRyKSkpOwo+PiAgCj4+ICAJLyogTW9kaWZ5 IGVfcGhudW0gdG8gcmVmbGVjdCBtZXJnZWQgaGVhZGVycy4gKi8KPj4gIAllaGRyX3B0ci0+ZV9w aG51bSA9IGVoZHJfcHRyLT5lX3BobnVtIC0gbnJfcHRub3RlICsgMTsKPj4gQEAgLTM0MCw3ICsz NDAsNyBAQCBzdGF0aWMgaW50IF9faW5pdCBtZXJnZV9ub3RlX2hlYWRlcnNfZWxmMzIoY2hhciAq ZWxmcHRyLCBzaXplX3QgKmVsZnN6LAo+PiAgCXU2NCBwaGRyX3N6ID0gMCwgbm90ZV9vZmY7Cj4+ ICAKPj4gIAllaGRyX3B0ciA9IChFbGYzMl9FaGRyICopZWxmcHRyOwo+PiAtCXBoZHJfcHRyID0g KEVsZjMyX1BoZHIqKShlbGZwdHIgKyBzaXplb2YoRWxmMzJfRWhkcikpOwo+PiArCXBoZHJfcHRy ID0gKEVsZjMyX1BoZHIqKShlbGZwdHIgKyBlaGRyX3B0ci0+ZV9waG9mZik7Cj4+ICAJZm9yIChp ID0gMDsgaSA8IGVoZHJfcHRyLT5lX3BobnVtOyBpKyssIHBoZHJfcHRyKyspIHsKPj4gIAkJaW50 IGo7Cj4+ICAJCXZvaWQgKm5vdGVzX3NlY3Rpb247Cj4+IEBAIC0zODYsNyArMzg2LDcgQEAgc3Rh dGljIGludCBfX2luaXQgbWVyZ2Vfbm90ZV9oZWFkZXJzX2VsZjMyKGNoYXIgKmVsZnB0ciwgc2l6 ZV90ICplbGZzeiwKPj4gIAkvKiBQcmVwYXJlIG1lcmdlZCBQVF9OT1RFIHByb2dyYW0gaGVhZGVy LiAqLwo+PiAgCXBoZHIucF90eXBlICAgID0gUFRfTk9URTsKPj4gIAlwaGRyLnBfZmxhZ3MgICA9 IDA7Cj4+IC0Jbm90ZV9vZmYgPSBzaXplb2YoRWxmMzJfRWhkcikgKwo+PiArCW5vdGVfb2ZmID0g ZWhkcl9wdHItPmVfcGhvZmYgKwo+PiAgCQkJKGVoZHJfcHRyLT5lX3BobnVtIC0gbnJfcHRub3Rl ICsxKSAqIHNpemVvZihFbGYzMl9QaGRyKTsKPj4gIAlwaGRyLnBfb2Zmc2V0ICA9IG5vdGVfb2Zm Owo+PiAgCXBoZHIucF92YWRkciAgID0gcGhkci5wX3BhZGRyID0gMDsKPj4gQEAgLTM5NCwxNCAr Mzk0LDE0IEBAIHN0YXRpYyBpbnQgX19pbml0IG1lcmdlX25vdGVfaGVhZGVyc19lbGYzMihjaGFy ICplbGZwdHIsIHNpemVfdCAqZWxmc3osCj4+ICAJcGhkci5wX2FsaWduICAgPSAwOwo+PiAgCj4+ ICAJLyogQWRkIG1lcmdlZCBQVF9OT1RFIHByb2dyYW0gaGVhZGVyKi8KPj4gLQl0bXAgPSBlbGZw dHIgKyBzaXplb2YoRWxmMzJfRWhkcik7Cj4+ICsJdG1wID0gZWxmcHRyICsgZWhkcl9wdHItPmVf cGhvZmY7Cj4+ICAJbWVtY3B5KHRtcCwgJnBoZHIsIHNpemVvZihwaGRyKSk7Cj4+ICAJdG1wICs9 IHNpemVvZihwaGRyKTsKPj4gIAo+PiAgCS8qIFJlbW92ZSB1bndhbnRlZCBQVF9OT1RFIHByb2dy YW0gaGVhZGVycy4gKi8KPj4gIAlpID0gKG5yX3B0bm90ZSAtIDEpICogc2l6ZW9mKEVsZjMyX1Bo ZHIpOwo+PiAgCSplbGZzeiA9ICplbGZzeiAtIGk7Cj4+IC0JbWVtbW92ZSh0bXAsIHRtcCtpLCAo KCplbGZzeiktc2l6ZW9mKEVsZjMyX0VoZHIpLXNpemVvZihFbGYzMl9QaGRyKSkpOwo+PiArCW1l bW1vdmUodG1wLCB0bXAraSwgKCgqZWxmc3opLWVoZHJfcHRyLT5lX3Bob2ZmLXNpemVvZihFbGYz Ml9QaGRyKSkpOwo+PiAgCj4+ICAJLyogTW9kaWZ5IGVfcGhudW0gdG8gcmVmbGVjdCBtZXJnZWQg aGVhZGVycy4gKi8KPj4gIAllaGRyX3B0ci0+ZV9waG51bSA9IGVoZHJfcHRyLT5lX3BobnVtIC0g bnJfcHRub3RlICsgMTsKPj4gQEAgLTQyMiwxMCArNDIyLDEwIEBAIHN0YXRpYyBpbnQgX19pbml0 IHByb2Nlc3NfcHRsb2FkX3Byb2dyYW1faGVhZGVyc19lbGY2NChjaGFyICplbGZwdHIsCj4+ICAJ c3RydWN0IHZtY29yZSAqbmV3Owo+PiAgCj4+ICAJZWhkcl9wdHIgPSAoRWxmNjRfRWhkciAqKWVs ZnB0cjsKPj4gLQlwaGRyX3B0ciA9IChFbGY2NF9QaGRyKikoZWxmcHRyICsgc2l6ZW9mKEVsZjY0 X0VoZHIpKTsgLyogUFRfTk9URSBoZHIgKi8KPj4gKwlwaGRyX3B0ciA9IChFbGY2NF9QaGRyKiko ZWxmcHRyICsgZWhkcl9wdHItPmVfcGhvZmYpOyAvKiBQVF9OT1RFIGhkciAqLwo+PiAgCj4+ICAJ LyogRmlyc3QgcHJvZ3JhbSBoZWFkZXIgaXMgUFRfTk9URSBoZWFkZXIuICovCj4+IC0Jdm1jb3Jl X29mZiA9IHNpemVvZihFbGY2NF9FaGRyKSArCj4+ICsJdm1jb3JlX29mZiA9IGVoZHJfcHRyLT5l X3Bob2ZmICsKPj4gIAkJCShlaGRyX3B0ci0+ZV9waG51bSkgKiBzaXplb2YoRWxmNjRfUGhkcikg Kwo+PiAgCQkJcGhkcl9wdHItPnBfbWVtc3o7IC8qIE5vdGUgc2VjdGlvbnMgKi8KPj4gIAo+PiBA QCAtNDU5LDEwICs0NTksMTAgQEAgc3RhdGljIGludCBfX2luaXQgcHJvY2Vzc19wdGxvYWRfcHJv Z3JhbV9oZWFkZXJzX2VsZjMyKGNoYXIgKmVsZnB0ciwKPj4gIAlzdHJ1Y3Qgdm1jb3JlICpuZXc7 Cj4+ICAKPj4gIAllaGRyX3B0ciA9IChFbGYzMl9FaGRyICopZWxmcHRyOwo+PiAtCXBoZHJfcHRy ID0gKEVsZjMyX1BoZHIqKShlbGZwdHIgKyBzaXplb2YoRWxmMzJfRWhkcikpOyAvKiBQVF9OT1RF IGhkciAqLwo+PiArCXBoZHJfcHRyID0gKEVsZjMyX1BoZHIqKShlbGZwdHIgKyBlaGRyX3B0ci0+ ZV9waG9mZik7IC8qIFBUX05PVEUgaGRyICovCj4+ICAKPj4gIAkvKiBGaXJzdCBwcm9ncmFtIGhl YWRlciBpcyBQVF9OT1RFIGhlYWRlci4gKi8KPj4gLQl2bWNvcmVfb2ZmID0gc2l6ZW9mKEVsZjMy X0VoZHIpICsKPj4gKwl2bWNvcmVfb2ZmID0gZWhkcl9wdHItPmVfcGhvZmYgKwo+PiAgCQkJKGVo ZHJfcHRyLT5lX3BobnVtKSAqIHNpemVvZihFbGYzMl9QaGRyKSArCj4+ICAJCQlwaGRyX3B0ci0+ cF9tZW1zejsgLyogTm90ZSBzZWN0aW9ucyAqLwo+PiAgCj4+IEBAIC00OTYsNyArNDk2LDcgQEAg c3RhdGljIHZvaWQgX19pbml0IHNldF92bWNvcmVfbGlzdF9vZmZzZXRzX2VsZjY0KGNoYXIgKmVs ZnB0ciwKPj4gIAllaGRyX3B0ciA9IChFbGY2NF9FaGRyICopZWxmcHRyOwo+PiAgCj4+ICAJLyog U2tpcCBFbGYgaGVhZGVyIGFuZCBwcm9ncmFtIGhlYWRlcnMuICovCj4+IC0Jdm1jb3JlX29mZiA9 IHNpemVvZihFbGY2NF9FaGRyKSArCj4+ICsJdm1jb3JlX29mZiA9IGVoZHJfcHRyLT5lX3Bob2Zm ICsKPj4gIAkJCShlaGRyX3B0ci0+ZV9waG51bSkgKiBzaXplb2YoRWxmNjRfUGhkcik7Cj4+ICAK Pj4gIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KG0sIHZjX2xpc3QsIGxpc3QpIHsKPj4gQEAgLTUxNiw3 ICs1MTYsNyBAQCBzdGF0aWMgdm9pZCBfX2luaXQgc2V0X3ZtY29yZV9saXN0X29mZnNldHNfZWxm MzIoY2hhciAqZWxmcHRyLAo+PiAgCWVoZHJfcHRyID0gKEVsZjMyX0VoZHIgKillbGZwdHI7Cj4+ ICAKPj4gIAkvKiBTa2lwIEVsZiBoZWFkZXIgYW5kIHByb2dyYW0gaGVhZGVycy4gKi8KPj4gLQl2 bWNvcmVfb2ZmID0gc2l6ZW9mKEVsZjMyX0VoZHIpICsKPj4gKwl2bWNvcmVfb2ZmID0gZWhkcl9w dHItPmVfcGhvZmYgKwo+PiAgCQkJKGVoZHJfcHRyLT5lX3BobnVtKSAqIHNpemVvZihFbGYzMl9Q aGRyKTsKPj4gIAo+PiAgCWxpc3RfZm9yX2VhY2hfZW50cnkobSwgdmNfbGlzdCwgbGlzdCkgewo+ PiBAQCAtNTUzLDcgKzU1Myw3IEBAIHN0YXRpYyBpbnQgX19pbml0IHBhcnNlX2NyYXNoX2VsZjY0 X2hlYWRlcnModm9pZCkKPj4gIAl9Cj4+ICAKPj4gIAkvKiBSZWFkIGluIGFsbCBlbGYgaGVhZGVy cy4gKi8KPj4gLQllbGZjb3JlYnVmX3N6ID0gc2l6ZW9mKEVsZjY0X0VoZHIpICsgZWhkci5lX3Bo bnVtICogc2l6ZW9mKEVsZjY0X1BoZHIpOwo+PiArCWVsZmNvcmVidWZfc3ogPSBlaGRyLmVfcGhv ZmYgKyBlaGRyLmVfcGhudW0gKiBzaXplb2YoRWxmNjRfUGhkcik7CgpPbmUgbWlub3Igc3VnZ2Vz dGlvbi4KClByZXZpb3VzbHksIHdoZW4gdGhlIGNvZGUgYXNzdW1lcyBwcm9ncmFtIGhlYWRlcnMg YXJlIGZvbGxvd2luZyBpbW1lZGlhdGVseQp0aGUgRUxGIGhlYWRlciwgaXQgdXNlcwoKIGVsZmNv cmVidWZfc3ogPSBzaXplb2YoRWxmNjRfRWhkcikgKyBlaGRyLmVfcGhudW0gKiBzaXplb2YoRWxm NjRfUGhkcik7Cgp0byBjYWxjdWxhdGUgdGhlIHNpemUgb2YgRUxGIGhlYWRlciBhbmQgRUxGIHBy b2dyYW0gaGVhZGVycwoKVGhpcyBwYXRjaCBhdm9pZHMgdGhlIGFzc3VtcHRpb24sIGFuZCB1c2Vz IGVoZHIuZV9waG9mZiB0byBnZXQgdGhlIHByb2dyYW0KaGVhZGVycycgYWRkcmVzcy4gQnV0IGl0 IHdpbGwgcmVhZCB1bnJlbGF0ZWQgY29udGVudHMgaW50byBlbGZjb3JlYnVmIGlmCnByb2dyYW0g aGVhZGVycyBhcmUgbm90IGZvbGxvd2luZyBpbW1lZGlhdGVseSB0aGUgRUxGIGhlYWRlci4gU28g Y291bGQgdGhlCmNvZGUgYmU6CgplbGZjb3JlYnVmX3N6ID0gc2l6ZW9mKEVsZjY0X0VoZHIpICsg ZWhkci5lX3BobnVtICogc2l6ZW9mKEVsZjY0X1BoZHIpOwphZGRyID0gZWxmY29yZWhkcl9hZGRy ICsgZWhkci5lX3Bob2ZmOwptZW1jcHkoZWxmY29yZWJ1ZiwgJmVoZHIsIHNpemVvZihFbGY2NF9F aGRyKSk7CnJlYWRfZnJvbV9vbGRtZW0oZWxmY29yZWJ1ZiArIHNpemVvZihFbGY2NF9FaGRyKSwg ZWxmY29yZWJ1Zl9zeiAtCiAgICAgICAgICAgICAgICAgc2l6ZW9mKEVsZjY0X0VoZHIpLCAmYWRk ciwgMCk7CihFbGY2NF9FaGRyICopZWxmY29yZWJ1Zi0+ZV9waG9mZiA9IHNpemVvZihFbGY2NF9F aGRyKTsKCj4+ICAJZWxmY29yZWJ1ZiA9IGttYWxsb2MoZWxmY29yZWJ1Zl9zeiwgR0ZQX0tFUk5F TCk7Cj4+ICAJaWYgKCFlbGZjb3JlYnVmKQo+PiAgCQlyZXR1cm4gLUVOT01FTTsKPj4gQEAgLTYw OCw3ICs2MDgsNyBAQCBzdGF0aWMgaW50IF9faW5pdCBwYXJzZV9jcmFzaF9lbGYzMl9oZWFkZXJz KHZvaWQpCj4+ICAJfQo+PiAgCj4+ICAJLyogUmVhZCBpbiBhbGwgZWxmIGhlYWRlcnMuICovCj4+ IC0JZWxmY29yZWJ1Zl9zeiA9IHNpemVvZihFbGYzMl9FaGRyKSArIGVoZHIuZV9waG51bSAqIHNp emVvZihFbGYzMl9QaGRyKTsKPj4gKwllbGZjb3JlYnVmX3N6ID0gZWhkci5lX3Bob2ZmICsgZWhk ci5lX3BobnVtICogc2l6ZW9mKEVsZjMyX1BoZHIpOwo+PiAgCWVsZmNvcmVidWYgPSBrbWFsbG9j KGVsZmNvcmVidWZfc3osIEdGUF9LRVJORUwpOwo+PiAgCWlmICghZWxmY29yZWJ1ZikKPj4gIAkJ cmV0dXJuIC1FTk9NRU07Cj4+Cj4+Cj4+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCj4+IGtleGVjIG1haWxpbmcgbGlzdAo+PiBrZXhlY0BsaXN0cy5pbmZy YWRlYWQub3JnCj4+IGh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v a2V4ZWMKPj4KPiAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwo+IGtleGVjIG1haWxpbmcgbGlzdAo+IGtleGVjQGxpc3RzLmluZnJhZGVhZC5vcmcK PiBodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2tleGVjCgoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18Ka2V4ZWMgbWFpbGlu ZyBsaXN0CmtleGVjQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5v cmcvbWFpbG1hbi9saXN0aW5mby9rZXhlYwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753098Ab3CJGsH (ORCPT ); Sun, 10 Mar 2013 01:48:07 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:36356 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753059Ab3CJGsE convert rfc822-to-8bit (ORCPT ); Sun, 10 Mar 2013 01:48:04 -0500 X-IronPort-AV: E=Sophos;i="4.84,817,1355068800"; d="scan'208";a="6843783" Message-ID: <513C2C47.5020008@cn.fujitsu.com> Date: Sun, 10 Mar 2013 14:46:31 +0800 From: Zhang Yanfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.8) Gecko/20121012 Thunderbird/10.0.8 MIME-Version: 1.0 To: HATAYAMA Daisuke 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 01/20] vmcore: refer to e_phoff member explicitly References: <20130302083447.31252.93914.stgit@localhost6.localdomain6> <20130302083554.31252.30615.stgit@localhost6.localdomain6> <5135A054.7010401@cn.fujitsu.com> In-Reply-To: <5135A054.7010401@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/10 14:46:51, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/10 14:46:52 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 于 2013年03月05日 15:35, Zhang Yanfei 写道: > 于 2013年03月02日 16:35, HATAYAMA Daisuke 写道: >> Code around /proc/vmcore currently assumes program header table is >> next to ELF header. But future change can break the assumption on >> kexec-tools and the 1st kernel. To avoid worst case, now refer to >> e_phoff member that indicates position of program header table in >> file-offset. > > Reviewed-by: Zhang Yanfei > >> >> Signed-off-by: HATAYAMA Daisuke >> --- >> >> fs/proc/vmcore.c | 40 ++++++++++++++++++++-------------------- >> 1 files changed, 20 insertions(+), 20 deletions(-) >> >> diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c >> index b870f74..abf4f01 100644 >> --- a/fs/proc/vmcore.c >> +++ b/fs/proc/vmcore.c >> @@ -221,8 +221,8 @@ static u64 __init get_vmcore_size_elf64(char *elfptr) >> Elf64_Phdr *phdr_ptr; >> >> ehdr_ptr = (Elf64_Ehdr *)elfptr; >> - phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); >> - size = sizeof(Elf64_Ehdr) + ((ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr)); >> + phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); >> + size = ehdr_ptr->e_phoff + ((ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr)); >> for (i = 0; i < ehdr_ptr->e_phnum; i++) { >> size += phdr_ptr->p_memsz; >> phdr_ptr++; >> @@ -238,8 +238,8 @@ static u64 __init get_vmcore_size_elf32(char *elfptr) >> Elf32_Phdr *phdr_ptr; >> >> ehdr_ptr = (Elf32_Ehdr *)elfptr; >> - phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); >> - size = sizeof(Elf32_Ehdr) + ((ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr)); >> + phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); >> + size = ehdr_ptr->e_phoff + ((ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr)); >> for (i = 0; i < ehdr_ptr->e_phnum; i++) { >> size += phdr_ptr->p_memsz; >> phdr_ptr++; >> @@ -259,7 +259,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> u64 phdr_sz = 0, note_off; >> >> ehdr_ptr = (Elf64_Ehdr *)elfptr; >> - phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); >> + phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); >> for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { >> int j; >> void *notes_section; >> @@ -305,7 +305,7 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> /* Prepare merged PT_NOTE program header. */ >> phdr.p_type = PT_NOTE; >> phdr.p_flags = 0; >> - note_off = sizeof(Elf64_Ehdr) + >> + note_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf64_Phdr); >> phdr.p_offset = note_off; >> phdr.p_vaddr = phdr.p_paddr = 0; >> @@ -313,14 +313,14 @@ static int __init merge_note_headers_elf64(char *elfptr, size_t *elfsz, >> phdr.p_align = 0; >> >> /* Add merged PT_NOTE program header*/ >> - tmp = elfptr + sizeof(Elf64_Ehdr); >> + tmp = elfptr + ehdr_ptr->e_phoff; >> memcpy(tmp, &phdr, sizeof(phdr)); >> tmp += sizeof(phdr); >> >> /* Remove unwanted PT_NOTE program headers. */ >> i = (nr_ptnote - 1) * sizeof(Elf64_Phdr); >> *elfsz = *elfsz - i; >> - memmove(tmp, tmp+i, ((*elfsz)-sizeof(Elf64_Ehdr)-sizeof(Elf64_Phdr))); >> + memmove(tmp, tmp+i, ((*elfsz)-ehdr_ptr->e_phoff-sizeof(Elf64_Phdr))); >> >> /* Modify e_phnum to reflect merged headers. */ >> ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; >> @@ -340,7 +340,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, >> u64 phdr_sz = 0, note_off; >> >> ehdr_ptr = (Elf32_Ehdr *)elfptr; >> - phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); >> + phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); >> for (i = 0; i < ehdr_ptr->e_phnum; i++, phdr_ptr++) { >> int j; >> void *notes_section; >> @@ -386,7 +386,7 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, >> /* Prepare merged PT_NOTE program header. */ >> phdr.p_type = PT_NOTE; >> phdr.p_flags = 0; >> - note_off = sizeof(Elf32_Ehdr) + >> + note_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum - nr_ptnote +1) * sizeof(Elf32_Phdr); >> phdr.p_offset = note_off; >> phdr.p_vaddr = phdr.p_paddr = 0; >> @@ -394,14 +394,14 @@ static int __init merge_note_headers_elf32(char *elfptr, size_t *elfsz, >> phdr.p_align = 0; >> >> /* Add merged PT_NOTE program header*/ >> - tmp = elfptr + sizeof(Elf32_Ehdr); >> + tmp = elfptr + ehdr_ptr->e_phoff; >> memcpy(tmp, &phdr, sizeof(phdr)); >> tmp += sizeof(phdr); >> >> /* Remove unwanted PT_NOTE program headers. */ >> i = (nr_ptnote - 1) * sizeof(Elf32_Phdr); >> *elfsz = *elfsz - i; >> - memmove(tmp, tmp+i, ((*elfsz)-sizeof(Elf32_Ehdr)-sizeof(Elf32_Phdr))); >> + memmove(tmp, tmp+i, ((*elfsz)-ehdr_ptr->e_phoff-sizeof(Elf32_Phdr))); >> >> /* Modify e_phnum to reflect merged headers. */ >> ehdr_ptr->e_phnum = ehdr_ptr->e_phnum - nr_ptnote + 1; >> @@ -422,10 +422,10 @@ static int __init process_ptload_program_headers_elf64(char *elfptr, >> struct vmcore *new; >> >> ehdr_ptr = (Elf64_Ehdr *)elfptr; >> - phdr_ptr = (Elf64_Phdr*)(elfptr + sizeof(Elf64_Ehdr)); /* PT_NOTE hdr */ >> + phdr_ptr = (Elf64_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ >> >> /* First program header is PT_NOTE header. */ >> - vmcore_off = sizeof(Elf64_Ehdr) + >> + vmcore_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr) + >> phdr_ptr->p_memsz; /* Note sections */ >> >> @@ -459,10 +459,10 @@ static int __init process_ptload_program_headers_elf32(char *elfptr, >> struct vmcore *new; >> >> ehdr_ptr = (Elf32_Ehdr *)elfptr; >> - phdr_ptr = (Elf32_Phdr*)(elfptr + sizeof(Elf32_Ehdr)); /* PT_NOTE hdr */ >> + phdr_ptr = (Elf32_Phdr*)(elfptr + ehdr_ptr->e_phoff); /* PT_NOTE hdr */ >> >> /* First program header is PT_NOTE header. */ >> - vmcore_off = sizeof(Elf32_Ehdr) + >> + vmcore_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr) + >> phdr_ptr->p_memsz; /* Note sections */ >> >> @@ -496,7 +496,7 @@ static void __init set_vmcore_list_offsets_elf64(char *elfptr, >> ehdr_ptr = (Elf64_Ehdr *)elfptr; >> >> /* Skip Elf header and program headers. */ >> - vmcore_off = sizeof(Elf64_Ehdr) + >> + vmcore_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum) * sizeof(Elf64_Phdr); >> >> list_for_each_entry(m, vc_list, list) { >> @@ -516,7 +516,7 @@ static void __init set_vmcore_list_offsets_elf32(char *elfptr, >> ehdr_ptr = (Elf32_Ehdr *)elfptr; >> >> /* Skip Elf header and program headers. */ >> - vmcore_off = sizeof(Elf32_Ehdr) + >> + vmcore_off = ehdr_ptr->e_phoff + >> (ehdr_ptr->e_phnum) * sizeof(Elf32_Phdr); >> >> list_for_each_entry(m, vc_list, list) { >> @@ -553,7 +553,7 @@ static int __init parse_crash_elf64_headers(void) >> } >> >> /* Read in all elf headers. */ >> - elfcorebuf_sz = sizeof(Elf64_Ehdr) + ehdr.e_phnum * sizeof(Elf64_Phdr); >> + elfcorebuf_sz = ehdr.e_phoff + ehdr.e_phnum * sizeof(Elf64_Phdr); One minor suggestion. Previously, when the code assumes program headers are following immediately the ELF header, it uses elfcorebuf_sz = sizeof(Elf64_Ehdr) + ehdr.e_phnum * sizeof(Elf64_Phdr); to calculate the size of ELF header and ELF program headers This patch avoids the assumption, and uses ehdr.e_phoff to get the program headers' address. But it will read unrelated contents into elfcorebuf if program headers are not following immediately the ELF header. So could the code be: elfcorebuf_sz = sizeof(Elf64_Ehdr) + ehdr.e_phnum * sizeof(Elf64_Phdr); addr = elfcorehdr_addr + ehdr.e_phoff; memcpy(elfcorebuf, &ehdr, sizeof(Elf64_Ehdr)); read_from_oldmem(elfcorebuf + sizeof(Elf64_Ehdr), elfcorebuf_sz - sizeof(Elf64_Ehdr), &addr, 0); (Elf64_Ehdr *)elfcorebuf->e_phoff = sizeof(Elf64_Ehdr); >> elfcorebuf = kmalloc(elfcorebuf_sz, GFP_KERNEL); >> if (!elfcorebuf) >> return -ENOMEM; >> @@ -608,7 +608,7 @@ static int __init parse_crash_elf32_headers(void) >> } >> >> /* Read in all elf headers. */ >> - elfcorebuf_sz = sizeof(Elf32_Ehdr) + ehdr.e_phnum * sizeof(Elf32_Phdr); >> + elfcorebuf_sz = ehdr.e_phoff + ehdr.e_phnum * sizeof(Elf32_Phdr); >> elfcorebuf = kmalloc(elfcorebuf_sz, GFP_KERNEL); >> if (!elfcorebuf) >> return -ENOMEM; >> >> >> _______________________________________________ >> kexec mailing list >> kexec@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/kexec >> > > > _______________________________________________ > kexec mailing list > kexec@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/kexec