[edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

KrishnadasX Veliyathuparambil Prakashan posted 1 patch 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/ddae3ea5f61290774cdb19280200ae529fbc437c.1592534360.git.krishnadasx.veliyathuparambil.prakashan@intel.com
.../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)

[edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by KrishnadasX Veliyathuparambil Prakashan 3 weeks ago
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818

For better memory management, re-ordered the DestroyRamDisk and
ReportStatusCode calls inside the EfiBootManagerBoot() function.

This will help to clean the unused memory before reporting the
failure status, so that OEMs can use RSC Listener to launch
custom boot option or application for recovering the failed
hard drive.

This change will help to ensure that the allocated pool of memory
for the failed boot option is freed before executing OEM's RSC
listener callback to handle every boot option failure.

Signed-off-by: KrishnadasX Veliyathuparambil Prakashan <krishnadasx.veliyathuparambil.prakashan@intel.com>
Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
Cc: "Ni, Ray" <ray.ni@intel.com>
---
 .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 540d169ec1..aff620ad52 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2,7 +2,7 @@
   Library functions which relates with booting.
 
 Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
-Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
         gBS->UnloadImage (ImageHandle);
       }
       //
-      // Report Status Code with the failure status to indicate that the failure to load boot option
-      //
-      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
-      BootOption->Status = Status;
-      //
       // Destroy the RAM disk
       //
       if (RamDiskDevicePath != NULL) {
         BmDestroyRamDisk (RamDiskDevicePath);
         FreePool (RamDiskDevicePath);
       }
+      //
+      // Report Status Code with the failure status to indicate that the failure to load boot option
+      //
+      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
+      BootOption->Status = Status;
       return;
     }
   }
@@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
   Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));
   BootOption->Status = Status;
-  if (EFI_ERROR (Status)) {
-    //
-    // Report Status Code with the failure status to indicate that boot failure
-    //
-    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
-  }
-  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
 
   //
   // Destroy the RAM disk
@@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
     FreePool (RamDiskDevicePath);
   }
 
+  if (EFI_ERROR (Status)) {
+    //
+    // Report Status Code with the failure status to indicate that boot failure
+    //
+    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
+  }
+  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
+
+
   //
   // Clear the Watchdog Timer after the image returns
   //
-- 
2.27.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#61517): https://edk2.groups.io/g/devel/message/61517
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by Liming Gao 1 week ago
Signed-off-by line is too long and exceeds 80 characters requirement. But, it is valid. 

So, I suggest to enhance PatchCheck.py and skip the check for the lines with Signed-off-by, Ack-by:, Reviewed-by:, and Tested-By:. 

Thanks
Liming
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of KrishnadasX Veliyathuparambil Prakashan
> Sent: Friday, June 19, 2020 10:40 AM
> To: devel@edk2.groups.io
> Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818
> 
> For better memory management, re-ordered the DestroyRamDisk and
> ReportStatusCode calls inside the EfiBootManagerBoot() function.
> 
> This will help to clean the unused memory before reporting the
> failure status, so that OEMs can use RSC Listener to launch
> custom boot option or application for recovering the failed
> hard drive.
> 
> This change will help to ensure that the allocated pool of memory
> for the failed boot option is freed before executing OEM's RSC
> listener callback to handle every boot option failure.
> 
> Signed-off-by: KrishnadasX Veliyathuparambil Prakashan <krishnadasx.veliyathuparambil.prakashan@intel.com>
> Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
> Cc: "Ni, Ray" <ray.ni@intel.com>
> ---
>  .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> index 540d169ec1..aff620ad52 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> @@ -2,7 +2,7 @@
>    Library functions which relates with booting.
> 
> 
> 
>  Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
> 
> -Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
> 
>  (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
> 
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
> @@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
>          gBS->UnloadImage (ImageHandle);
> 
>        }
> 
>        //
> 
> -      // Report Status Code with the failure status to indicate that the failure to load boot option
> 
> -      //
> 
> -      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> 
> -      BootOption->Status = Status;
> 
> -      //
> 
>        // Destroy the RAM disk
> 
>        //
> 
>        if (RamDiskDevicePath != NULL) {
> 
>          BmDestroyRamDisk (RamDiskDevicePath);
> 
>          FreePool (RamDiskDevicePath);
> 
>        }
> 
> +      //
> 
> +      // Report Status Code with the failure status to indicate that the failure to load boot option
> 
> +      //
> 
> +      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> 
> +      BootOption->Status = Status;
> 
>        return;
> 
>      }
> 
>    }
> 
> @@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
>    Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);
> 
>    DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));
> 
>    BootOption->Status = Status;
> 
> -  if (EFI_ERROR (Status)) {
> 
> -    //
> 
> -    // Report Status Code with the failure status to indicate that boot failure
> 
> -    //
> 
> -    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> 
> -  }
> 
> -  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> 
> 
> 
>    //
> 
>    // Destroy the RAM disk
> 
> @@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
>      FreePool (RamDiskDevicePath);
> 
>    }
> 
> 
> 
> +  if (EFI_ERROR (Status)) {
> 
> +    //
> 
> +    // Report Status Code with the failure status to indicate that boot failure
> 
> +    //
> 
> +    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> 
> +  }
> 
> +  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> 
> +
> 
> +
> 
>    //
> 
>    // Clear the Watchdog Timer after the image returns
> 
>    //
> 
> --
> 2.27.0.windows.1
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> 
> View/Reply Online (#61517): https://edk2.groups.io/g/devel/message/61517
> Mute This Topic: https://groups.io/mt/74978785/1759384
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub  [liming.gao@intel.com]
> -=-=-=-=-=-=


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#62007): https://edk2.groups.io/g/devel/message/62007
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by Leif Lindholm 1 week ago
On Fri, Jul 03, 2020 at 06:02:12 +0000, Gao, Liming wrote:
> Signed-off-by line is too long and exceeds 80 characters requirement. But, it is valid. 
> 
> So, I suggest to enhance PatchCheck.py and skip the check for the lines with Signed-off-by, Ack-by:, Reviewed-by:, and Tested-By:. 

Acked-by, not Ack-by, but yes, I completely agree. Restricting the
lenght of these tag lines is not correct.
We may want to consider adding "Cc:" to the list also.

Regards,

Leif

> Thanks
> Liming
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of KrishnadasX Veliyathuparambil Prakashan
> > Sent: Friday, June 19, 2020 10:40 AM
> > To: devel@edk2.groups.io
> > Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> > Subject: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.
> > 
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818
> > 
> > For better memory management, re-ordered the DestroyRamDisk and
> > ReportStatusCode calls inside the EfiBootManagerBoot() function.
> > 
> > This will help to clean the unused memory before reporting the
> > failure status, so that OEMs can use RSC Listener to launch
> > custom boot option or application for recovering the failed
> > hard drive.
> > 
> > This change will help to ensure that the allocated pool of memory
> > for the failed boot option is freed before executing OEM's RSC
> > listener callback to handle every boot option failure.
> > 
> > Signed-off-by: KrishnadasX Veliyathuparambil Prakashan <krishnadasx.veliyathuparambil.prakashan@intel.com>
> > Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
> > Cc: "Ni, Ray" <ray.ni@intel.com>
> > ---
> >  .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
> >  1 file changed, 15 insertions(+), 13 deletions(-)
> > 
> > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > index 540d169ec1..aff620ad52 100644
> > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > @@ -2,7 +2,7 @@
> >    Library functions which relates with booting.
> > 
> > 
> > 
> >  Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
> > 
> > -Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
> > 
> > +Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
> > 
> >  (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
> > 
> >  SPDX-License-Identifier: BSD-2-Clause-Patent
> > 
> > 
> > 
> > @@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
> >          gBS->UnloadImage (ImageHandle);
> > 
> >        }
> > 
> >        //
> > 
> > -      // Report Status Code with the failure status to indicate that the failure to load boot option
> > 
> > -      //
> > 
> > -      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> > 
> > -      BootOption->Status = Status;
> > 
> > -      //
> > 
> >        // Destroy the RAM disk
> > 
> >        //
> > 
> >        if (RamDiskDevicePath != NULL) {
> > 
> >          BmDestroyRamDisk (RamDiskDevicePath);
> > 
> >          FreePool (RamDiskDevicePath);
> > 
> >        }
> > 
> > +      //
> > 
> > +      // Report Status Code with the failure status to indicate that the failure to load boot option
> > 
> > +      //
> > 
> > +      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> > 
> > +      BootOption->Status = Status;
> > 
> >        return;
> > 
> >      }
> > 
> >    }
> > 
> > @@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
> >    Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);
> > 
> >    DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));
> > 
> >    BootOption->Status = Status;
> > 
> > -  if (EFI_ERROR (Status)) {
> > 
> > -    //
> > 
> > -    // Report Status Code with the failure status to indicate that boot failure
> > 
> > -    //
> > 
> > -    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> > 
> > -  }
> > 
> > -  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> > 
> > 
> > 
> >    //
> > 
> >    // Destroy the RAM disk
> > 
> > @@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
> >      FreePool (RamDiskDevicePath);
> > 
> >    }
> > 
> > 
> > 
> > +  if (EFI_ERROR (Status)) {
> > 
> > +    //
> > 
> > +    // Report Status Code with the failure status to indicate that boot failure
> > 
> > +    //
> > 
> > +    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> > 
> > +  }
> > 
> > +  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> > 
> > +
> > 
> > +
> > 
> >    //
> > 
> >    // Clear the Watchdog Timer after the image returns
> > 
> >    //
> > 
> > --
> > 2.27.0.windows.1
> > 
> > 
> > -=-=-=-=-=-=
> > Groups.io Links: You receive all messages sent to this group.
> > 
> > View/Reply Online (#61517): https://edk2.groups.io/g/devel/message/61517
> > Mute This Topic: https://groups.io/mt/74978785/1759384
> > Group Owner: devel+owner@edk2.groups.io
> > Unsubscribe: https://edk2.groups.io/g/devel/unsub  [liming.gao@intel.com]
> > -=-=-=-=-=-=
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#62018): https://edk2.groups.io/g/devel/message/62018
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by Liming Gao 1 week ago
BZ to enhance PatchCheck is submitted. https://bugzilla.tianocore.org/show_bug.cgi?id=2836

Thanks
Liming
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Leif Lindholm
> Sent: Friday, July 3, 2020 6:43 PM
> To: Gao, Liming <liming.gao@intel.com>
> Cc: devel@edk2.groups.io; Veliyathuparambil Prakashan, KrishnadasX <krishnadasx.veliyathuparambil.prakashan@intel.com>; Laszlo
> Ersek <lersek@redhat.com>; afish@apple.com; Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Zhichao
> <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.
> 
> On Fri, Jul 03, 2020 at 06:02:12 +0000, Gao, Liming wrote:
> > Signed-off-by line is too long and exceeds 80 characters requirement. But, it is valid.
> >
> > So, I suggest to enhance PatchCheck.py and skip the check for the lines with Signed-off-by, Ack-by:, Reviewed-by:, and Tested-By:.
> 
> Acked-by, not Ack-by, but yes, I completely agree. Restricting the
> lenght of these tag lines is not correct.
> We may want to consider adding "Cc:" to the list also.
> 
> Regards,
> 
> Leif
> 
> > Thanks
> > Liming
> > > -----Original Message-----
> > > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of KrishnadasX Veliyathuparambil Prakashan
> > > Sent: Friday, June 19, 2020 10:40 AM
> > > To: devel@edk2.groups.io
> > > Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> > > Subject: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.
> > >
> > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818
> > >
> > > For better memory management, re-ordered the DestroyRamDisk and
> > > ReportStatusCode calls inside the EfiBootManagerBoot() function.
> > >
> > > This will help to clean the unused memory before reporting the
> > > failure status, so that OEMs can use RSC Listener to launch
> > > custom boot option or application for recovering the failed
> > > hard drive.
> > >
> > > This change will help to ensure that the allocated pool of memory
> > > for the failed boot option is freed before executing OEM's RSC
> > > listener callback to handle every boot option failure.
> > >
> > > Signed-off-by: KrishnadasX Veliyathuparambil Prakashan <krishnadasx.veliyathuparambil.prakashan@intel.com>
> > > Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
> > > Cc: "Ni, Ray" <ray.ni@intel.com>
> > > ---
> > >  .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
> > >  1 file changed, 15 insertions(+), 13 deletions(-)
> > >
> > > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > > index 540d169ec1..aff620ad52 100644
> > > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > > @@ -2,7 +2,7 @@
> > >    Library functions which relates with booting.
> > >
> > >
> > >
> > >  Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
> > >
> > > -Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
> > >
> > > +Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
> > >
> > >  (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
> > >
> > >  SPDX-License-Identifier: BSD-2-Clause-Patent
> > >
> > >
> > >
> > > @@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
> > >          gBS->UnloadImage (ImageHandle);
> > >
> > >        }
> > >
> > >        //
> > >
> > > -      // Report Status Code with the failure status to indicate that the failure to load boot option
> > >
> > > -      //
> > >
> > > -      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> > >
> > > -      BootOption->Status = Status;
> > >
> > > -      //
> > >
> > >        // Destroy the RAM disk
> > >
> > >        //
> > >
> > >        if (RamDiskDevicePath != NULL) {
> > >
> > >          BmDestroyRamDisk (RamDiskDevicePath);
> > >
> > >          FreePool (RamDiskDevicePath);
> > >
> > >        }
> > >
> > > +      //
> > >
> > > +      // Report Status Code with the failure status to indicate that the failure to load boot option
> > >
> > > +      //
> > >
> > > +      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> > >
> > > +      BootOption->Status = Status;
> > >
> > >        return;
> > >
> > >      }
> > >
> > >    }
> > >
> > > @@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
> > >    Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);
> > >
> > >    DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));
> > >
> > >    BootOption->Status = Status;
> > >
> > > -  if (EFI_ERROR (Status)) {
> > >
> > > -    //
> > >
> > > -    // Report Status Code with the failure status to indicate that boot failure
> > >
> > > -    //
> > >
> > > -    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> > >
> > > -  }
> > >
> > > -  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> > >
> > >
> > >
> > >    //
> > >
> > >    // Destroy the RAM disk
> > >
> > > @@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
> > >      FreePool (RamDiskDevicePath);
> > >
> > >    }
> > >
> > >
> > >
> > > +  if (EFI_ERROR (Status)) {
> > >
> > > +    //
> > >
> > > +    // Report Status Code with the failure status to indicate that boot failure
> > >
> > > +    //
> > >
> > > +    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
> > >
> > > +  }
> > >
> > > +  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
> > >
> > > +
> > >
> > > +
> > >
> > >    //
> > >
> > >    // Clear the Watchdog Timer after the image returns
> > >
> > >    //
> > >
> > > --
> > > 2.27.0.windows.1
> > >
> > >
> > > -=-=-=-=-=-=
> > > Groups.io Links: You receive all messages sent to this group.
> > >
> > > View/Reply Online (#61517): https://edk2.groups.io/g/devel/message/61517
> > > Mute This Topic: https://groups.io/mt/74978785/1759384
> > > Group Owner: devel+owner@edk2.groups.io
> > > Unsubscribe: https://edk2.groups.io/g/devel/unsub  [liming.gao@intel.com]
> > > -=-=-=-=-=-=
> >
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#62042): https://edk2.groups.io/g/devel/message/62042
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by Veliyathuparambil Prakashan, KrishnadasX 1 week ago
Thank you very much Liming  and Zhichao for your time to discuss this case.

Hello Liming, 

As discussed, please help to raise the BZ to enhance PatchCheck.py and kindly help to submit our Edk2 patch to Edk2 Repo.
[EDK2 Change BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2818]

Also, please give us an update on next week regarding the ETA , as per our discussion.

Thanks,
Krishnadas

> -----Original Message-----
> From: Gao, Liming <liming.gao@intel.com>
> Sent: Friday, July 3, 2020 11:32 AM
> To: devel@edk2.groups.io; Veliyathuparambil Prakashan, KrishnadasX
> <krishnadasx.veliyathuparambil.prakashan@intel.com>; leif@nuviainc.com;
> Laszlo Ersek <lersek@redhat.com>; afish@apple.com; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: RE: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure,
> Destroy RamDisk memory before RSC.
> 
> Signed-off-by line is too long and exceeds 80 characters requirement. But, it is
> valid.
> 
> So, I suggest to enhance PatchCheck.py and skip the check for the lines with
> Signed-off-by, Ack-by:, Reviewed-by:, and Tested-By:.
> 
> Thanks
> Liming
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> > KrishnadasX Veliyathuparambil Prakashan
> > Sent: Friday, June 19, 2020 10:40 AM
> > To: devel@edk2.groups.io
> > Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> > Subject: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure,
> Destroy RamDisk memory before RSC.
> >
> > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818
> >
> > For better memory management, re-ordered the DestroyRamDisk and
> > ReportStatusCode calls inside the EfiBootManagerBoot() function.
> >
> > This will help to clean the unused memory before reporting the failure
> > status, so that OEMs can use RSC Listener to launch custom boot option
> > or application for recovering the failed hard drive.
> >
> > This change will help to ensure that the allocated pool of memory for
> > the failed boot option is freed before executing OEM's RSC listener
> > callback to handle every boot option failure.
> >
> > Signed-off-by: KrishnadasX Veliyathuparambil Prakashan
> > <krishnadasx.veliyathuparambil.prakashan@intel.com>
> > Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
> > Cc: "Ni, Ray" <ray.ni@intel.com>
> > ---
> >  .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
> >  1 file changed, 15 insertions(+), 13 deletions(-)
> >
> > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > index 540d169ec1..aff620ad52 100644
> > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> > @@ -2,7 +2,7 @@
> >    Library functions which relates with booting.
> >
> >
> >
> >  Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
> >
> > -Copyright (c) 2011 - 2019, Intel Corporation. All rights
> > reserved.<BR>
> >
> > +Copyright (c) 2011 - 2020, Intel Corporation. All rights
> > +reserved.<BR>
> >
> >  (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
> >
> >  SPDX-License-Identifier: BSD-2-Clause-Patent
> >
> >
> >
> > @@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
> >          gBS->UnloadImage (ImageHandle);
> >
> >        }
> >
> >        //
> >
> > -      // Report Status Code with the failure status to indicate that the failure to
> load boot option
> >
> > -      //
> >
> > -      BmReportLoadFailure
> (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
> >
> > -      BootOption->Status = Status;
> >
> > -      //
> >
> >        // Destroy the RAM disk
> >
> >        //
> >
> >        if (RamDiskDevicePath != NULL) {
> >
> >          BmDestroyRamDisk (RamDiskDevicePath);
> >
> >          FreePool (RamDiskDevicePath);
> >
> >        }
> >
> > +      //
> >
> > +      // Report Status Code with the failure status to indicate that
> > + the failure to load boot option
> >
> > +      //
> >
> > +      BmReportLoadFailure
> (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR,
> > + Status);
> >
> > +      BootOption->Status = Status;
> >
> >        return;
> >
> >      }
> >
> >    }
> >
> > @@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
> >    Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize,
> > &BootOption->ExitData);
> >
> >    DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n",
> > Status));
> >
> >    BootOption->Status = Status;
> >
> > -  if (EFI_ERROR (Status)) {
> >
> > -    //
> >
> > -    // Report Status Code with the failure status to indicate that boot failure
> >
> > -    //
> >
> > -    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED,
> Status);
> >
> > -  }
> >
> > -  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32)
> > OptionNumber);
> >
> >
> >
> >    //
> >
> >    // Destroy the RAM disk
> >
> > @@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
> >      FreePool (RamDiskDevicePath);
> >
> >    }
> >
> >
> >
> > +  if (EFI_ERROR (Status)) {
> >
> > +    //
> >
> > +    // Report Status Code with the failure status to indicate that
> > + boot failure
> >
> > +    //
> >
> > +    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED,
> > + Status);
> >
> > +  }
> >
> > +  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32)
> > + OptionNumber);
> >
> > +
> >
> > +
> >
> >    //
> >
> >    // Clear the Watchdog Timer after the image returns
> >
> >    //
> >
> > --
> > 2.27.0.windows.1
> >
> >
> > -=-=-=-=-=-=
> > Groups.io Links: You receive all messages sent to this group.
> >
> > View/Reply Online (#61517):
> > https://edk2.groups.io/g/devel/message/61517
> > Mute This Topic: https://groups.io/mt/74978785/1759384
> > Group Owner: devel+owner@edk2.groups.io
> > Unsubscribe: https://edk2.groups.io/g/devel/unsub
> > [liming.gao@intel.com] -=-=-=-=-=-=


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#62015): https://edk2.groups.io/g/devel/message/62015
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

Posted by Wang, Sunny (HPS SW) 3 weeks ago
Looks good to me. Not sure if there was a reason to call BmDestroyRamDisk before ReportStatusCode. 
By the way, it is an interesting case that there is a custom boot option or application that needs the memory that was occupied by the RAM disk. It looks to me like the custom boot option or application would like to create the other RAM disk with allocating large memory for recovering the failed boot option. 

Reviewed-by: Sunny Wang <sunnywang@hpe.com>

-----Original Message-----
From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of KrishnadasX Veliyathuparambil Prakashan
Sent: Friday, June 19, 2020 10:40 AM
To: devel@edk2.groups.io
Cc: Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
Subject: [edk2-devel] [PATCH] MdeModulePkg: Upon BootOption failure, Destroy RamDisk memory before RSC.

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2818 

For better memory management, re-ordered the DestroyRamDisk and ReportStatusCode calls inside the EfiBootManagerBoot() function.

This will help to clean the unused memory before reporting the failure status, so that OEMs can use RSC Listener to launch custom boot option or application for recovering the failed hard drive.

This change will help to ensure that the allocated pool of memory for the failed boot option is freed before executing OEM's RSC listener callback to handle every boot option failure.

Signed-off-by: KrishnadasX Veliyathuparambil Prakashan <krishnadasx.veliyathuparambil.prakashan@intel.com>
Cc: "Gao, Zhichao" <zhichao.gao@intel.com>
Cc: "Ni, Ray" <ray.ni@intel.com>
---
 .../Library/UefiBootManagerLib/BmBoot.c       | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 540d169ec1..aff620ad52 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2,7 +2,7 @@
   Library functions which relates with booting.
 
 Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
-Copyright (c) 2011 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -1903,17 +1903,17 @@ EfiBootManagerBoot (
         gBS->UnloadImage (ImageHandle);
       }
       //
-      // Report Status Code with the failure status to indicate that the failure to load boot option
-      //
-      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
-      BootOption->Status = Status;
-      //
       // Destroy the RAM disk
       //
       if (RamDiskDevicePath != NULL) {
         BmDestroyRamDisk (RamDiskDevicePath);
         FreePool (RamDiskDevicePath);
       }
+      //
+      // Report Status Code with the failure status to indicate that the failure to load boot option
+      //
+      BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_LOAD_ERROR, Status);
+      BootOption->Status = Status;
       return;
     }
   }
@@ -1982,13 +1982,6 @@ EfiBootManagerBoot (
   Status = gBS->StartImage (ImageHandle, &BootOption->ExitDataSize, &BootOption->ExitData);
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));
   BootOption->Status = Status;
-  if (EFI_ERROR (Status)) {
-    //
-    // Report Status Code with the failure status to indicate that boot failure
-    //
-    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
-  }
-  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) OptionNumber);
 
   //
   // Destroy the RAM disk
@@ -1998,6 +1991,15 @@ EfiBootManagerBoot (
     FreePool (RamDiskDevicePath);
   }
 
+  if (EFI_ERROR (Status)) {
+    //
+    // Report Status Code with the failure status to indicate that boot failure
+    //
+    BmReportLoadFailure (EFI_SW_DXE_BS_EC_BOOT_OPTION_FAILED, Status);
+ }  PERF_END_EX (gImageHandle, "BdsAttempt", NULL, 0, (UINT32) 
+ OptionNumber);
+
+
   //
   // Clear the Watchdog Timer after the image returns
   //
--
2.27.0.windows.1





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#61554): https://edk2.groups.io/g/devel/message/61554
Mute This Topic: https://groups.io/mt/74978785/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-