public inbox for linux-efi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86 efi: efi reverve boot service fix
@ 2013-10-16  7:03 Dave Young
       [not found] ` <20131016070301.GA26752-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
  0 siblings, 1 reply; 8+ messages in thread
From: Dave Young @ 2013-10-16  7:03 UTC (permalink / raw)
  To: matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy, x86-DgEjT+Ai2ygdnm+yROfE0A,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, mjg59-1xO5oi07KQx4cg9Nei1l7Q,
	hpa-YMNOUZJC4hw, James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA


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 <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 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)) {

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
       [not found] ` <20131016070301.GA26752-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
@ 2013-10-16  7:11   ` Dave Young
       [not found]     ` <20131016071122.GB18241-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
  2013-10-16  8:35   ` [PATCH v2] " Dave Young
  1 sibling, 1 reply; 8+ messages in thread
From: Dave Young @ 2013-10-16  7:11 UTC (permalink / raw)
  To: matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy, x86-DgEjT+Ai2ygdnm+yROfE0A,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, mjg59-1xO5oi07KQx4cg9Nei1l7Q,
	hpa-YMNOUZJC4hwAvxtiuMwx3w,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA

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 <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  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)) {

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
       [not found]     ` <20131016071122.GB18241-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
@ 2013-10-16  7:29       ` H. Peter Anvin
       [not found]         ` <525E4076.2070107-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
  2013-10-16  8:07       ` Matt Fleming
  1 sibling, 1 reply; 8+ messages in thread
From: H. Peter Anvin @ 2013-10-16  7:29 UTC (permalink / raw)
  To: Dave Young, matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy,
	x86-DgEjT+Ai2ygdnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	mjg59-1xO5oi07KQx4cg9Nei1l7Q,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA

On 10/16/2013 12:11 AM, Dave Young wrote:
>>
>> --- 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)) {

It would be better to change >= to >.

	-hpa

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
       [not found]     ` <20131016071122.GB18241-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
  2013-10-16  7:29       ` H. Peter Anvin
@ 2013-10-16  8:07       ` Matt Fleming
       [not found]         ` <20131016080711.GC10834-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
  2013-10-16  8:36         ` Maarten Lankhorst
  1 sibling, 2 replies; 8+ messages in thread
From: Matt Fleming @ 2013-10-16  8:07 UTC (permalink / raw)
  To: Dave Young
  Cc: x86-DgEjT+Ai2ygdnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	mjg59-1xO5oi07KQx4cg9Nei1l7Q, hpa-YMNOUZJC4hwAvxtiuMwx3w,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA,
	Maarten Lankhorst

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 <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> > ---
> >  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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
       [not found]         ` <525E4076.2070107-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
@ 2013-10-16  8:24           ` Dave Young
  0 siblings, 0 replies; 8+ messages in thread
From: Dave Young @ 2013-10-16  8:24 UTC (permalink / raw)
  To: H. Peter Anvin
  Cc: matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy, x86-DgEjT+Ai2ygdnm+yROfE0A,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, mjg59-1xO5oi07KQx4cg9Nei1l7Q,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA

On 10/16/13 at 12:29am, H. Peter Anvin wrote:
> On 10/16/2013 12:11 AM, Dave Young wrote:
> >>
> >> --- 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)) {
> 
> It would be better to change >= to >.

Both are fine to me, will resend with '>'

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
       [not found]         ` <20131016080711.GC10834-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
@ 2013-10-16  8:28           ` Dave Young
  0 siblings, 0 replies; 8+ messages in thread
From: Dave Young @ 2013-10-16  8:28 UTC (permalink / raw)
  To: Matt Fleming
  Cc: x86-DgEjT+Ai2ygdnm+yROfE0A, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	mjg59-1xO5oi07KQx4cg9Nei1l7Q, hpa-YMNOUZJC4hwAvxtiuMwx3w,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA,
	Maarten Lankhorst

On 10/16/13 at 09:07am, Matt Fleming wrote:
> Also better include Maarten on Cc as the author of the code.

Will do in next version

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2] x86 efi: efi reverve boot service fix
       [not found] ` <20131016070301.GA26752-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
  2013-10-16  7:11   ` Dave Young
@ 2013-10-16  8:35   ` Dave Young
  1 sibling, 0 replies; 8+ messages in thread
From: Dave Young @ 2013-10-16  8:35 UTC (permalink / raw)
  To: matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy, x86-DgEjT+Ai2ygdnm+yROfE0A,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, mjg59-1xO5oi07KQx4cg9Nei1l7Q,
	hpa-YMNOUZJC4hwAvxtiuMwx3w,
	maarten.lankhorst-Z7WLFzj8eWMS+FvcfC7Uqw,
	James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk,
	vgoyal-H+wXaHxf7aLQT0dZR+AlfA, linux-efi-u79uwXL29TY76Z2rM5mHXA,
	pjones-H+wXaHxf7aLQT0dZR+AlfA

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 <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
v2: use > instead of >= per hpa

 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 > __pa_symbol(_text)
 				&& start <= __pa_symbol(_end)) ||
 			!e820_all_mapped(start, start+size, E820_RAM) ||
 			memblock_is_region_reserved(start, size)) {

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] x86 efi: efi reverve boot service fix
  2013-10-16  8:07       ` Matt Fleming
       [not found]         ` <20131016080711.GC10834-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
@ 2013-10-16  8:36         ` Maarten Lankhorst
  1 sibling, 0 replies; 8+ messages in thread
From: Maarten Lankhorst @ 2013-10-16  8:36 UTC (permalink / raw)
  To: Matt Fleming, Dave Young
  Cc: x86, linux-kernel, mjg59, hpa, James.Bottomley, vgoyal, linux-efi

op 16-10-13 10:07, Matt Fleming schreef:
> 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.

Acked-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>

>>> I see this problem in ovmf + Fedora 19 grub boot:
>>> text start: 1000000 md start: 800000 md size: 800000
>>>
>>> Signed-off-by: Dave Young <dyoung@redhat.com>
>>> ---
>>>  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)) {

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2013-10-16  8:36 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-16  7:03 [PATCH] x86 efi: efi reverve boot service fix Dave Young
     [not found] ` <20131016070301.GA26752-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-10-16  7:11   ` Dave Young
     [not found]     ` <20131016071122.GB18241-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-10-16  7:29       ` H. Peter Anvin
     [not found]         ` <525E4076.2070107-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2013-10-16  8:24           ` Dave Young
2013-10-16  8:07       ` Matt Fleming
     [not found]         ` <20131016080711.GC10834-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-10-16  8:28           ` Dave Young
2013-10-16  8:36         ` Maarten Lankhorst
2013-10-16  8:35   ` [PATCH v2] " Dave Young

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox