Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp2945328img; Mon, 25 Mar 2019 00:00:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwoeVSiKI3xpBwIlqKmNpjtkJpAZCznadaNFt1hYGB+zCPEURtOJSvnJXzSoKyPTm0+xLbN X-Received: by 2002:a17:902:2bab:: with SMTP id l40mr23573005plb.273.1553497253336; Mon, 25 Mar 2019 00:00:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553497253; cv=none; d=google.com; s=arc-20160816; b=oaiaBzA+ovbNCJnHpNRd0bvPIA9nSRkR8SV7QkiSo97QInUcbXoBAis30SN3aUZEJL DkYOEox/eluXt4szQu6t4R+iA4Ea5w9tDO/+/5neCfmy+GuQQpy87vcy1hchFyXgVj+d +VHytqPRIu4X745g6l3Dq6D171VsLC59p4PsIXaKk7zFf2w7j+YQstuMP4mHR/KSRAOK O9Xk/L6B0aCotgoJXBOaCkUjlZBptloIVR3AalAmzj3ANXHOFO204BswqCcFQgS5m4gq lwpytBRuK3p6D6oKwwdvI8GOkl47gpJXcYGPnR5Xn/MAKWyMSBpr6PogO7AppDITLlBr g0Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=2ANIRa247Rz2D63iY2WuPE7PY/kCtkodjuz30QJaguI=; b=dy9a15TzktaBRSj20YLcB/aEjlvnetoH6pG7R+ijvYNXY2hGCWQnzKt7fWq8Q8QTIP e/oA0z1bDdutRSk5c5KSOIQeKivmPZuvPP8d8CcjX6tyFHpvgMsR9qSSGj5Rrt3fVQ5a gqpB9QTaRQvrp1ChZLni+7xUt5DnVh8vmubxGfbhtLA3AWXPEXdg17PajMb8gl/L6Edd HsJUtghr902WPO97GZXtOR2KjL5k86I+h36c2GH+aryhxQ/jUVQrGXguuqEYAtJ9jec+ /pw2M8YxSsawo62Whp8tCWrYTehy0DbcLuwk9LnZYovs5Wt5Xfph5dmeUnK9gaouCKPm UGbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f9si6265505pgq.347.2019.03.25.00.00.38; Mon, 25 Mar 2019 00:00:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729796AbfCYG73 (ORCPT + 99 others); Mon, 25 Mar 2019 02:59:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40292 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729230AbfCYG73 (ORCPT ); Mon, 25 Mar 2019 02:59:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 024FCC049E1F; Mon, 25 Mar 2019 06:59:29 +0000 (UTC) Received: from dhcp-128-65.nay.redhat.com (ovpn-12-109.pek2.redhat.com [10.72.12.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E83015D72E; Mon, 25 Mar 2019 06:59:25 +0000 (UTC) Date: Mon, 25 Mar 2019 14:59:21 +0800 From: Dave Young To: Junichi Nomura 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 Message-ID: <20190325065921.GA11096@dhcp-128-65.nay.redhat.com> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.11.3 (2019-02-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 25 Mar 2019 06:59:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/25/19 at 06:47am, Junichi Nomura wrote: > 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. Ok, thanks > > > 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. Saw Kairui's another reply, yes, kexec-tools need a patch to fill the value as well then. I would vote for a repost of your old patch with some #ifdef Thanks Dave