All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-02 10:18 ` Xie Yisheng
  0 siblings, 0 replies; 20+ messages in thread
From: Xie Yisheng @ 2016-09-02 10:18 UTC (permalink / raw)
  To: mingo
  Cc: guohanjun, mark.rutland, will.deacon, catalin.marinas,
	linux-kernel, linux-arm-kernel

From: Yisheng Xie <xieyisheng1@huawei.com>

There's an early memmap leak in efi_init error path, fix it.

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
 drivers/firmware/efi/arm-init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index c49d50e..5080e40 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -243,8 +243,10 @@ void __init efi_init(void)
 	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
 	      efi.memmap.desc_version);
 
-	if (uefi_init() < 0)
+	if (uefi_init() < 0) {
+		early_memunmap(efi.memmap.map, params.mmap_size);
 		return;
+	}
 
 	reserve_regions();
 	efi_memattr_init();
-- 
1.7.12.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-02 10:18 ` Xie Yisheng
  0 siblings, 0 replies; 20+ messages in thread
From: Xie Yisheng @ 2016-09-02 10:18 UTC (permalink / raw)
  To: linux-arm-kernel

From: Yisheng Xie <xieyisheng1@huawei.com>

There's an early memmap leak in efi_init error path, fix it.

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
 drivers/firmware/efi/arm-init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index c49d50e..5080e40 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -243,8 +243,10 @@ void __init efi_init(void)
 	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
 	      efi.memmap.desc_version);
 
-	if (uefi_init() < 0)
+	if (uefi_init() < 0) {
+		early_memunmap(efi.memmap.map, params.mmap_size);
 		return;
+	}
 
 	reserve_regions();
 	efi_memattr_init();
-- 
1.7.12.4

^ permalink raw reply related	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-02 10:26   ` Will Deacon
  0 siblings, 0 replies; 20+ messages in thread
From: Will Deacon @ 2016-09-02 10:26 UTC (permalink / raw)
  To: Xie Yisheng
  Cc: mingo, guohanjun, mark.rutland, catalin.marinas, linux-kernel,
	linux-arm-kernel, matt, linux-efi, ard.biesheuvel

On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> From: Yisheng Xie <xieyisheng1@huawei.com>
> 
> There's an early memmap leak in efi_init error path, fix it.
> 
> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
> ---
>  drivers/firmware/efi/arm-init.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
future.

Will

> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index c49d50e..5080e40 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -243,8 +243,10 @@ void __init efi_init(void)
>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>  	      efi.memmap.desc_version);
>  
> -	if (uefi_init() < 0)
> +	if (uefi_init() < 0) {
> +		early_memunmap(efi.memmap.map, params.mmap_size);
>  		return;
> +	}
>  
>  	reserve_regions();
>  	efi_memattr_init();
> -- 
> 1.7.12.4
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-02 10:26   ` Will Deacon
  0 siblings, 0 replies; 20+ messages in thread
From: Will Deacon @ 2016-09-02 10:26 UTC (permalink / raw)
  To: Xie Yisheng
  Cc: mingo-DgEjT+Ai2ygdnm+yROfE0A, guohanjun-hv44wF8Li93QT0dZR+AlfA,
	mark.rutland-5wv7dgnIgG8, catalin.marinas-5wv7dgnIgG8,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	matt-mF/unelCI9GS6iBeEJttW/XRex20P6io,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A

On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> 
> There's an early memmap leak in efi_init error path, fix it.
> 
> Signed-off-by: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
>  drivers/firmware/efi/arm-init.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
future.

Will

> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index c49d50e..5080e40 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -243,8 +243,10 @@ void __init efi_init(void)
>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>  	      efi.memmap.desc_version);
>  
> -	if (uefi_init() < 0)
> +	if (uefi_init() < 0) {
> +		early_memunmap(efi.memmap.map, params.mmap_size);
>  		return;
> +	}
>  
>  	reserve_regions();
>  	efi_memattr_init();
> -- 
> 1.7.12.4
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-02 10:26   ` Will Deacon
  0 siblings, 0 replies; 20+ messages in thread
From: Will Deacon @ 2016-09-02 10:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> From: Yisheng Xie <xieyisheng1@huawei.com>
> 
> There's an early memmap leak in efi_init error path, fix it.
> 
> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
> ---
>  drivers/firmware/efi/arm-init.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
future.

Will

> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> index c49d50e..5080e40 100644
> --- a/drivers/firmware/efi/arm-init.c
> +++ b/drivers/firmware/efi/arm-init.c
> @@ -243,8 +243,10 @@ void __init efi_init(void)
>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>  	      efi.memmap.desc_version);
>  
> -	if (uefi_init() < 0)
> +	if (uefi_init() < 0) {
> +		early_memunmap(efi.memmap.map, params.mmap_size);
>  		return;
> +	}
>  
>  	reserve_regions();
>  	efi_memattr_init();
> -- 
> 1.7.12.4
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 11:11     ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-05 11:11 UTC (permalink / raw)
  To: Will Deacon
  Cc: mingo, guohanjun, mark.rutland, catalin.marinas, linux-kernel,
	linux-arm-kernel, matt, linux-efi, ard.biesheuvel

Hi all,
Could someone help to give some comments?
Really thanks for that.

Thanks.
Xie Yisheng

On 2016/9/2 18:26, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>
>> There's an early memmap leak in efi_init error path, fix it.
>>
>> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
>> ---
>>  drivers/firmware/efi/arm-init.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
Hi Will,
Thank you for your kind help. I will do more check about who to CC next time.

Thanks.

> Will
> 
>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>> index c49d50e..5080e40 100644
>> --- a/drivers/firmware/efi/arm-init.c
>> +++ b/drivers/firmware/efi/arm-init.c
>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>  	      efi.memmap.desc_version);
>>  
>> -	if (uefi_init() < 0)
>> +	if (uefi_init() < 0) {
>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>  		return;
>> +	}
>>  
>>  	reserve_regions();
>>  	efi_memattr_init();
>> -- 
>> 1.7.12.4
>>
> 
> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 11:11     ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-05 11:11 UTC (permalink / raw)
  To: Will Deacon
  Cc: mingo-DgEjT+Ai2ygdnm+yROfE0A, guohanjun-hv44wF8Li93QT0dZR+AlfA,
	mark.rutland-5wv7dgnIgG8, catalin.marinas-5wv7dgnIgG8,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	matt-mF/unelCI9GS6iBeEJttW/XRex20P6io,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A

Hi all,
Could someone help to give some comments?
Really thanks for that.

Thanks.
Xie Yisheng

On 2016/9/2 18:26, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>> From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
>>
>> There's an early memmap leak in efi_init error path, fix it.
>>
>> Signed-off-by: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
>> ---
>>  drivers/firmware/efi/arm-init.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
Hi Will,
Thank you for your kind help. I will do more check about who to CC next time.

Thanks.

> Will
> 
>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>> index c49d50e..5080e40 100644
>> --- a/drivers/firmware/efi/arm-init.c
>> +++ b/drivers/firmware/efi/arm-init.c
>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>  	      efi.memmap.desc_version);
>>  
>> -	if (uefi_init() < 0)
>> +	if (uefi_init() < 0) {
>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>  		return;
>> +	}
>>  
>>  	reserve_regions();
>>  	efi_memattr_init();
>> -- 
>> 1.7.12.4
>>
> 
> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 11:11     ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-05 11:11 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,
Could someone help to give some comments?
Really thanks for that.

Thanks.
Xie Yisheng

On 2016/9/2 18:26, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>
>> There's an early memmap leak in efi_init error path, fix it.
>>
>> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
>> ---
>>  drivers/firmware/efi/arm-init.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
Hi Will,
Thank you for your kind help. I will do more check about who to CC next time.

Thanks.

> Will
> 
>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>> index c49d50e..5080e40 100644
>> --- a/drivers/firmware/efi/arm-init.c
>> +++ b/drivers/firmware/efi/arm-init.c
>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>  	      efi.memmap.desc_version);
>>  
>> -	if (uefi_init() < 0)
>> +	if (uefi_init() < 0) {
>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>  		return;
>> +	}
>>  
>>  	reserve_regions();
>>  	efi_memattr_init();
>> -- 
>> 1.7.12.4
>>
> 
> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 13:57     ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-05 13:57 UTC (permalink / raw)
  To: Will Deacon
  Cc: Xie Yisheng, mingo, guohanjun, mark.rutland, catalin.marinas,
	linux-kernel, linux-arm-kernel, linux-efi, ard.biesheuvel

On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> > From: Yisheng Xie <xieyisheng1@huawei.com>
> > 
> > There's an early memmap leak in efi_init error path, fix it.
> > 
> > Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
> > ---
> >  drivers/firmware/efi/arm-init.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
> Will
> 
> > diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> > index c49d50e..5080e40 100644
> > --- a/drivers/firmware/efi/arm-init.c
> > +++ b/drivers/firmware/efi/arm-init.c
> > @@ -243,8 +243,10 @@ void __init efi_init(void)
> >  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >  	      efi.memmap.desc_version);
> >  
> > -	if (uefi_init() < 0)
> > +	if (uefi_init() < 0) {
> > +		early_memunmap(efi.memmap.map, params.mmap_size);
> >  		return;
> > +	}

This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
flag also needs clearing.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 13:57     ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-05 13:57 UTC (permalink / raw)
  To: Will Deacon
  Cc: Xie Yisheng, mingo-DgEjT+Ai2ygdnm+yROfE0A,
	guohanjun-hv44wF8Li93QT0dZR+AlfA, mark.rutland-5wv7dgnIgG8,
	catalin.marinas-5wv7dgnIgG8, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A

On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> > From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> > 
> > There's an early memmap leak in efi_init error path, fix it.
> > 
> > Signed-off-by: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> > ---
> >  drivers/firmware/efi/arm-init.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
> Will
> 
> > diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> > index c49d50e..5080e40 100644
> > --- a/drivers/firmware/efi/arm-init.c
> > +++ b/drivers/firmware/efi/arm-init.c
> > @@ -243,8 +243,10 @@ void __init efi_init(void)
> >  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >  	      efi.memmap.desc_version);
> >  
> > -	if (uefi_init() < 0)
> > +	if (uefi_init() < 0) {
> > +		early_memunmap(efi.memmap.map, params.mmap_size);
> >  		return;
> > +	}

This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
flag also needs clearing.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-05 13:57     ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-05 13:57 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> > From: Yisheng Xie <xieyisheng1@huawei.com>
> > 
> > There's an early memmap leak in efi_init error path, fix it.
> > 
> > Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
> > ---
> >  drivers/firmware/efi/arm-init.c | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
> 
> Will
> 
> > diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> > index c49d50e..5080e40 100644
> > --- a/drivers/firmware/efi/arm-init.c
> > +++ b/drivers/firmware/efi/arm-init.c
> > @@ -243,8 +243,10 @@ void __init efi_init(void)
> >  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >  	      efi.memmap.desc_version);
> >  
> > -	if (uefi_init() < 0)
> > +	if (uefi_init() < 0) {
> > +		early_memunmap(efi.memmap.map, params.mmap_size);
> >  		return;
> > +	}

This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
flag also needs clearing.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-07 11:15       ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-07 11:15 UTC (permalink / raw)
  To: Matt Fleming, Will Deacon
  Cc: mingo, guohanjun, mark.rutland, catalin.marinas, linux-kernel,
	linux-arm-kernel, linux-efi, ard.biesheuvel



On 2016/9/5 21:57, Matt Fleming wrote:
> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>>
>>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>>> index c49d50e..5080e40 100644
>>> --- a/drivers/firmware/efi/arm-init.c
>>> +++ b/drivers/firmware/efi/arm-init.c
>>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>>  	      efi.memmap.desc_version);
>>>  
>>> -	if (uefi_init() < 0)
>>> +	if (uefi_init() < 0) {
>>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>>  		return;
>>> +	}
> 
> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> flag also needs clearing.
> 
Hi Matt,
Thanks for your reply.
You mean call the function efi_unmap_memmap() like x86?

however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
EFI_MEMMAP is set in function reserve_regions(), which is called
only when uefi_init() return 0:

efi_init()
   -> reserve_regions()
       -> set_bit(EFI_MEMMAP, &efi.flags);
Thanks
Xie Yisheng.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-07 11:15       ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-07 11:15 UTC (permalink / raw)
  To: Matt Fleming, Will Deacon
  Cc: mingo-DgEjT+Ai2ygdnm+yROfE0A, guohanjun-hv44wF8Li93QT0dZR+AlfA,
	mark.rutland-5wv7dgnIgG8, catalin.marinas-5wv7dgnIgG8,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A



On 2016/9/5 21:57, Matt Fleming wrote:
> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>> From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
>>>
>>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>>> index c49d50e..5080e40 100644
>>> --- a/drivers/firmware/efi/arm-init.c
>>> +++ b/drivers/firmware/efi/arm-init.c
>>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>>  	      efi.memmap.desc_version);
>>>  
>>> -	if (uefi_init() < 0)
>>> +	if (uefi_init() < 0) {
>>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>>  		return;
>>> +	}
> 
> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> flag also needs clearing.
> 
Hi Matt,
Thanks for your reply.
You mean call the function efi_unmap_memmap() like x86?

however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
EFI_MEMMAP is set in function reserve_regions(), which is called
only when uefi_init() return 0:

efi_init()
   -> reserve_regions()
       -> set_bit(EFI_MEMMAP, &efi.flags);
Thanks
Xie Yisheng.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-07 11:15       ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-07 11:15 UTC (permalink / raw)
  To: linux-arm-kernel



On 2016/9/5 21:57, Matt Fleming wrote:
> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>>
>>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
>>> index c49d50e..5080e40 100644
>>> --- a/drivers/firmware/efi/arm-init.c
>>> +++ b/drivers/firmware/efi/arm-init.c
>>> @@ -243,8 +243,10 @@ void __init efi_init(void)
>>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
>>>  	      efi.memmap.desc_version);
>>>  
>>> -	if (uefi_init() < 0)
>>> +	if (uefi_init() < 0) {
>>> +		early_memunmap(efi.memmap.map, params.mmap_size);
>>>  		return;
>>> +	}
> 
> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> flag also needs clearing.
> 
Hi Matt,
Thanks for your reply.
You mean call the function efi_unmap_memmap() like x86?

however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
EFI_MEMMAP is set in function reserve_regions(), which is called
only when uefi_init() return 0:

efi_init()
   -> reserve_regions()
       -> set_bit(EFI_MEMMAP, &efi.flags);
Thanks
Xie Yisheng.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-13 11:18         ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-13 11:18 UTC (permalink / raw)
  To: Yisheng Xie
  Cc: Will Deacon, mingo, guohanjun, mark.rutland, catalin.marinas,
	linux-kernel, linux-arm-kernel, linux-efi, ard.biesheuvel

On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
> 
> 
> On 2016/9/5 21:57, Matt Fleming wrote:
> > On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> >> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> >>> From: Yisheng Xie <xieyisheng1@huawei.com>
> >>>
> >>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> >>> index c49d50e..5080e40 100644
> >>> --- a/drivers/firmware/efi/arm-init.c
> >>> +++ b/drivers/firmware/efi/arm-init.c
> >>> @@ -243,8 +243,10 @@ void __init efi_init(void)
> >>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >>>  	      efi.memmap.desc_version);
> >>>  
> >>> -	if (uefi_init() < 0)
> >>> +	if (uefi_init() < 0) {
> >>> +		early_memunmap(efi.memmap.map, params.mmap_size);
> >>>  		return;
> >>> +	}
> > 
> > This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> > flag also needs clearing.
> > 
> Hi Matt,
> Thanks for your reply.
> You mean call the function efi_unmap_memmap() like x86?
> 
> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
> EFI_MEMMAP is set in function reserve_regions(), which is called
> only when uefi_init() return 0:
> 
> efi_init()
>    -> reserve_regions()
>        -> set_bit(EFI_MEMMAP, &efi.flags);

This patch should be against the 'next' branch here,

  https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next

My comments were made with that branch in mind.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-13 11:18         ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-13 11:18 UTC (permalink / raw)
  To: Yisheng Xie
  Cc: Will Deacon, mingo-DgEjT+Ai2ygdnm+yROfE0A,
	guohanjun-hv44wF8Li93QT0dZR+AlfA, mark.rutland-5wv7dgnIgG8,
	catalin.marinas-5wv7dgnIgG8, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A

On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
> 
> 
> On 2016/9/5 21:57, Matt Fleming wrote:
> > On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> >> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> >>> From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> >>>
> >>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> >>> index c49d50e..5080e40 100644
> >>> --- a/drivers/firmware/efi/arm-init.c
> >>> +++ b/drivers/firmware/efi/arm-init.c
> >>> @@ -243,8 +243,10 @@ void __init efi_init(void)
> >>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >>>  	      efi.memmap.desc_version);
> >>>  
> >>> -	if (uefi_init() < 0)
> >>> +	if (uefi_init() < 0) {
> >>> +		early_memunmap(efi.memmap.map, params.mmap_size);
> >>>  		return;
> >>> +	}
> > 
> > This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> > flag also needs clearing.
> > 
> Hi Matt,
> Thanks for your reply.
> You mean call the function efi_unmap_memmap() like x86?
> 
> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
> EFI_MEMMAP is set in function reserve_regions(), which is called
> only when uefi_init() return 0:
> 
> efi_init()
>    -> reserve_regions()
>        -> set_bit(EFI_MEMMAP, &efi.flags);

This patch should be against the 'next' branch here,

  https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next

My comments were made with that branch in mind.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-13 11:18         ` Matt Fleming
  0 siblings, 0 replies; 20+ messages in thread
From: Matt Fleming @ 2016-09-13 11:18 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
> 
> 
> On 2016/9/5 21:57, Matt Fleming wrote:
> > On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> >> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> >>> From: Yisheng Xie <xieyisheng1@huawei.com>
> >>>
> >>> diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
> >>> index c49d50e..5080e40 100644
> >>> --- a/drivers/firmware/efi/arm-init.c
> >>> +++ b/drivers/firmware/efi/arm-init.c
> >>> @@ -243,8 +243,10 @@ void __init efi_init(void)
> >>>  	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
> >>>  	      efi.memmap.desc_version);
> >>>  
> >>> -	if (uefi_init() < 0)
> >>> +	if (uefi_init() < 0) {
> >>> +		early_memunmap(efi.memmap.map, params.mmap_size);
> >>>  		return;
> >>> +	}
> > 
> > This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
> > flag also needs clearing.
> > 
> Hi Matt,
> Thanks for your reply.
> You mean call the function efi_unmap_memmap() like x86?
> 
> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
> EFI_MEMMAP is set in function reserve_regions(), which is called
> only when uefi_init() return 0:
> 
> efi_init()
>    -> reserve_regions()
>        -> set_bit(EFI_MEMMAP, &efi.flags);

This patch should be against the 'next' branch here,

  https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next

My comments were made with that branch in mind.

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-19 12:29           ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-19 12:29 UTC (permalink / raw)
  To: Matt Fleming
  Cc: Will Deacon, mingo, guohanjun, mark.rutland, catalin.marinas,
	linux-kernel, linux-arm-kernel, linux-efi, ard.biesheuvel



On 2016/9/13 19:18, Matt Fleming wrote:
> On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
>>
>>
>> On 2016/9/5 21:57, Matt Fleming wrote:
>>> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>>>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>>>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>>>>
>>>
>>> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
>>> flag also needs clearing.
>>>
>> Hi Matt,
>> Thanks for your reply.
>> You mean call the function efi_unmap_memmap() like x86?
>>
>> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
>> EFI_MEMMAP is set in function reserve_regions(), which is called
>> only when uefi_init() return 0:
>>
>> efi_init()
>>    -> reserve_regions()
>>        -> set_bit(EFI_MEMMAP, &efi.flags);
> 
> This patch should be against the 'next' branch here,
> 
>   https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next
> 
> My comments were made with that branch in mind.
> 
Hi Matt,
Sorry for my misunderstanding, I will try to rebase to next branch.

Thanks.
Yisheng Xie.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* Re: [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-19 12:29           ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-19 12:29 UTC (permalink / raw)
  To: Matt Fleming
  Cc: Will Deacon, mingo-DgEjT+Ai2ygdnm+yROfE0A,
	guohanjun-hv44wF8Li93QT0dZR+AlfA, mark.rutland-5wv7dgnIgG8,
	catalin.marinas-5wv7dgnIgG8, linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	linux-efi-u79uwXL29TY76Z2rM5mHXA,
	ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A



On 2016/9/13 19:18, Matt Fleming wrote:
> On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
>>
>>
>> On 2016/9/5 21:57, Matt Fleming wrote:
>>> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>>>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>>>> From: Yisheng Xie <xieyisheng1-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
>>>>>
>>>
>>> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
>>> flag also needs clearing.
>>>
>> Hi Matt,
>> Thanks for your reply.
>> You mean call the function efi_unmap_memmap() like x86?
>>
>> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
>> EFI_MEMMAP is set in function reserve_regions(), which is called
>> only when uefi_init() return 0:
>>
>> efi_init()
>>    -> reserve_regions()
>>        -> set_bit(EFI_MEMMAP, &efi.flags);
> 
> This patch should be against the 'next' branch here,
> 
>   https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next
> 
> My comments were made with that branch in mind.
> 
Hi Matt,
Sorry for my misunderstanding, I will try to rebase to next branch.

Thanks.
Yisheng Xie.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
* [PATCH] arm64/efi: efi_init error handling fix
@ 2016-09-19 12:29           ` Yisheng Xie
  0 siblings, 0 replies; 20+ messages in thread
From: Yisheng Xie @ 2016-09-19 12:29 UTC (permalink / raw)
  To: linux-arm-kernel



On 2016/9/13 19:18, Matt Fleming wrote:
> On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote:
>>
>>
>> On 2016/9/5 21:57, Matt Fleming wrote:
>>> On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
>>>> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>>>>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>>>>
>>>
>>> This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
>>> flag also needs clearing.
>>>
>> Hi Matt,
>> Thanks for your reply.
>> You mean call the function efi_unmap_memmap() like x86?
>>
>> however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
>> EFI_MEMMAP is set in function reserve_regions(), which is called
>> only when uefi_init() return 0:
>>
>> efi_init()
>>    -> reserve_regions()
>>        -> set_bit(EFI_MEMMAP, &efi.flags);
> 
> This patch should be against the 'next' branch here,
> 
>   https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next
> 
> My comments were made with that branch in mind.
> 
Hi Matt,
Sorry for my misunderstanding, I will try to rebase to next branch.

Thanks.
Yisheng Xie.

> .
> 

^ permalink raw reply	[flat|nested] 20+ messages in thread
end of thread, other threads:[~2016-09-19 12:31 UTC | newest]

Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-02 10:18 [PATCH] arm64/efi: efi_init error handling fix Xie Yisheng
2016-09-02 10:18 ` Xie Yisheng
2016-09-02 10:26 ` Will Deacon
2016-09-02 10:26   ` Will Deacon
2016-09-02 10:26   ` Will Deacon
2016-09-05 11:11   ` Yisheng Xie
2016-09-05 11:11     ` Yisheng Xie
2016-09-05 11:11     ` Yisheng Xie
2016-09-05 13:57   ` Matt Fleming
2016-09-05 13:57     ` Matt Fleming
2016-09-05 13:57     ` Matt Fleming
2016-09-07 11:15     ` Yisheng Xie
2016-09-07 11:15       ` Yisheng Xie
2016-09-07 11:15       ` Yisheng Xie
2016-09-13 11:18       ` Matt Fleming
2016-09-13 11:18         ` Matt Fleming
2016-09-13 11:18         ` Matt Fleming
2016-09-19 12:29         ` Yisheng Xie
2016-09-19 12:29           ` Yisheng Xie
2016-09-19 12:29           ` Yisheng Xie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.