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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 AD1A4C43381 for ; Mon, 25 Mar 2019 06:48:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71969213F2 for ; Mon, 25 Mar 2019 06:48:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729778AbfCYGsa convert rfc822-to-8bit (ORCPT ); Mon, 25 Mar 2019 02:48:30 -0400 Received: from tyo161.gate.nec.co.jp ([114.179.232.161]:44181 "EHLO tyo161.gate.nec.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729373AbfCYGs3 (ORCPT ); Mon, 25 Mar 2019 02:48:29 -0400 Received: from mailgate01.nec.co.jp ([114.179.233.122]) by tyo161.gate.nec.co.jp (8.15.1/8.15.1) with ESMTPS id x2P6lbm1014545 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 25 Mar 2019 15:47:37 +0900 Received: from mailsv02.nec.co.jp (mailgate-v.nec.co.jp [10.204.236.94]) by mailgate01.nec.co.jp (8.15.1/8.15.1) with ESMTP id x2P6lbhg010691; Mon, 25 Mar 2019 15:47:37 +0900 Received: from mail01b.kamome.nec.co.jp (mail01b.kamome.nec.co.jp [10.25.43.2]) by mailsv02.nec.co.jp (8.15.1/8.15.1) with ESMTP id x2P6j38q020969; Mon, 25 Mar 2019 15:47:37 +0900 Received: from bpxc99gp.gisp.nec.co.jp ([10.38.151.138] [10.38.151.138]) by mail02.kamome.nec.co.jp with ESMTP id BT-MMP-3639919; Mon, 25 Mar 2019 15:47:17 +0900 Received: from BPXM12GP.gisp.nec.co.jp ([10.38.151.204]) by BPXC10GP.gisp.nec.co.jp ([10.38.151.138]) with mapi id 14.03.0319.002; Mon, 25 Mar 2019 15:47:16 +0900 From: Junichi Nomura To: Dave Young CC: "fanc.fnst@cn.fujitsu.com" , "x86@kernel.org" , "kexec@lists.infradead.org" , "linux-kernel@vger.kernel.org" , "Borislav Petkov" , "bp@suse.de" Subject: Re: [PATCH] x86/boot: Use EFI setup data if provided Thread-Topic: [PATCH] x86/boot: Use EFI setup data if provided Thread-Index: AQHU4J7q4uHsPFz2IEST45iCmNXrz6YXLkgAgAO8tgCAAF1DAIAABQmAgAAHwoA= Date: Mon, 25 Mar 2019 06:47:16 +0000 Message-ID: References: <20190322110342.GA16202@jeru.linux.bs1.fc.nec.co.jp> <20190322152328.GD12472@zn.tnic> <20190325002740.GA6637@jeru.linux.bs1.fc.nec.co.jp> <20190325060128.GB9385@dhcp-128-65.nay.redhat.com> <20190325061929.GC9385@dhcp-128-65.nay.redhat.com> In-Reply-To: <20190325061929.GC9385@dhcp-128-65.nay.redhat.com> Accept-Language: en-US, ja-JP Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.34.125.85] Content-Type: text/plain; charset="iso-2022-jp" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-TM-AS-MML: disable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/25/19 3:19 PM, Dave Young wrote: > On 03/25/19 at 02:01pm, Dave Young wrote: >> On 03/25/19 at 12:27am, Junichi Nomura wrote: >>> On Fri, Mar 22, 2019 at 04:23:28PM +0100, Borislav Petkov wrote: >>>> On Fri, Mar 22, 2019 at 11:03:43AM +0000, Junichi Nomura wrote: >>>>> Commit 3a63f70bf4c3a ("x86/boot: Early parse RSDP and save it in >>>>> boot_params") broke kexec boot on EFI systems. efi_get_rsdp_addr() >>>>> in the early parsing code tries to search RSDP from EFI table but >>>>> whose address is virtual. >>>>> >>>>> Since kexec(1) provides physical address of config_table via boot_params, >>>>> efi_get_rsdp_addr() should look for setup_data in the same way as >>>>> efi_systab_init() in arch/x86/platform/efi/efi.c does. >>>> >>>> If the kexec kernel should continue to use efi_systab_init() then you >>>> should make efi_get_rsdp_addr() exit early in the kexec-ed kernel. >>> >>> I'm not sure which way kexec devel is going. Added kexec list. >>> Here is the version that exits early in efi_get_rsdp_addr(). >>> >>> [PATCH] x86/boot: Don't try to search RSDP from EFI when kexec-booted >>> >>> Commit 3a63f70bf4c3a ("x86/boot: Early parse RSDP and save it in >>> boot_params") broke kexec boot on EFI systems. efi_get_rsdp_addr() >>> in the early parsing code tries to search RSDP from EFI table but >>> whose address is virtual. >>> >>> Normally kexec(1) provides physical address of config_table via boot_params >>> and EFI code uses that during initialization. >>> For the early boot code, we just exit efi_get_rsdp_addr() early if the kernel >>> is booted by kexec. >>> >>> Fixes: 3a63f70bf4c3a ("x86/boot: Early parse RSDP and save it in boot_params") >>> Signed-off-by: Jun'ichi Nomura >>> Cc: Chao Fan >>> Cc: Borislav Petkov >>> >>> diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c >>> index 0ef4ad5..1cefc43 100644 >>> --- a/arch/x86/boot/compressed/acpi.c >>> +++ b/arch/x86/boot/compressed/acpi.c >>> @@ -44,6 +44,24 @@ static acpi_physical_address get_acpi_rsdp(void) >>> return addr; >>> } >>> >>> +static bool is_kexec_booted(void) >>> +{ >>> + struct setup_data *data; >>> + >>> + /* >>> + * kexec-tools provides EFI setup data so that kexec-ed kernel >>> + * can find proper tables. >>> + */ >>> + data = (struct setup_data *) boot_params->hdr.setup_data; >>> + while (data) { >>> + if (data->type == SETUP_EFI) >>> + return true; >>> + data = (struct setup_data *) data->next; >>> + } >>> + >>> + return false; >>> +} >>> + >>> /* Search EFI system tables for RSDP. */ >>> static acpi_physical_address efi_get_rsdp_addr(void) >>> { >>> @@ -57,6 +75,10 @@ static acpi_physical_address efi_get_rsdp_addr(void) >>> int size, i; >>> char *sig; >>> >>> + /* If the system is kexec-booted, poking EFI systab may not work. */ >>> + if (is_kexec_booted()) >>> + return 0; >>> + >>> ei = &boot_params->efi_info; >>> sig = (char *)&ei->efi_loader_signature; >>> >>> >>> _______________________________________________ >>> kexec mailing list >>> kexec@lists.infradead.org >>> http://lists.infradead.org/mailman/listinfo/kexec >> >> Good catch, this way looks good to me. But the function >> is_kexec_booted can be compiled when #ifdef CONFIG_EFI >> >> Otherwise: >> >> Acked-by: Dave Young >> > > Hold on, I replied too quick. One question is does the above patch > passed your test? It can workaround and skip the wrong phys addr > issue, but the acpi early parsing still fails because efi_get_rsdp_addr > return 0? The patch works for me. Early parsing fails with the 2nd patch but it boots fine. EFI initialization is done later without boot_params->acpi_rsdp_addr. I think that's how v5.0 and earlier kernels work. > If this is the case you may need go with your old patch. > > I think normally people do not see this bug, because kernel will set the > rsdp in boot_params->acpi_rsdp_addr. Maybe you are testing with I think it's only done for file-based kexec interface. > different kernel versions, eg. > > old kernel kexec to new kernel. > > And the old kernel does not set boot_params->acpi_rsdp_addr > > Is this correct? I'm testing kexec from v5.1-rc1 to v5.1-rc1, i.e. same kernel. -- Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd.