[PATCH] MdeModulePkg/DxeMain: Fix BSP interrupts reenabled in ExitBootServices

[PATCH] MdeModulePkg/DxeMain: Fix BSP interrupts reenabled in ExitBootServices

[Hao Wu]

Within function CoreExitBootServices(), this commit will move the call
of:

MemoryProtectionExitBootServicesCallback();

before:

SaveAndSetDebugTimerInterrupt (FALSE);
and
gCpu->DisableInterrupt (gCpu);

The reason is that, within MemoryProtectionExitBootServicesCallback(),
APIs like RaiseTpl and RestoreTpl maybe called. An example will be:

DebugLib (using PeiDxeDebugLibReportStatusCode instance)
 |
 v
ReportStatusCodeLib (using DxeReportStatusCodeLib instance)
 |
 v
Raise/RestoreTpl

The call of Raise/RestoreTpl APIs will re-enable BSP interrupts. Hence,
this commit refine the calling sequence to ensure BSP interrupts before
leaving CoreExitBootServices().

Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 62a597edaf..07c7403462 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file
   DXE Core Main Entry Point
 
-Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -805,6 +805,8 @@ CoreExitBootServices (
     (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)
     );
 
+  MemoryProtectionExitBootServicesCallback();
+
   //
   // Disable interrupt of Debug timer.
   //
@@ -815,8 +817,6 @@ CoreExitBootServices (
   //
   gCpu->DisableInterrupt (gCpu);
 
-  MemoryProtectionExitBootServicesCallback();
-
   //
   // Clear the non-runtime values of the EFI System Table
   //
-- 
2.12.0.windows.1

Re: [PATCH] MdeModulePkg/DxeMain: Fix BSP interrupts reenabled in ExitBootServices

[Yao, Jiewen]

reviewed-by: jiewen.yao@intel.com

thank you!
Yao, Jiewen


> 在 2018年3月19日，下午3:15，Hao Wu <hao.a.wu@intel.com> 写道：
> 
> Within function CoreExitBootServices(), this commit will move the call
> of:
> 
> MemoryProtectionExitBootServicesCallback();
> 
> before:
> 
> SaveAndSetDebugTimerInterrupt (FALSE);
> and
> gCpu->DisableInterrupt (gCpu);
> 
> The reason is that, within MemoryProtectionExitBootServicesCallback(),
> APIs like RaiseTpl and RestoreTpl maybe called. An example will be:
> 
> DebugLib (using PeiDxeDebugLibReportStatusCode instance)
> |
> v
> ReportStatusCodeLib (using DxeReportStatusCodeLib instance)
> |
> v
> Raise/RestoreTpl
> 
> The call of Raise/RestoreTpl APIs will re-enable BSP interrupts. Hence,
> this commit refine the calling sequence to ensure BSP interrupts before
> leaving CoreExitBootServices().
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
> MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> index 62a597edaf..07c7403462 100644
> --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> @@ -1,7 +1,7 @@
> /** @file
>   DXE Core Main Entry Point
> 
> -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> This program and the accompanying materials
> are licensed and made available under the terms and conditions of the BSD License
> which accompanies this distribution.  The full text of the license may be found at
> @@ -805,6 +805,8 @@ CoreExitBootServices (
>     (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)
>     );
> 
> +  MemoryProtectionExitBootServicesCallback();
> +
>   //
>   // Disable interrupt of Debug timer.
>   //
> @@ -815,8 +817,6 @@ CoreExitBootServices (
>   //
>   gCpu->DisableInterrupt (gCpu);
> 
> -  MemoryProtectionExitBootServicesCallback();
> -
>   //
>   // Clear the non-runtime values of the EFI System Table
>   //
> -- 
> 2.12.0.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel

Re: [PATCH] MdeModulePkg/DxeMain: Fix BSP interrupts reenabled in ExitBootServices

[Ni, Ruiyu]

On 3/19/2018 3:15 PM, Hao Wu wrote:
> Within function CoreExitBootServices(), this commit will move the call
> of:
> 
> MemoryProtectionExitBootServicesCallback();
> 
> before:
> 
> SaveAndSetDebugTimerInterrupt (FALSE);
> and
> gCpu->DisableInterrupt (gCpu);
> 
> The reason is that, within MemoryProtectionExitBootServicesCallback(),
> APIs like RaiseTpl and RestoreTpl maybe called. An example will be:
> 
> DebugLib (using PeiDxeDebugLibReportStatusCode instance)
>   |
>   v
> ReportStatusCodeLib (using DxeReportStatusCodeLib instance)
>   |
>   v
> Raise/RestoreTpl
> 
> The call of Raise/RestoreTpl APIs will re-enable BSP interrupts. Hence,
> this commit refine the calling sequence to ensure BSP interrupts before
> leaving CoreExitBootServices().
> 
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Star Zeng <star.zeng@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Hao Wu <hao.a.wu@intel.com>
> ---
>   MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> index 62a597edaf..07c7403462 100644
> --- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> +++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
> @@ -1,7 +1,7 @@
>   /** @file
>     DXE Core Main Entry Point
>   
> -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
>   This program and the accompanying materials
>   are licensed and made available under the terms and conditions of the BSD License
>   which accompanies this distribution.  The full text of the license may be found at
> @@ -805,6 +805,8 @@ CoreExitBootServices (
>       (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)
>       );
>   
> +  MemoryProtectionExitBootServicesCallback();
> +
>     //
>     // Disable interrupt of Debug timer.
>     //
> @@ -815,8 +817,6 @@ CoreExitBootServices (
>     //
>     gCpu->DisableInterrupt (gCpu);
>   
> -  MemoryProtectionExitBootServicesCallback();
> -
>     //
>     // Clear the non-runtime values of the EFI System Table
>     //
> 
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

-- 
Thanks,
Ray