From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBB20C4CECE for ; Mon, 14 Oct 2019 10:02:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C535B207FF for ; Mon, 14 Oct 2019 10:02:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731351AbfJNKCl (ORCPT ); Mon, 14 Oct 2019 06:02:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33204 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730378AbfJNKCl (ORCPT ); Mon, 14 Oct 2019 06:02:41 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7DCCB81DEB; Mon, 14 Oct 2019 10:02:40 +0000 (UTC) Received: from localhost.localdomain (ovpn-12-16.pek2.redhat.com [10.72.12.16]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8DCF5600CD; Mon, 14 Oct 2019 10:02:26 +0000 (UTC) Subject: Re: [PATCH 3/3 v3] x86/kdump: clean up all the code related to the backup region To: Dave Young , "Eric W. Biederman" Cc: linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, x86@kernel.org, bhe@redhat.com, jgross@suse.com, dhowells@redhat.com, Thomas.Lendacky@amd.com, vgoyal@redhat.com, kexec@lists.infradead.org References: <20191012022140.19003-1-lijiang@redhat.com> <20191012022140.19003-4-lijiang@redhat.com> <87d0f22oi5.fsf@x220.int.ebiederm.org> <20191012121625.GA11587@dhcp-128-65.nay.redhat.com> From: lijiang Message-ID: Date: Mon, 14 Oct 2019 18:02:22 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20191012121625.GA11587@dhcp-128-65.nay.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 14 Oct 2019 10:02:40 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2019年10月12日 20:16, Dave Young 写道: > Hi Eric, > > On 10/12/19 at 06:26am, Eric W. Biederman wrote: >> Lianbo Jiang writes: >> >>> When the crashkernel kernel command line option is specified, the >>> low 1MiB memory will always be reserved, which makes that the memory >>> allocated later won't fall into the low 1MiB area, thereby, it's not >>> necessary to create a backup region and also no need to copy the first >>> 640k content to a backup region. >>> >>> Currently, the code related to the backup region can be safely removed, >>> so lets clean up. >>> >>> Signed-off-by: Lianbo Jiang >>> --- >> >>> diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c >>> index eb651fbde92a..cc5774fc84c0 100644 >>> --- a/arch/x86/kernel/crash.c >>> +++ b/arch/x86/kernel/crash.c >>> @@ -173,8 +173,6 @@ void native_machine_crash_shutdown(struct pt_regs *regs) >>> >>> #ifdef CONFIG_KEXEC_FILE >>> >>> -static unsigned long crash_zero_bytes; >>> - >>> static int get_nr_ram_ranges_callback(struct resource *res, void *arg) >>> { >>> unsigned int *nr_ranges = arg; >>> @@ -234,9 +232,15 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg) >>> { >>> struct crash_mem *cmem = arg; >>> >>> - cmem->ranges[cmem->nr_ranges].start = res->start; >>> - cmem->ranges[cmem->nr_ranges].end = res->end; >>> - cmem->nr_ranges++; >>> + if (res->start >= SZ_1M) { >>> + cmem->ranges[cmem->nr_ranges].start = res->start; >>> + cmem->ranges[cmem->nr_ranges].end = res->end; >>> + cmem->nr_ranges++; >>> + } else if (res->end > SZ_1M) { >>> + cmem->ranges[cmem->nr_ranges].start = SZ_1M; >>> + cmem->ranges[cmem->nr_ranges].end = res->end; >>> + cmem->nr_ranges++; >>> + } >> >> What is going on with this chunk? I can guess but this needs a clear >> comment. > > Indeed it needs some code comment, this is based on some offline > discussion. cat /proc/vmcore will give a warning because ioremap is > mapping the system ram. > > We pass the first 1M to kdump kernel in e820 as system ram so that 2nd > kernel can use the low 1M memory because for example the trampoline > code. > Thank you, Eric and Dave. I will add the code comment as below if it would be OK. @@ -234,9 +232,20 @@ static int prepare_elf64_ram_headers_callback(struct resource *res, void *arg) { struct crash_mem *cmem = arg; - cmem->ranges[cmem->nr_ranges].start = res->start; - cmem->ranges[cmem->nr_ranges].end = res->end; - cmem->nr_ranges++; + /* + * Currently, pass the low 1MiB range to kdump kernel in e820 + * as system ram so that kdump kernel can also use the low 1MiB + * memory due to the real mode trampoline code. + * And later, the low 1MiB range will be exclued from elf header, + * which will avoid remapping the 1MiB system ram when dumping + * vmcore. + */ + if (res->start >= SZ_1M) { + cmem->ranges[cmem->nr_ranges].start = res->start; + cmem->ranges[cmem->nr_ranges].end = res->end; + cmem->nr_ranges++; + } else if (res->end > SZ_1M) { + cmem->ranges[cmem->nr_ranges].start = SZ_1M; + cmem->ranges[cmem->nr_ranges].end = res->end; + cmem->nr_ranges++; + } return 0; } >> >>> >>> return 0; >>> } >> >>> @@ -356,9 +337,12 @@ int crash_setup_memmap_entries(struct kimage *image, struct boot_params *params) >>> memset(&cmd, 0, sizeof(struct crash_memmap_data)); >>> cmd.params = params; >>> >>> - /* Add first 640K segment */ >>> - ei.addr = image->arch.backup_src_start; >>> - ei.size = image->arch.backup_src_sz; >>> + /* >>> + * Add the low memory range[0x1000, SZ_1M], skip >>> + * the first zero page. >>> + */ >>> + ei.addr = PAGE_SIZE; >>> + ei.size = SZ_1M - PAGE_SIZE; >>> ei.type = E820_TYPE_RAM; >>> add_e820_entry(params, &ei); >> >> Likewise here. Why do we need a special case? >> Why the magic with PAGE_SIZE? > > Good catch, the zero page part is useless, I think no other special > reason, just assumed zero page is not usable, but it should be ok to > remove the special handling, just pass 0 - 1M is good enough. >> Thanks > Dave > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iJxBZ-0002qe-9G for kexec@lists.infradead.org; Mon, 14 Oct 2019 10:02:42 +0000 Subject: Re: [PATCH 3/3 v3] x86/kdump: clean up all the code related to the backup region References: <20191012022140.19003-1-lijiang@redhat.com> <20191012022140.19003-4-lijiang@redhat.com> <87d0f22oi5.fsf@x220.int.ebiederm.org> <20191012121625.GA11587@dhcp-128-65.nay.redhat.com> From: lijiang Message-ID: Date: Mon, 14 Oct 2019 18:02:22 +0800 MIME-Version: 1.0 In-Reply-To: <20191012121625.GA11587@dhcp-128-65.nay.redhat.com> Content-Language: en-US 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: Dave Young , "Eric W. Biederman" Cc: jgross@suse.com, Thomas.Lendacky@amd.com, bhe@redhat.com, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, dhowells@redhat.com, mingo@redhat.com, bp@alien8.de, hpa@zytor.com, tglx@linutronix.de, vgoyal@redhat.com 5ZyoIDIwMTnlubQxMOaciDEy5pelIDIwOjE2LCBEYXZlIFlvdW5nIOWGmemBkzoKPiBIaSBFcmlj LAo+IAo+IE9uIDEwLzEyLzE5IGF0IDA2OjI2YW0sIEVyaWMgVy4gQmllZGVybWFuIHdyb3RlOgo+ PiBMaWFuYm8gSmlhbmcgPGxpamlhbmdAcmVkaGF0LmNvbT4gd3JpdGVzOgo+Pgo+Pj4gV2hlbiB0 aGUgY3Jhc2hrZXJuZWwga2VybmVsIGNvbW1hbmQgbGluZSBvcHRpb24gaXMgc3BlY2lmaWVkLCB0 aGUKPj4+IGxvdyAxTWlCIG1lbW9yeSB3aWxsIGFsd2F5cyBiZSByZXNlcnZlZCwgd2hpY2ggbWFr ZXMgdGhhdCB0aGUgbWVtb3J5Cj4+PiBhbGxvY2F0ZWQgbGF0ZXIgd29uJ3QgZmFsbCBpbnRvIHRo ZSBsb3cgMU1pQiBhcmVhLCB0aGVyZWJ5LCBpdCdzIG5vdAo+Pj4gbmVjZXNzYXJ5IHRvIGNyZWF0 ZSBhIGJhY2t1cCByZWdpb24gYW5kIGFsc28gbm8gbmVlZCB0byBjb3B5IHRoZSBmaXJzdAo+Pj4g NjQwayBjb250ZW50IHRvIGEgYmFja3VwIHJlZ2lvbi4KPj4+Cj4+PiBDdXJyZW50bHksIHRoZSBj b2RlIHJlbGF0ZWQgdG8gdGhlIGJhY2t1cCByZWdpb24gY2FuIGJlIHNhZmVseSByZW1vdmVkLAo+ Pj4gc28gbGV0cyBjbGVhbiB1cC4KPj4+Cj4+PiBTaWduZWQtb2ZmLWJ5OiBMaWFuYm8gSmlhbmcg PGxpamlhbmdAcmVkaGF0LmNvbT4KPj4+IC0tLQo+Pgo+Pj4gZGlmZiAtLWdpdCBhL2FyY2gveDg2 L2tlcm5lbC9jcmFzaC5jIGIvYXJjaC94ODYva2VybmVsL2NyYXNoLmMKPj4+IGluZGV4IGViNjUx ZmJkZTkyYS4uY2M1Nzc0ZmM4NGMwIDEwMDY0NAo+Pj4gLS0tIGEvYXJjaC94ODYva2VybmVsL2Ny YXNoLmMKPj4+ICsrKyBiL2FyY2gveDg2L2tlcm5lbC9jcmFzaC5jCj4+PiBAQCAtMTczLDggKzE3 Myw2IEBAIHZvaWQgbmF0aXZlX21hY2hpbmVfY3Jhc2hfc2h1dGRvd24oc3RydWN0IHB0X3JlZ3Mg KnJlZ3MpCj4+PiAgCj4+PiAgI2lmZGVmIENPTkZJR19LRVhFQ19GSUxFCj4+PiAgCj4+PiAtc3Rh dGljIHVuc2lnbmVkIGxvbmcgY3Jhc2hfemVyb19ieXRlczsKPj4+IC0KPj4+ICBzdGF0aWMgaW50 IGdldF9ucl9yYW1fcmFuZ2VzX2NhbGxiYWNrKHN0cnVjdCByZXNvdXJjZSAqcmVzLCB2b2lkICph cmcpCj4+PiAgewo+Pj4gIAl1bnNpZ25lZCBpbnQgKm5yX3JhbmdlcyA9IGFyZzsKPj4+IEBAIC0y MzQsOSArMjMyLDE1IEBAIHN0YXRpYyBpbnQgcHJlcGFyZV9lbGY2NF9yYW1faGVhZGVyc19jYWxs YmFjayhzdHJ1Y3QgcmVzb3VyY2UgKnJlcywgdm9pZCAqYXJnKQo+Pj4gIHsKPj4+ICAJc3RydWN0 IGNyYXNoX21lbSAqY21lbSA9IGFyZzsKPj4+ICAKPj4+IC0JY21lbS0+cmFuZ2VzW2NtZW0tPm5y X3Jhbmdlc10uc3RhcnQgPSByZXMtPnN0YXJ0Owo+Pj4gLQljbWVtLT5yYW5nZXNbY21lbS0+bnJf cmFuZ2VzXS5lbmQgPSByZXMtPmVuZDsKPj4+IC0JY21lbS0+bnJfcmFuZ2VzKys7Cj4+PiArCWlm IChyZXMtPnN0YXJ0ID49IFNaXzFNKSB7Cj4+PiArCQljbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFu Z2VzXS5zdGFydCA9IHJlcy0+c3RhcnQ7Cj4+PiArCQljbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFu Z2VzXS5lbmQgPSByZXMtPmVuZDsKPj4+ICsJCWNtZW0tPm5yX3JhbmdlcysrOwo+Pj4gKwl9IGVs c2UgaWYgKHJlcy0+ZW5kID4gU1pfMU0pIHsKPj4+ICsJCWNtZW0tPnJhbmdlc1tjbWVtLT5ucl9y YW5nZXNdLnN0YXJ0ID0gU1pfMU07Cj4+PiArCQljbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFuZ2Vz XS5lbmQgPSByZXMtPmVuZDsKPj4+ICsJCWNtZW0tPm5yX3JhbmdlcysrOwo+Pj4gKwl9Cj4+Cj4+ IFdoYXQgaXMgZ29pbmcgb24gd2l0aCB0aGlzIGNodW5rPyAgSSBjYW4gZ3Vlc3MgYnV0IHRoaXMg bmVlZHMgYSBjbGVhcgo+PiBjb21tZW50Lgo+IAo+IEluZGVlZCBpdCBuZWVkcyBzb21lIGNvZGUg Y29tbWVudCwgdGhpcyBpcyBiYXNlZCBvbiBzb21lIG9mZmxpbmUKPiBkaXNjdXNzaW9uLiAgY2F0 IC9wcm9jL3ZtY29yZSB3aWxsIGdpdmUgYSB3YXJuaW5nIGJlY2F1c2UgaW9yZW1hcCBpcwo+IG1h cHBpbmcgdGhlIHN5c3RlbSByYW0uCj4gCj4gV2UgcGFzcyB0aGUgZmlyc3QgMU0gdG8ga2R1bXAg a2VybmVsIGluIGU4MjAgYXMgc3lzdGVtIHJhbSBzbyB0aGF0IDJuZAo+IGtlcm5lbCBjYW4gdXNl IHRoZSBsb3cgMU0gbWVtb3J5IGJlY2F1c2UgZm9yIGV4YW1wbGUgdGhlIHRyYW1wb2xpbmUKPiBj b2RlLgo+IApUaGFuayB5b3UsIEVyaWMgYW5kIERhdmUuIEkgd2lsbCBhZGQgdGhlIGNvZGUgY29t bWVudCBhcyBiZWxvdyBpZiBpdCB3b3VsZCBiZSBPSy4KCkBAIC0yMzQsOSArMjMyLDIwIEBAIHN0 YXRpYyBpbnQgcHJlcGFyZV9lbGY2NF9yYW1faGVhZGVyc19jYWxsYmFjayhzdHJ1Y3QgcmVzb3Vy Y2UgKnJlcywgdm9pZCAqYXJnKQogewogICAgICAgIHN0cnVjdCBjcmFzaF9tZW0gKmNtZW0gPSBh cmc7CiAKLSAgICAgICBjbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFuZ2VzXS5zdGFydCA9IHJlcy0+ c3RhcnQ7Ci0gICAgICAgY21lbS0+cmFuZ2VzW2NtZW0tPm5yX3Jhbmdlc10uZW5kID0gcmVzLT5l bmQ7Ci0gICAgICAgY21lbS0+bnJfcmFuZ2VzKys7CisgICAgICAgLyoKKyAgICAgICAgKiBDdXJy ZW50bHksIHBhc3MgdGhlIGxvdyAxTWlCIHJhbmdlIHRvIGtkdW1wIGtlcm5lbCBpbiBlODIwCisg ICAgICAgICogYXMgc3lzdGVtIHJhbSBzbyB0aGF0IGtkdW1wIGtlcm5lbCBjYW4gYWxzbyB1c2Ug dGhlIGxvdyAxTWlCCisgICAgICAgICogbWVtb3J5IGR1ZSB0byB0aGUgcmVhbCBtb2RlIHRyYW1w b2xpbmUgY29kZS4KKyAgICAgICAgKiBBbmQgbGF0ZXIsIHRoZSBsb3cgMU1pQiByYW5nZSB3aWxs IGJlIGV4Y2x1ZWQgZnJvbSBlbGYgaGVhZGVyLAorICAgICAgICAqIHdoaWNoIHdpbGwgYXZvaWQg cmVtYXBwaW5nIHRoZSAxTWlCIHN5c3RlbSByYW0gd2hlbiBkdW1waW5nCisgICAgICAgICogdm1j b3JlLgorICAgICAgICAqLworICAgICAgIGlmIChyZXMtPnN0YXJ0ID49IFNaXzFNKSB7CisgICAg ICAgICAgICAgICBjbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFuZ2VzXS5zdGFydCA9IHJlcy0+c3Rh cnQ7CisgICAgICAgICAgICAgICBjbWVtLT5yYW5nZXNbY21lbS0+bnJfcmFuZ2VzXS5lbmQgPSBy ZXMtPmVuZDsKKyAgICAgICAgICAgICAgIGNtZW0tPm5yX3JhbmdlcysrOworICAgICAgIH0gZWxz ZSBpZiAocmVzLT5lbmQgPiBTWl8xTSkgeworICAgICAgICAgICAgICAgY21lbS0+cmFuZ2VzW2Nt ZW0tPm5yX3Jhbmdlc10uc3RhcnQgPSBTWl8xTTsKKyAgICAgICAgICAgICAgIGNtZW0tPnJhbmdl c1tjbWVtLT5ucl9yYW5nZXNdLmVuZCA9IHJlcy0+ZW5kOworICAgICAgICAgICAgICAgY21lbS0+ bnJfcmFuZ2VzKys7CisgICAgICAgfQogCiAgICAgICAgcmV0dXJuIDA7CiB9Cgo+Pgo+Pj4gIAo+ Pj4gIAlyZXR1cm4gMDsKPj4+ICB9Cj4+Cj4+PiBAQCAtMzU2LDkgKzMzNywxMiBAQCBpbnQgY3Jh c2hfc2V0dXBfbWVtbWFwX2VudHJpZXMoc3RydWN0IGtpbWFnZSAqaW1hZ2UsIHN0cnVjdCBib290 X3BhcmFtcyAqcGFyYW1zKQo+Pj4gIAltZW1zZXQoJmNtZCwgMCwgc2l6ZW9mKHN0cnVjdCBjcmFz aF9tZW1tYXBfZGF0YSkpOwo+Pj4gIAljbWQucGFyYW1zID0gcGFyYW1zOwo+Pj4gIAo+Pj4gLQkv KiBBZGQgZmlyc3QgNjQwSyBzZWdtZW50ICovCj4+PiAtCWVpLmFkZHIgPSBpbWFnZS0+YXJjaC5i YWNrdXBfc3JjX3N0YXJ0Owo+Pj4gLQllaS5zaXplID0gaW1hZ2UtPmFyY2guYmFja3VwX3NyY19z ejsKPj4+ICsJLyoKPj4+ICsJICogQWRkIHRoZSBsb3cgbWVtb3J5IHJhbmdlWzB4MTAwMCwgU1pf MU1dLCBza2lwCj4+PiArCSAqIHRoZSBmaXJzdCB6ZXJvIHBhZ2UuCj4+PiArCSAqLwo+Pj4gKwll aS5hZGRyID0gUEFHRV9TSVpFOwo+Pj4gKwllaS5zaXplID0gU1pfMU0gLSBQQUdFX1NJWkU7Cj4+ PiAgCWVpLnR5cGUgPSBFODIwX1RZUEVfUkFNOwo+Pj4gIAlhZGRfZTgyMF9lbnRyeShwYXJhbXMs ICZlaSk7Cj4+Cj4+IExpa2V3aXNlIGhlcmUuICBXaHkgZG8gd2UgbmVlZCBhIHNwZWNpYWwgY2Fz ZT8KPj4gV2h5IHRoZSBtYWdpYyB3aXRoIFBBR0VfU0laRT8KPiAKPiBHb29kIGNhdGNoLCB0aGUg emVybyBwYWdlIHBhcnQgaXMgdXNlbGVzcywgSSB0aGluayBubyBvdGhlciBzcGVjaWFsCj4gcmVh c29uLCBqdXN0IGFzc3VtZWQgemVybyBwYWdlIGlzIG5vdCB1c2FibGUsIGJ1dCBpdCBzaG91bGQg YmUgb2sgdG8KPiByZW1vdmUgdGhlIHNwZWNpYWwgaGFuZGxpbmcsIGp1c3QgcGFzcyAwIC0gMU0g aXMgZ29vZCBlbm91Z2guCj4+IFRoYW5rcwo+IERhdmUKPiAKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fCmtleGVjIG1haWxpbmcgbGlzdAprZXhlY0BsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8va2V4ZWMK