Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757236Ab1FFPk0 (ORCPT ); Mon, 6 Jun 2011 11:40:26 -0400 Received: from smtp-vbr4.xs4all.nl ([194.109.24.24]:1261 "EHLO smtp-vbr4.xs4all.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596Ab1FFPkZ (ORCPT ); Mon, 6 Jun 2011 11:40:25 -0400 Message-ID: <4DECF4E2.2010907@xs4all.nl> Date: Mon, 06 Jun 2011 17:40:18 +0200 From: Jim Bos User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110429 Thunderbird/3.1.10 MIME-Version: 1.0 To: Maarten Lankhorst CC: Matthew Garrett , Linux Kernel Mailing List , Greg KH , "H. Peter Anvin" Subject: Re: 2.6.39.1 immediately reboots/resets on EFI system References: <4CE17C4B.1070305@xs4all.nl> <20101115185848.GI2583@sunsite.ms.mff.cuni.cz> <20101115191248.GY29412@tyan-ft48-01.lab.bos.redhat.com> <20101115195115.GZ29412@tyan-ft48-01.lab.bos.redhat.com> <4CE1968D.3050706@xs4all.nl> <4DE8DC16.6030308@xs4all.nl> <20110603133351.GA25130@srcf.ucam.org> <4DE8EF13.9030609@xs4all.nl> <20110603144644.GA26782@srcf.ucam.org> <4DECEBE6.3060302@gmail.com> In-Reply-To: <4DECEBE6.3060302@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2468 Lines: 77 On 06/06/2011 05:01 PM, Maarten Lankhorst wrote: > Hi Matthew, > > 2011/6/3 Matthew Garrett : >> On Fri, Jun 03, 2011 at 04:26:27PM +0200, Jim Bos wrote: >>> On 06/03/2011 03:33 PM, Matthew Garrett wrote: >>>> ? You've got 143 boot services/code regions, which is more than I'd >>>> tested against, so I'm unsure whether we're overflowing something here. >>>> >>> >>> That's seems to be the only EFI patch in 2.6.39.1 and I effectively >>> removed by =not= applying (skipping) the parts of the 2.6.39.1 patch to >>> above 3 files. >>> So yes removing "x86, efi: Retain boot service code until after >>> switching to virtual mode" indeed fixes the problem for me. >> >> Ok, thanks. I'll look into that. Might be best to drop it from stable >> for the moment until I've made sure it works on machines with excessive >> maps. > > Looking at your patch in 2.6.39.1 > > I see: > + memblock_x86_reserve_range(start, start + size, "EFI Boot"); > > and to free it: > + free_bootmem_late(start, size); > > Maybe this is causing the pager issue on 3.0, can you test this patch? > > > efi: free memory with the correct call > > Commit 916f676f8dc introduced a call to free_bootmem_late while it > reserves memory with memblock_x64_reserve_range > Fix this call to silence the swapper BUGs: > > BUG: Bad page state in process swapper pfn:00000 > > diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c > index 0d3a4fa..d2eefaa 100644 > --- a/arch/x86/platform/efi/efi.c > +++ b/arch/x86/platform/efi/efi.c > @@ -29,7 +29,6 @@ > #include > #include > #include > -#include > #include > #include > #include > @@ -334,7 +333,7 @@ static void __init efi_free_boot_services(void) > md->type != EFI_BOOT_SERVICES_DATA) > continue; > > - free_bootmem_late(start, size); > + memblock_x86_free_memory_in_range(start, start + size); > } > } > > > -- > ~Maarten > For me that indeed gets rid of the "BUG Bad page state...", ie. all is fine on 3.0-rc1 with this patch on top. Tested-By: Jim Bos Jim. -- 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/