From patchwork Wed Apr 7 14:03:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lianbo Jiang X-Patchwork-Id: 416981 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=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS 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 E246DC433ED for ; Wed, 7 Apr 2021 14:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B25E9611C1 for ; Wed, 7 Apr 2021 14:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344334AbhDGODs (ORCPT ); Wed, 7 Apr 2021 10:03:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36804 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343988AbhDGODs (ORCPT ); Wed, 7 Apr 2021 10:03:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617804218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc; bh=EtLqygi71vRkX7XbKNPu8aGXp0sRHC0Nw5lT5tmPTew=; b=ImhjfYQ6qW5CWwQ1LqFHiEql7O9c1WLy+ob7orFit0oZYBOI2CShZIk5PiAoXGTG5y1PqL 2HU/zLIL3V6K5Sg8wV+Tlc5epCeE5iviDsbax3zUyVRpoQRLRGdTlJk4/hPE65w+KBeDbZ yyuttoX8HQzTWuVl5I2916PEAJvWCwA= 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-549-DdNpCKS7OUOPHLmVWQJPeg-1; Wed, 07 Apr 2021 10:03:36 -0400 X-MC-Unique: DdNpCKS7OUOPHLmVWQJPeg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97CB5801F98; Wed, 7 Apr 2021 14:03:34 +0000 (UTC) Received: from unused.redhat.com (ovpn-12-179.pek2.redhat.com [10.72.12.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABE99501DD; Wed, 7 Apr 2021 14:03:18 +0000 (UTC) From: Lianbo Jiang To: linux-kernel@vger.kernel.org Cc: linux-efi@vger.kernel.org, platform-driver-x86@vger.kernel.org, x86@kernel.org, ardb@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dvhart@infradead.org, andy@infradead.org, hpa@zytor.com, kexec@lists.infradead.org, bhe@redhat.com, dyoung@redhat.com Subject: [PATCH] x86/efi: Do not release sub-1MB memory regions when the crashkernel option is specified Date: Wed, 7 Apr 2021 22:03:16 +0800 Message-Id: <20210407140316.30210-1-lijiang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Some sub-1MB memory regions may be reserved by EFI boot services, and the memory regions will be released later in the efi_free_boot_services(). Currently, always reserve all sub-1MB memory regions when the crashkernel option is specified, but unfortunately EFI boot services may have already reserved some sub-1MB memory regions before the crash_reserve_low_1M() is called, which makes that the crash_reserve_low_1M() only own the remaining sub-1MB memory regions, not all sub-1MB memory regions, because, subsequently EFI boot services will free its own sub-1MB memory regions. Eventually, DMA will be able to allocate memory from the sub-1MB area and cause the following error: crash> kmem -s |grep invalid kmem: dma-kmalloc-512: slab: ffffd52c40001900 invalid freepointer: ffff9403c0067300 kmem: dma-kmalloc-512: slab: ffffd52c40001900 invalid freepointer: ffff9403c0067300 crash> vtop ffff9403c0067300 VIRTUAL PHYSICAL ffff9403c0067300 67300 --->The physical address falls into this range [0x0000000000063000-0x000000000008efff] kernel debugging log: ... [ 0.008927] memblock_reserve: [0x0000000000010000-0x0000000000013fff] efi_reserve_boot_services+0x85/0xd0 [ 0.008930] memblock_reserve: [0x0000000000063000-0x000000000008efff] efi_reserve_boot_services+0x85/0xd0 ... [ 0.009425] memblock_reserve: [0x0000000000000000-0x00000000000fffff] crash_reserve_low_1M+0x2c/0x49 ... [ 0.010586] Zone ranges: [ 0.010587] DMA [mem 0x0000000000001000-0x0000000000ffffff] [ 0.010589] DMA32 [mem 0x0000000001000000-0x00000000ffffffff] [ 0.010591] Normal [mem 0x0000000100000000-0x0000000c7fffffff] [ 0.010593] Device empty ... [ 8.814894] __memblock_free_late: [0x0000000000063000-0x000000000008efff] efi_free_boot_services+0x14b/0x23b [ 8.815793] __memblock_free_late: [0x0000000000010000-0x0000000000013fff] efi_free_boot_services+0x14b/0x23b Do not release sub-1MB memory regions even though they are reserved by EFI boot services, so that always reserve all sub-1MB memory regions when the crashkernel option is specified. Signed-off-by: Lianbo Jiang --- arch/x86/platform/efi/quirks.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 67d93a243c35..637f932c4fd4 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -18,6 +18,7 @@ #include #include #include +#include #define EFI_MIN_RESERVE 5120 @@ -303,6 +304,19 @@ void __init efi_arch_mem_reserve(phys_addr_t addr, u64 size) */ static __init bool can_free_region(u64 start, u64 size) { + /* + * Some sub-1MB memory regions may be reserved by EFI boot + * services, and these memory regions will be released later + * in the efi_free_boot_services(). + * + * Do not release sub-1MB memory regions even though they are + * reserved by EFI boot services, because, always reserve all + * sub-1MB memory when the crashkernel option is specified. + */ + if (cmdline_find_option(boot_command_line, "crashkernel", NULL, 0) > 0 + && (start + size < (1<<20))) + return false; + if (start + size > __pa_symbol(_text) && start <= __pa_symbol(_end)) return false;