Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760131Ab3JPIH0 (ORCPT ); Wed, 16 Oct 2013 04:07:26 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:47446 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759974Ab3JPIHV (ORCPT ); Wed, 16 Oct 2013 04:07:21 -0400 Date: Wed, 16 Oct 2013 09:07:11 +0100 From: Matt Fleming To: Dave Young Cc: x86@kernel.org, linux-kernel@vger.kernel.org, mjg59@srcf.ucam.org, hpa@zytor.com, James.Bottomley@HansenPartnership.com, vgoyal@redhat.com, linux-efi@vger.kernel.org, Maarten Lankhorst Subject: Re: [PATCH] x86 efi: efi reverve boot service fix Message-ID: <20131016080711.GC10834@console-pimps.org> References: <20131016070301.GA26752@dhcp-16-126.nay.redhat.com> <20131016071122.GB18241@dhcp-16-126.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131016071122.GB18241@dhcp-16-126.nay.redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1456 Lines: 38 Also better include Maarten on Cc as the author of the code. On Wed, 16 Oct, at 03:11:22PM, Dave Young wrote: > typo, fix hpa's mail address.. > > On 10/16/13 at 03:03pm, Dave Young wrote: > > > > Current code check boot service region with kernel text region by: > > start+size >= __pa_symbol(_text) > > The end of the above region should be start + size - 1 instead. > > > > I see this problem in ovmf + Fedora 19 grub boot: > > text start: 1000000 md start: 800000 md size: 800000 > > > > Signed-off-by: Dave Young > > --- > > arch/x86/platform/efi/efi.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- linux-2.6.orig/arch/x86/platform/efi/efi.c > > +++ linux-2.6/arch/x86/platform/efi/efi.c > > @@ -440,7 +440,7 @@ void __init efi_reserve_boot_services(vo > > * - Not within any part of the kernel > > * - Not the bios reserved area > > */ > > - if ((start+size >= __pa_symbol(_text) > > + if ((start + size - 1 >= __pa_symbol(_text) > > && start <= __pa_symbol(_end)) || > > !e820_all_mapped(start, start+size, E820_RAM) || > > memblock_is_region_reserved(start, size)) { -- Matt Fleming, Intel Open Source Technology Center -- 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/