REBASE: Updated PcdCpuStackGuard references to PcdCpuSmmStackGuard re…

…ferences
microsoft · Dec 18, 2023 · 01a3f55 · 01a3f55
1 parent 337fc6b
commit 01a3f55
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 8 deletions.
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf
@@ -51,7 +51,7 @@
   CcExitLib
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard  # MU_CHANGE
   gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList
   gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize
 

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
@@ -54,7 +54,7 @@
   CcExitLib
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard  # MU_CHANGE
   gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList
   gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize
 

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTestCommon.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTestCommon.c
@@ -743,10 +743,13 @@ TestCpuStackGuardInBspAndAp (
   VOID                            *NewIdtr;
   UINTN                           *CpuStackBaseBuffer;
 
-  if (!PcdGetBool (PcdCpuStackGuard)) {
+  // MU_CHANGE Start
+  if (!PcdGetBool (PcdCpuSmmStackGuard)) {
     return UNIT_TEST_PASSED;
   }
 
+  // MU_CHANGE End
+
   //
   // Get MP Service Protocol
   //

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/DxeCpuExceptionHandlerLibUnitTest.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/DxeCpuExceptionHandlerLibUnitTest.inf
@@ -48,9 +48,12 @@
   gEfiHobMemoryAllocStackGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard       ## CONSUMES
+  #gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard       ## CONSUMES  # MU_CHANGE
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize           ## CONSUMES
 
+[FeaturePcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard                    ## CONSUMES  # MU_CHANGE
+
 [Protocols]
   gEfiMpServiceProtocolGuid
   gEfiTimerArchProtocolGuid

diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf
@@ -50,9 +50,12 @@
   PeiServicesTablePointerLib
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard   ## CONSUMES
+  # gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard   ## CONSUMES  # MU_CHANGE
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize       ## CONSUMES
 
+[FeaturePcd]
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackGuard                    ## CONSUMES  # MU_CHANGE
+
 [Ppis]
   gEdkiiPeiMpServices2PpiGuid                       ## CONSUMES
 

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/PageTbl.c
@@ -207,7 +207,6 @@ SmiPFHandler (
 
 Exit:
   ReleaseSpinLock (mPFLock);
-
 }
 
 /**

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h
@@ -22,6 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Protocol/SmmCpuService.h>
 #include <Protocol/SmmMemoryAttribute.h>
 #include <Protocol/MmMp.h>
+#include <Protocol/SmmExceptionTestProtocol.h>
 
 #include <Guid/AcpiS3Context.h>
 #include <Guid/MemoryAttributesTable.h>
@@ -307,6 +308,7 @@ EFIAPI
 EnableCet (
   VOID
   );
+
 extern BOOLEAN  mSmmRebootOnException;                     // MS_CHANGE
 
 //

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmCpuMemoryManagement.c
@@ -1825,18 +1825,34 @@ IfReadOnlyPageTableNeeded (
   //      BIT3: SMM pool guard enabled
   //  - SMM profile feature enabled
   //
-  if (!IsRestrictedMemoryAccess () ||
+
+  // MU_CHANGE START
+
+  /*if (!IsRestrictedMemoryAccess () ||
       ((PcdGet8 (PcdHeapGuardPropertyMask) & (BIT3 | BIT2)) != 0) ||
       FeaturePcdGet (PcdCpuSmmProfileEnable))
+  {*/
+  // MU_CHANGE END
+  if (!IsRestrictedMemoryAccess () ||
+      ((gMmMps.HeapGuardPolicy.Fields.MmPageGuard | gMmMps.HeapGuardPolicy.Fields.MmPoolGuard) != 0) ||
+      FeaturePcdGet (PcdCpuSmmProfileEnable))
   {
+    // MU_CHANGE END
     if (sizeof (UINTN) == sizeof (UINT64)) {
       //
       // Restriction on access to non-SMRAM memory and heap guard could not be enabled at the same time.
       //
-      ASSERT (
+      // MU_CHANGE START
+
+      /*ASSERT (
         !(IsRestrictedMemoryAccess () &&
           (PcdGet8 (PcdHeapGuardPropertyMask) & (BIT3 | BIT2)) != 0)
+        ); */
+      ASSERT (
+        !(IsRestrictedMemoryAccess () &&
+          (gMmMps.HeapGuardPolicy.Fields.MmPageGuard | gMmMps.HeapGuardPolicy.Fields.MmPoolGuard) != 0)
         );
+      // MU_CHANGE END
 
       //
       // Restriction on access to non-SMRAM memory and SMM profile could not be enabled at the same time.
-Original file line number
+Diff line change
@@ Expand Up / @@ -207,7 +207,6 @@ SmiPFHandler ( @@
     Exit:
       ReleaseSpinLock (mPFLock);
     }
     /**
@@ Expand Down @@