From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from tyo161.gate.nec.co.jp ([114.179.232.161]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hQmO6-00044A-UX for kexec@lists.infradead.org; Wed, 15 May 2019 05:23:36 +0000 From: Junichi Nomura Subject: Re: [PATCH v6 1/2] x86/kexec: Build identity mapping for EFI systab and ACPI tables Date: Wed, 15 May 2019 05:17:19 +0000 Message-ID: <20190515051717.GA13703@jeru.linux.bs1.fc.nec.co.jp> References: <20190424092944.30481-1-bhe@redhat.com> <20190424092944.30481-2-bhe@redhat.com> <20190429002318.GA25400@MiWiFi-R3L-srv> <20190429135536.GC2324@zn.tnic> <20190513014248.GA16774@MiWiFi-R3L-srv> <20190513070725.GA20105@zn.tnic> <20190513073254.GB16774@MiWiFi-R3L-srv> <20190513075006.GB20105@zn.tnic> <20190513080210.GC16774@MiWiFi-R3L-srv> In-Reply-To: <20190513080210.GC16774@MiWiFi-R3L-srv> Content-Language: ja-JP Content-ID: MIME-Version: 1.0 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=infradead.org@lists.infradead.org To: Baoquan He , Borislav Petkov , "kasong@redhat.com" Cc: "x86@kernel.org" , "fanc.fnst@cn.fujitsu.com" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "hpa@zytor.com" , "tglx@linutronix.de" , "dyoung@redhat.com" Hi Kairui, On 5/13/19 5:02 PM, Baoquan He wrote: > On 05/13/19 at 09:50am, Borislav Petkov wrote: >> On Mon, May 13, 2019 at 03:32:54PM +0800, Baoquan He wrote: >> So we're going to try it again this cycle and if there's no fallout, it >> will go upstream. If not, it will have to be fixed. The usual thing. >> >> And I don't care if Kairui's patch fixes this one problem - judging by >> the fragility of this whole thing, it should be hammered on one more >> cycle on as many boxes as possible to make sure there's no other SNAFUs. >> >> So go test it on more machines instead. I've pushed it here: >> >> https://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git/log/?h=next-merge-window > > Pingfan has got a machine to reproduce the kexec breakage issue, and > applying these two patches fix it. He planned to paste the test result. > I will ask him to try this branch if he has time, or I can get his > machine to test. > > Junichi, also have a try on Boris's branch in NEC's test environment? while the patch set works on most of the machines I'm testing around, I found kexec(1) fails to load kernel on a few machines if this patch is applied. Those machines don't have IORES_DESC_ACPI_TABLES region and have ACPI tables in IORES_DESC_ACPI_NV_STORAGE region instead. So I think map_acpi_tables() should try to map both regions. I tried following change in addition and it worked. -- Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd. diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 3c77bdf..3837c4a 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -56,12 +56,22 @@ static int mem_region_callback(struct resource *res, void *arg) { unsigned long flags = IORESOURCE_MEM | IORESOURCE_BUSY; struct init_pgtable_data data; + int ret; data.info = info; data.level4p = level4p; flags = IORESOURCE_MEM | IORESOURCE_BUSY; - return walk_iomem_res_desc(IORES_DESC_ACPI_TABLES, flags, 0, -1, - &data, mem_region_callback); + ret = walk_iomem_res_desc(IORES_DESC_ACPI_TABLES, flags, 0, -1, + &data, mem_region_callback); + if (ret && ret != -EINVAL) + return ret; + + ret = walk_iomem_res_desc(IORES_DESC_ACPI_NV_STORAGE, flags, 0, -1, + &data, mem_region_callback); + if (ret && ret != -EINVAL) + return ret; + + return 0; } #else static int map_acpi_tables(struct x86_mapping_info *info, pgd_t *level4p) { return 0; } _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec