Merge branch 'master' into dependabot/github_actions/github/issue-labeler-3.4dependabot/github_actions/github/issue-labeler-3.4

10 files changed, 116 insertions, 59 deletions

diff --git a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
index 0c0ca61872..4071053036 100644
--- a/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
+++ b/MdeModulePkg/Core/Dxe/Mem/HeapGuard.c
@@ -1406,34 +1406,39 @@ GuardAllFreedPages (
       TableEntry = ((UINT64 *)(UINTN)(Tables[Level]))[Indices[Level]];

       Address    = Addresses[Level];

 

-      if (Level < GUARDED_HEAP_MAP_TABLE_DEPTH - 1) {

-        Level           += 1;

-        Tables[Level]    = TableEntry;

-        Addresses[Level] = Address;

-        Indices[Level]   = 0;

-

-        continue;

+      if (TableEntry == 0) {

+        GuardPageNumber = 0;

+        GuardPage       = (UINT64)-1;

       } else {

-        BitIndex = 1;

-        while (BitIndex != 0) {

-          if ((TableEntry & BitIndex) != 0) {

-            if (GuardPage == (UINT64)-1) {

-              GuardPage = Address;

+        if (Level < GUARDED_HEAP_MAP_TABLE_DEPTH - 1) {

+          Level           += 1;

+          Tables[Level]    = TableEntry;

+          Addresses[Level] = Address;

+          Indices[Level]   = 0;

+

+          continue;

+        } else {

+          BitIndex = 1;

+          while (BitIndex != 0) {

+            if ((TableEntry & BitIndex) != 0) {

+              if (GuardPage == (UINT64)-1) {

+                GuardPage = Address;

+              }

+

+              ++GuardPageNumber;

+            } else if (GuardPageNumber > 0) {

+              GuardFreedPages (GuardPage, GuardPageNumber);

+              GuardPageNumber = 0;

+              GuardPage       = (UINT64)-1;

             }

 

-            ++GuardPageNumber;

-          } else if (GuardPageNumber > 0) {

-            GuardFreedPages (GuardPage, GuardPageNumber);

-            GuardPageNumber = 0;

-            GuardPage       = (UINT64)-1;

-          }

+            if (TableEntry == 0) {

+              break;

+            }

 

-          if (TableEntry == 0) {

-            break;

+            Address += EFI_PAGES_TO_SIZE (1);

+            BitIndex = LShiftU64 (BitIndex, 1);

           }

-

-          Address += EFI_PAGES_TO_SIZE (1);

-          BitIndex = LShiftU64 (BitIndex, 1);

         }

       }

     }

diff --git a/MdeModulePkg/Core/Dxe/Mem/Imem.h b/MdeModulePkg/Core/Dxe/Mem/Imem.h
index 2f0bf2bf63..84027d628b 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Imem.h
+++ b/MdeModulePkg/Core/Dxe/Mem/Imem.h
@@ -10,22 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define _IMEM_H_

 

 //

-// +---------------------------------------------------+

-// | 0..(EfiMaxMemoryType - 1)    - Normal memory type |

-// +---------------------------------------------------+

-// | EfiMaxMemoryType..0x6FFFFFFF - Invalid            |

-// +---------------------------------------------------+

-// | 0x70000000..0x7FFFFFFF       - OEM reserved       |

-// +---------------------------------------------------+

-// | 0x80000000..0xFFFFFFFF       - OS reserved        |

-// +---------------------------------------------------+

-//

-#define MEMORY_TYPE_OS_RESERVED_MIN   0x80000000

-#define MEMORY_TYPE_OS_RESERVED_MAX   0xFFFFFFFF

-#define MEMORY_TYPE_OEM_RESERVED_MIN  0x70000000

-#define MEMORY_TYPE_OEM_RESERVED_MAX  0x7FFFFFFF

-

-//

 // MEMORY_MAP_ENTRY

 //

 

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 5a51d9df1a..e4daa741b9 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1183,6 +1183,13 @@ CoreFindFreePagesI (
       continue;

     }

 

+    //

+    // Don't allocate out of Special-Purpose memory.

+    //

+    if ((Entry->Attribute & EFI_MEMORY_SP) != 0) {

+      continue;

+    }

+

     DescStart = Entry->Start;

     DescEnd   = Entry->End;

 

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 2c19f1a507..933b245036 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -3,7 +3,7 @@
   Responsibility of this module is to load the DXE Core from a Firmware Volume.

 

 Copyright (c) 2016 HP Development Company, L.P.

-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -487,10 +487,10 @@ DxeIplFindDxeCore (
     //

     if (EFI_ERROR (Status)) {

       REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_PEI_MODULE | EFI_SW_PEI_CORE_EC_DXE_CORRUPT));

+      ASSERT_EFI_ERROR (Status);

+      break;

     }

 

-    ASSERT_EFI_ERROR (Status);

-

     //

     // Find the DxeCore file type from the beginning in this firmware volume.

     //

@@ -509,6 +509,13 @@ DxeIplFindDxeCore (
     //

     Instance++;

   }

+

+  //

+  // DxeCore cannot find in any firmware volume.

+  //

+  CpuDeadLoop ();

+

+  return NULL;

 }

 

 /**

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index ca37bde482..79ff8d1cf9 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -1205,16 +1205,21 @@ EvacuateTempRam (
     PeiCoreFvHandle.FvHandle = (EFI_PEI_FV_HANDLE)SecCoreData->BootFirmwareVolumeBase;

   }

 

-  for (FvIndex = 0; FvIndex < Private->FvCount; FvIndex++) {

-    if (Private->Fv[FvIndex].FvHandle == PeiCoreFvHandle.FvHandle) {

-      CopyMem (&PeiCoreFvHandle, &Private->Fv[FvIndex], sizeof (PEI_CORE_FV_HANDLE));

-      break;

+  if (Private->PeimDispatcherReenter) {

+    //

+    // PEI_CORE should be migrated after dispatcher re-enters from main memory.

+    //

+    for (FvIndex = 0; FvIndex < Private->FvCount; FvIndex++) {

+      if (Private->Fv[FvIndex].FvHandle == PeiCoreFvHandle.FvHandle) {

+        CopyMem (&PeiCoreFvHandle, &Private->Fv[FvIndex], sizeof (PEI_CORE_FV_HANDLE));

+        break;

+      }

     }

-  }

 

-  Status = EFI_SUCCESS;

+    Status = EFI_SUCCESS;

 

-  ConvertPeiCorePpiPointers (Private, &PeiCoreFvHandle);

+    ConvertPeiCorePpiPointers (Private, &PeiCoreFvHandle);

+  }

 

   Hob.Raw = GetFirstGuidHob (&gEdkiiMigrationInfoGuid);

   if (Hob.Raw != NULL) {

@@ -1237,6 +1242,14 @@ EvacuateTempRam (
         )

     {

       if ((MigrationInfo == NULL) || (MigrationInfo->MigrateAll == TRUE)) {

+        if (!Private->PeimDispatcherReenter) {

+          //

+          // Migration before dispatcher reentery is supported only when gEdkiiMigrationInfoGuid

+          // HOB is built for selective FV migration.

+          //

+          return EFI_SUCCESS;

+        }

+

         //

         // Migrate all FVs and copy raw data

         //

@@ -1253,10 +1266,18 @@ EvacuateTempRam (
           }

         }

 

-        if (Index == MigrationInfo->ToMigrateFvCount) {

+        if ((Index == MigrationInfo->ToMigrateFvCount) ||

+            ((!Private->PeimDispatcherReenter) &&

+             (((FvMigrationFlags & FLAGS_FV_MIGRATE_BEFORE_PEI_CORE_REENTRY) == 0) ||

+              (FvHeader == PeiCoreFvHandle.FvHandle))))

+        {

           //

           // This FV is not expected to migrate

           //

+          // FV should not be migrated before dispatcher reentry if any of the below condition is true:

+          // a. MigrationInfo HOB is not built with flag FLAGS_FV_MIGRATE_BEFORE_PEI_CORE_REENTRY.

+          // b. FV contains currently executing PEI Core.

+          //

           continue;

         }

       }

diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 52f37c960e..59613e5131 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -862,8 +862,6 @@ PeiAllocatePool (
              (UINT16)(sizeof (EFI_HOB_MEMORY_POOL) + Size),

              (VOID **)&Hob

              );

-  ASSERT_EFI_ERROR (Status);

-

   if (EFI_ERROR (Status)) {

     *Buffer = NULL;

   } else {

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index 46b6c23014..8df0c2d561 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -1,7 +1,7 @@
 /** @file

   Definition of Pei Core Structures and Services

 

-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -26,6 +26,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/TemporaryRamDone.h>

 #include <Ppi/SecHobData.h>

 #include <Ppi/PeiCoreFvLocation.h>

+#include <Ppi/MigrateTempRam.h>

 #include <Library/DebugLib.h>

 #include <Library/PeiCoreEntryPoint.h>

 #include <Library/BaseLib.h>

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 893bdc0527..4e545ddab2 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -6,7 +6,7 @@
 # 2) Dispatch PEIM from discovered FV.

 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.

 #

-# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

@@ -101,6 +101,7 @@
   gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES

   gEfiSecHobDataPpiGuid                         ## SOMETIMES_CONSUMES

   gEfiPeiCoreFvLocationPpiGuid                  ## SOMETIMES_CONSUMES

+  gEdkiiPeiMigrateTempRamPpiGuid                ## PRODUCES

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                  ## CONSUMES

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index bf1719d794..61f5699e1f 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -1,7 +1,7 @@
 /** @file

   Pei Core Main Entry Point

 

-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2024, Intel Corporation. All rights reserved.<BR>

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -13,6 +13,11 @@ EFI_PEI_PPI_DESCRIPTOR  mMemoryDiscoveredPpi = {
   &gEfiPeiMemoryDiscoveredPpiGuid,

   NULL

 };

+EFI_PEI_PPI_DESCRIPTOR  mMigrateTempRamPpi = {

+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+  &gEdkiiPeiMigrateTempRamPpiGuid,

+  NULL

+};

 

 ///

 /// Pei service instance

@@ -318,6 +323,21 @@ PeiCore (
       //

       OldCoreData->PeiMemoryInstalled = TRUE;

 

+      if (PcdGetBool (PcdMigrateTemporaryRamFirmwareVolumes)) {

+        DEBUG ((DEBUG_VERBOSE, "Early Migration - PPI lists before temporary RAM evacuation:\n"));

+        DumpPpiList (OldCoreData);

+

+        //

+        // Migrate installed content from Temporary RAM to Permanent RAM at this

+        // stage when PEI core still runs from a cached location.

+        // FVs that doesn't contain PEI_CORE should be migrated here.

+        //

+        EvacuateTempRam (OldCoreData, SecCoreData);

+

+        DEBUG ((DEBUG_VERBOSE, "Early Migration - PPI lists after temporary RAM evacuation:\n"));

+        DumpPpiList (OldCoreData);

+      }

+

       //

       // Indicate that PeiCore reenter

       //

@@ -446,9 +466,13 @@ PeiCore (
 

       //

       // Migrate installed content from Temporary RAM to Permanent RAM

+      // FVs containing PEI_CORE should be migrated here.

       //

       EvacuateTempRam (&PrivateData, SecCoreData);

 

+      Status = PeiServicesInstallPpi (&mMigrateTempRamPpi);

+      ASSERT_EFI_ERROR (Status);

+

       DEBUG ((DEBUG_VERBOSE, "PPI lists after temporary RAM evacuation:\n"));

       DumpPpiList (&PrivateData);

     }

diff --git a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
index 27da2898dd..e48532c0fb 100644
--- a/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
+++ b/MdeModulePkg/Core/PiSmmCore/SmiHandlerProfile.c
@@ -2,6 +2,7 @@
   SMI handler profile support.

 

 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>

+Copyright (c) Microsoft Corporation.

 SPDX-License-Identifier: BSD-2-Clause-Patent

 

 **/

@@ -48,6 +49,14 @@ RegisterSmiHandlerProfileHandler (
   );

 

 /**

+  Build SMI handler profile database.

+**/

+VOID

+BuildSmiHandlerProfileDatabase (

+  VOID

+  );

+

+/**

   Retrieves and returns a pointer to the entry point to a PE/COFF image that has been loaded

   into system memory with the PE/COFF Loader Library functions.

 

@@ -495,6 +504,8 @@ SmmReadyToLockInSmiHandlerProfile (
   IN EFI_HANDLE      Handle

   )

 {

+  RegisterSmiHandlerProfileHandler ();

+

   //

   // Dump all image

   //

@@ -528,7 +539,7 @@ SmmReadyToLockInSmiHandlerProfile (
 

   DEBUG ((DEBUG_INFO, "\n"));

 

-  RegisterSmiHandlerProfileHandler ();

+  BuildSmiHandlerProfileDatabase ();

 

   if (mImageStruct != NULL) {

     FreePool (mImageStruct);

@@ -860,7 +871,7 @@ GetSmiHandlerProfileDatabaseData (
 }

 

 /**

-  build SMI handler profile database.

+  Build SMI handler profile database.

 **/

 VOID

 BuildSmiHandlerProfileDatabase (

@@ -1074,8 +1085,6 @@ RegisterSmiHandlerProfileHandler (
                     &DispatchHandle

                     );

   ASSERT_EFI_ERROR (Status);

-

-  BuildSmiHandlerProfileDatabase ();

 }

 

 /**