Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740AbaFEN1j (ORCPT ); Thu, 5 Jun 2014 09:27:39 -0400 Received: from mail-wi0-f193.google.com ([209.85.212.193]:35997 "EHLO mail-wi0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750926AbaFEN1i (ORCPT ); Thu, 5 Jun 2014 09:27:38 -0400 From: Matt Fleming To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alan Cox , Matt Fleming , Matthew Garrett , Dave Hansen , Borislav Petkov Subject: [PATCH] x86/efi: Only pass mapped RAM regions to free_bootmem_late() Date: Thu, 5 Jun 2014 14:27:34 +0100 Message-Id: <1401974854-7716-1-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.9.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matt Fleming free_bootmem_late() expects to only be passed RAM regions that the kernel can access, and that have a corresponding 'struct page'. It's possible for regions in the EFI memory map to reside in address ranges for which pfn_to_page() doesn't work, for instance when running on an i386 system with CONFIG_HIGHMEM=n. This is in fact the case for one of Alan's machines where some of the EFI boot services pages live in highmem, and running a kernel without CONFIG_HIGHMEM enabled results in the following oops, BUG: unable to handle kernel paging request at f7f1f080 IP: [] __free_pages_bootmem+0x5a/0xb8 *pdpt = 0000000001887001 *pde = 0000000001984067 *pte = 000000000 0000000 Oops: 0002 [#1] SMP [...] Call Trace: [] free_bootmem_late+0x2d/0x3d [] efi_free_boot_services+0x48/0x5b [] start_kernel+0x3ad/0x3cf [] ? set_init_arg+0x49/0x49 [] i386_start_kernel+0x12e/0x131 Reported-by: Alan Cox Cc: Matthew Garrett Cc: Dave Hansen Cc: Borislav Petkov Signed-off-by: Matt Fleming --- Alan, could you double check that this patch also fixes the oops on your CONFIG_HIGHMEM=n machine? arch/x86/platform/efi/efi.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 3781dd39e8bd..893d183ee98f 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -451,6 +451,9 @@ void __init efi_free_boot_services(void) if (!size) continue; + if (!e820_all_mapped(start, start + size, E820_RAM)) + continue; + free_bootmem_late(start, size); } -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/