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=-2.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no 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 E2E25C33C9E for ; Tue, 7 Jan 2020 05:19:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B7C66207FD for ; Tue, 7 Jan 2020 05:19:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="V0JUbl3U" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726637AbgAGFTe (ORCPT ); Tue, 7 Jan 2020 00:19:34 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51157 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725601AbgAGFTe (ORCPT ); Tue, 7 Jan 2020 00:19:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578374373; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=76hRmswgUa7V5RIleDh99QRzTzR2VY/Wx1+aVBKahK0=; b=V0JUbl3UScaHvgzgQq2+3eWdB5SgSe1R+P+dhzxguOUes4o4p6GLGcYKzFd/8K68xZK9B6 6r9mTxj39npg2orNdmueYJ5FmPtOj8ocjrcnXbQlDx9TETcBS9RapIO3M+L++ZHEUZ4rGY XPUg+oOKJaI1vNoAyATttihAirjsL/4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347-h6eFQ58-N_GM4NTmD5lDvA-1; Tue, 07 Jan 2020 00:19:29 -0500 X-MC-Unique: h6eFQ58-N_GM4NTmD5lDvA-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23CB4107ACC4; Tue, 7 Jan 2020 05:19:28 +0000 (UTC) Received: from dhcp-128-65.nay.redhat.com (ovpn-12-32.pek2.redhat.com [10.72.12.32]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C68847DB53; Tue, 7 Jan 2020 05:19:23 +0000 (UTC) Date: Tue, 7 Jan 2020 13:19:19 +0800 From: Dave Young To: Dan Williams Cc: Ingo Molnar , Taku Izumi , Michael Weiser , Ard Biesheuvel , Thomas Gleixner , Ingo Molnar , linux-efi , X86 ML , Linux Kernel Mailing List , Kexec Mailing List Subject: Re: [PATCH v4 4/4] efi: Fix handling of multiple efi_fake_mem= entries Message-ID: <20200107051919.GC19080@dhcp-128-65.nay.redhat.com> References: <157835762222.1456824.290100196815539830.stgit@dwillia2-desk3.amr.corp.intel.com> <157835764298.1456824.224151767362114611.stgit@dwillia2-desk3.amr.corp.intel.com> <20200107040415.GA19309@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.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/06/20 at 08:16pm, Dan Williams wrote: > On Mon, Jan 6, 2020 at 8:04 PM Dave Young wrote: > > > > On 01/06/20 at 04:40pm, Dan Williams wrote: > > > Dave noticed that when specifying multiple efi_fake_mem= entries only > > > the last entry was successfully being reflected in the efi memory map. > > > This is due to the fact that the efi_memmap_insert() is being called > > > multiple times, but on successive invocations the insertion should be > > > applied to the last new memmap rather than the original map at > > > efi_fake_memmap() entry. > > > > > > Rework efi_fake_memmap() to install the new memory map after each > > > efi_fake_mem= entry is parsed. > > > > > > This also fixes an issue in efi_fake_memmap() that caused it to litter > > > emtpy entries into the end of the efi memory map. An empty entry causes > > > efi_memmap_insert() to attempt more memmap splits / copies than > > > efi_memmap_split_count() accounted for when sizing the new map. When > > > that happens efi_memmap_insert() may overrun its allocation, and if you > > > are lucky will spill over to an unmapped page leading to crash > > > signature like the following rather than silent corruption: > > > > > > BUG: unable to handle page fault for address: ffffffffff281000 > > > [..] > > > RIP: 0010:efi_memmap_insert+0x11d/0x191 > > > [..] > > > Call Trace: > > > ? bgrt_init+0xbe/0xbe > > > ? efi_arch_mem_reserve+0x1cb/0x228 > > > ? acpi_parse_bgrt+0xa/0xd > > > ? acpi_table_parse+0x86/0xb8 > > > ? acpi_boot_init+0x494/0x4e3 > > > ? acpi_parse_x2apic+0x87/0x87 > > > ? setup_acpi_sci+0xa2/0xa2 > > > ? setup_arch+0x8db/0x9e1 > > > ? start_kernel+0x6a/0x547 > > > ? secondary_startup_64+0xb6/0xc0 > > > > > > Commit af1648984828 "x86/efi: Update e820 with reserved EFI boot > > > services data to fix kexec breakage" is listed in Fixes: since it > > > introduces more occurrences where efi_memmap_insert() is invoked after > > > an efi_fake_mem= configuration has been parsed. Previously the side > > > effects of vestigial empty entries were benign, but with commit > > > af1648984828 that follow-on efi_memmap_insert() invocation triggers > > > efi_memmap_insert() overruns. > > > > > > Fixes: 0f96a99dab36 ("efi: Add 'efi_fake_mem' boot option") > > > Fixes: af1648984828 ("x86/efi: Update e820 with reserved EFI boot services...") > > > > A nitpick for the Fixes flags, as I replied in the thread below: > > https://lore.kernel.org/linux-efi/CAPcyv4jLxqPaB22Ao9oV31Gm=b0+Phty+Uz33Snex4QchOUb0Q@mail.gmail.com/T/#m2bb2dd00f7715c9c19ccc48efef0fcd5fdb626e7 > > > > I reproduced two other panics without the patches applied, so this issue > > is not caused by either of the commits, maybe just drop the Fixes. > > Just the "Fixes: af1648984828", right? No objection from me. I'll let > Ingo say if he needs a resend for that. > > The "Fixes: 0f96a99dab36" is valid because the original implementation > failed to handle the multiple argument case from the beginning. Agreed, thanks! Thanks Dave