From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolai Stange Subject: [PATCH v3 2/2] efi: efi_mem_reserve(): don't reserve through memblock after mm_init() Date: Thu, 5 Jan 2017 13:51:30 +0100 Message-ID: <20170105125130.2815-2-nicstange@gmail.com> References: <20170105125130.2815-1-nicstange@gmail.com> Return-path: In-Reply-To: <20170105125130.2815-1-nicstange-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Ingo Molnar , Matt Fleming Cc: Thomas Gleixner , "H. Peter Anvin" , "x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" , =?UTF-8?q?Mika=20Penttil=C3=A4?= , Dan Williams , Ard Biesheuvel , Dave Young , linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Nicolai Stange List-Id: linux-efi@vger.kernel.org Before invoking the arch specific handler, efi_mem_reserve() reserves the given memory region through memblock. efi_mem_reserve() can get called after mm_init() though -- through efi_bgrt_init(), for example. After mm_init(), memblock is dead and should not be used anymore. Let efi_mem_reserve() check whether memblock is dead and not do the reservation if so. Emit a warning from the generic efi_arch mem_reserve() in this case: if the architecture doesn't provide any other means of registering the region as reserved, the operation would be a nop. Fixes: 4bc9f92e64c8 ("x86/efi-bgrt: Use efi_mem_reserve() to avoid copying image data") Signed-off-by: Nicolai Stange --- Applicable to next-20170105. No changes to v2. Boot-tested on x86_64. drivers/firmware/efi/efi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 92914801e388..158a8df2f4af 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -403,7 +403,10 @@ u64 __init efi_mem_desc_end(efi_memory_desc_t *md) return end; } -void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) {} +void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) +{ + WARN(slab_is_available(), "efi_mem_reserve() has no effect"); +} /** * efi_mem_reserve - Reserve an EFI memory region @@ -419,7 +422,7 @@ void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) {} */ void __init efi_mem_reserve(phys_addr_t addr, u64 size) { - if (!memblock_is_region_reserved(addr, size)) + if (!slab_is_available() && !memblock_is_region_reserved(addr, size)) memblock_reserve(addr, size); /* -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161478AbdAEMwU (ORCPT ); Thu, 5 Jan 2017 07:52:20 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:34761 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032199AbdAEMwF (ORCPT ); Thu, 5 Jan 2017 07:52:05 -0500 From: Nicolai Stange To: Ingo Molnar , Matt Fleming Cc: Thomas Gleixner , "H. Peter Anvin" , "x86@kernel.org" , =?UTF-8?q?Mika=20Penttil=C3=A4?= , Dan Williams , Ard Biesheuvel , Dave Young , linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolai Stange Subject: [PATCH v3 2/2] efi: efi_mem_reserve(): don't reserve through memblock after mm_init() Date: Thu, 5 Jan 2017 13:51:30 +0100 Message-Id: <20170105125130.2815-2-nicstange@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170105125130.2815-1-nicstange@gmail.com> References: <20170105125130.2815-1-nicstange@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before invoking the arch specific handler, efi_mem_reserve() reserves the given memory region through memblock. efi_mem_reserve() can get called after mm_init() though -- through efi_bgrt_init(), for example. After mm_init(), memblock is dead and should not be used anymore. Let efi_mem_reserve() check whether memblock is dead and not do the reservation if so. Emit a warning from the generic efi_arch mem_reserve() in this case: if the architecture doesn't provide any other means of registering the region as reserved, the operation would be a nop. Fixes: 4bc9f92e64c8 ("x86/efi-bgrt: Use efi_mem_reserve() to avoid copying image data") Signed-off-by: Nicolai Stange --- Applicable to next-20170105. No changes to v2. Boot-tested on x86_64. drivers/firmware/efi/efi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index 92914801e388..158a8df2f4af 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -403,7 +403,10 @@ u64 __init efi_mem_desc_end(efi_memory_desc_t *md) return end; } -void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) {} +void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) +{ + WARN(slab_is_available(), "efi_mem_reserve() has no effect"); +} /** * efi_mem_reserve - Reserve an EFI memory region @@ -419,7 +422,7 @@ void __init __weak efi_arch_mem_reserve(phys_addr_t addr, u64 size) {} */ void __init efi_mem_reserve(phys_addr_t addr, u64 size) { - if (!memblock_is_region_reserved(addr, size)) + if (!slab_is_available() && !memblock_is_region_reserved(addr, size)) memblock_reserve(addr, size); /* -- 2.11.0