UefiCpuPkg/CpuPageTableLib: Add OUTPUT IsModified parameter.

Add OUTPUT IsModified parameter in PageTableMap() to indicate
if page table has been modified. With this parameter, caller
can know if need to call FlushTlb when the page table is in CR3.

Signed-off-by: Dun Tan <dun.tan@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/UefiCpuPkg/Include/Library/CpuPageTableLib.h b/UefiCpuPkg/Include/Library/CpuPageTableLib.h
index 4ef4a8b6af208a61fb3581278a35da23853df371..352b6df6c68deb4afba06b63496a421841519284 100644 (file)
--- a/UefiCpuPkg/Include/Library/CpuPageTableLib.h
+++ b/UefiCpuPkg/Include/Library/CpuPageTableLib.h
@@ -74,6 +74,7 @@ typedef enum {
                                  Page table entries that map the linear address range are reset to 0 before set to the new attribute\r
                                  when a new physical base address is set.\r
   @param[in]      Mask           The mask used for attribute. The corresponding field in Attribute is ignored if that in Mask is 0.\r
+  @param[out]     IsModified     TRUE means page table is modified. FALSE means page table is not modified.\r
 \r
   @retval RETURN_UNSUPPORTED        PagingMode is not supported.\r
   @retval RETURN_INVALID_PARAMETER  PageTable, BufferSize, Attribute or Mask is NULL.\r
@@ -97,7 +98,8 @@ PageTableMap (
   IN     UINT64              LinearAddress,\r
   IN     UINT64              Length,\r
   IN     IA32_MAP_ATTRIBUTE  *Attribute,\r
-  IN     IA32_MAP_ATTRIBUTE  *Mask\r
+  IN     IA32_MAP_ATTRIBUTE  *Mask,\r
+  OUT    BOOLEAN             *IsModified   OPTIONAL\r
   );\r
 \r
 typedef struct {\r

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
index 76c3719cdfc31d1c76370a45dd50c51306fb8a3c..64383cc522b1b99669822864c4918f4b1f9c1520 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
@@ -274,6 +274,7 @@ IsAttributesAndMaskValidForNonPresentEntry (
                                     Page table entries that map the linear address range are reset to 0 before set to the new attribute\r
                                     when a new physical base address is set.\r
   @param[in]      Mask              The mask used for attribute. The corresponding field in Attribute is ignored if that in Mask is 0.\r
+  @param[out]     IsModified        TRUE means page table is modified. FALSE means page table is not modified.\r
 \r
   @retval RETURN_INVALID_PARAMETER  For non-present range, Mask->Bits.Present is 0 but some other attributes are provided.\r
   @retval RETURN_INVALID_PARAMETER  For non-present range, Mask->Bits.Present is 1, Attribute->Bits.Present is 1 but some other attributes are not provided.\r
@@ -292,7 +293,8 @@ PageTableLibMapInLevel (
   IN     UINT64              Length,\r
   IN     UINT64              Offset,\r
   IN     IA32_MAP_ATTRIBUTE  *Attribute,\r
-  IN     IA32_MAP_ATTRIBUTE  *Mask\r
+  IN     IA32_MAP_ATTRIBUTE  *Mask,\r
+  OUT    BOOLEAN             *IsModified\r
   )\r
 {\r
   RETURN_STATUS       Status;\r
@@ -318,6 +320,8 @@ PageTableLibMapInLevel (
   IA32_MAP_ATTRIBUTE  LocalParentAttribute;\r
   UINT64              PhysicalAddrInEntry;\r
   UINT64              PhysicalAddrInAttr;\r
+  IA32_PAGING_ENTRY   OriginalParentPagingEntry;\r
+  IA32_PAGING_ENTRY   OriginalCurrentPagingEntry;\r
 \r
   ASSERT (Level != 0);\r
   ASSERT ((Attribute != NULL) && (Mask != NULL));\r
@@ -333,6 +337,8 @@ PageTableLibMapInLevel (
   LocalParentAttribute.Uint64 = ParentAttribute->Uint64;\r
   ParentAttribute             = &LocalParentAttribute;\r
 \r
+  OriginalParentPagingEntry.Uint64 = ParentPagingEntry->Uint64;\r
+\r
   //\r
   // RegionLength: 256T (1 << 48) 512G (1 << 39), 1G (1 << 30), 2M (1 << 21) or 4K (1 << 12).\r
   //\r
@@ -568,7 +574,15 @@ PageTableLibMapInLevel (
           ASSERT (CreateNew || (Mask->Bits.Nx == 0) || (Attribute->Bits.Nx == 1));\r
         }\r
 \r
+        //\r
+        // Check if any leaf PagingEntry is modified.\r
+        //\r
+        OriginalCurrentPagingEntry.Uint64 = CurrentPagingEntry->Uint64;\r
         PageTableLibSetPle (Level, CurrentPagingEntry, Offset, Attribute, &CurrentMask);\r
+\r
+        if (OriginalCurrentPagingEntry.Uint64 != CurrentPagingEntry->Uint64) {\r
+          *IsModified = TRUE;\r
+        }\r
       }\r
     } else {\r
       //\r
@@ -591,7 +605,8 @@ PageTableLibMapInLevel (
                  Length,\r
                  Offset,\r
                  Attribute,\r
-                 Mask\r
+                 Mask,\r
+                 IsModified\r
                  );\r
       if (RETURN_ERROR (Status)) {\r
         return Status;\r
@@ -603,6 +618,14 @@ PageTableLibMapInLevel (
     Index++;\r
   }\r
 \r
+  //\r
+  // Check if ParentPagingEntry entry is modified here is enough. Except the changes happen in leaf PagingEntry during\r
+  // the while loop, if there is any other change happens in page table, the ParentPagingEntry must has been modified.\r
+  //\r
+  if (OriginalParentPagingEntry.Uint64 != ParentPagingEntry->Uint64) {\r
+    *IsModified = TRUE;\r
+  }\r
+\r
   return RETURN_SUCCESS;\r
 }\r
 \r
@@ -623,6 +646,7 @@ PageTableLibMapInLevel (
                                  Page table entries that map the linear address range are reset to 0 before set to the new attribute\r
                                  when a new physical base address is set.\r
   @param[in]      Mask           The mask used for attribute. The corresponding field in Attribute is ignored if that in Mask is 0.\r
+  @param[out]     IsModified     TRUE means page table is modified. FALSE means page table is not modified.\r
 \r
   @retval RETURN_UNSUPPORTED        PagingMode is not supported.\r
   @retval RETURN_INVALID_PARAMETER  PageTable, BufferSize, Attribute or Mask is NULL.\r
@@ -646,7 +670,8 @@ PageTableMap (
   IN     UINT64              LinearAddress,\r
   IN     UINT64              Length,\r
   IN     IA32_MAP_ATTRIBUTE  *Attribute,\r
-  IN     IA32_MAP_ATTRIBUTE  *Mask\r
+  IN     IA32_MAP_ATTRIBUTE  *Mask,\r
+  OUT    BOOLEAN             *IsModified   OPTIONAL\r
   )\r
 {\r
   RETURN_STATUS       Status;\r
@@ -656,6 +681,7 @@ PageTableMap (
   IA32_PAGE_LEVEL     MaxLevel;\r
   IA32_PAGE_LEVEL     MaxLeafLevel;\r
   IA32_MAP_ATTRIBUTE  ParentAttribute;\r
+  BOOLEAN             LocalIsModified;\r
 \r
   if (Length == 0) {\r
     return RETURN_SUCCESS;\r
@@ -718,6 +744,12 @@ PageTableMap (
     TopPagingEntry.Pce.Nx             = 0;\r
   }\r
 \r
+  if (IsModified == NULL) {\r
+    IsModified = &LocalIsModified;\r
+  }\r
+\r
+  *IsModified = FALSE;\r
+\r
   ParentAttribute.Uint64                    = 0;\r
   ParentAttribute.Bits.PageTableBaseAddress = 1;\r
   ParentAttribute.Bits.Present              = 1;\r
@@ -741,8 +773,10 @@ PageTableMap (
                    Length,\r
                    0,\r
                    Attribute,\r
-                   Mask\r
+                   Mask,\r
+                   IsModified\r
                    );\r
+  ASSERT (*IsModified == FALSE);\r
   if (RETURN_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -773,8 +807,10 @@ PageTableMap (
              Length,\r
              0,\r
              Attribute,\r
-             Mask\r
+             Mask,\r
+             IsModified\r
              );\r
+\r
   if (!RETURN_ERROR (Status)) {\r
     *PageTable = (UINTN)(TopPagingEntry.Uintn & IA32_PE_BASE_ADDRESS_MASK_40);\r
   }\r

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.c b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.c
index c682d4ea0442fdcf6f16b63872cc96e433fc3da6..759da092717c5dbd56ab4b5f7254c3d576140346 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.c
@@ -51,26 +51,26 @@ TestCaseForParameter (
   //\r
   // If the input linear address is not 4K align, it should return invalid parameter\r
   //\r
-  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, &MapMask), RETURN_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, &MapMask, NULL), RETURN_INVALID_PARAMETER);\r
 \r
   //\r
   // If the input PageTableBufferSize is not 4K align, it should return invalid parameter\r
   //\r
   PageTableBufferSize = 10;\r
-  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 0, SIZE_4KB, &MapAttribute, &MapMask), RETURN_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 0, SIZE_4KB, &MapAttribute, &MapMask, NULL), RETURN_INVALID_PARAMETER);\r
 \r
   //\r
   // If the input PagingMode is Paging32bit, it should return invalid parameter\r
   //\r
   PageTableBufferSize = 0;\r
   PagingMode          = Paging32bit;\r
-  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, &MapMask), RETURN_UNSUPPORTED);\r
+  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, &MapMask, NULL), RETURN_UNSUPPORTED);\r
 \r
   //\r
   // If the input MapMask is NULL, it should return invalid parameter\r
   //\r
   PagingMode = Paging5Level1GB;\r
-  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, NULL), RETURN_INVALID_PARAMETER);\r
+  UT_ASSERT_EQUAL (PageTableMap (&PageTable, PagingMode, &Buffer, &PageTableBufferSize, 1, SIZE_4KB, &MapAttribute, NULL, NULL), RETURN_INVALID_PARAMETER);\r
 \r
   return UNIT_TEST_PASSED;\r
 }\r
@@ -119,10 +119,10 @@ TestCaseWhichNoNeedExtraSize (
   //\r
   // Create page table to cover [0, 10M], it should have 5 PTE\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_2MB * 5, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_2MB * 5, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_2MB * 5, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_2MB * 5, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
   if (TestStatus != UNIT_TEST_PASSED) {\r
@@ -134,7 +134,7 @@ TestCaseWhichNoNeedExtraSize (
   // We assume the fucntion doesn't need to change page table, return success and output BufferSize is 0\r
   //\r
   Buffer = NULL;\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_4KB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, (UINT64)SIZE_4KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (PageTableBufferSize, 0);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
@@ -148,7 +148,7 @@ TestCaseWhichNoNeedExtraSize (
   //\r
   MapMask.Bits.Nx     = 0;\r
   PageTableBufferSize = 0;\r
-  Status              = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, (UINT64)SIZE_4KB, &MapAttribute, &MapMask);\r
+  Status              = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, (UINT64)SIZE_4KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   UT_ASSERT_EQUAL (PageTableBufferSize, 0);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
@@ -164,7 +164,7 @@ TestCaseWhichNoNeedExtraSize (
   MapAttribute.Bits.Accessed = 1;\r
   MapMask.Bits.Accessed      = 1;\r
   PageTableBufferSize        = 0;\r
-  Status                     = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)SIZE_2MB, (UINT64)SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status                     = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)SIZE_2MB, (UINT64)SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   UT_ASSERT_EQUAL (PageTableBufferSize, 0);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
@@ -217,10 +217,10 @@ TestCase1Gmapto4K (
   MapAttribute.Bits.Present = 1;\r
   MapMask.Bits.Present      = 1;\r
   MapMask.Uint64            = MAX_UINT64;\r
-  Status                    = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask);\r
+  Status                    = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
 \r
   //\r
@@ -281,11 +281,11 @@ TestCaseManualChangeReadWrite (
   //\r
   // Create Page table to cover [0,2G], with ReadWrite = 1\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   BackupPageTableBufferSize = PageTableBufferSize;\r
   Buffer                    = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status                    = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status                    = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   IsPageTableValid (PageTable, PagingMode);\r
 \r
@@ -331,7 +331,7 @@ TestCaseManualChangeReadWrite (
   // Call library to change ReadWrite to 0 for [0,2M]\r
   //\r
   MapAttribute.Bits.ReadWrite = 0;\r
-  Status                      = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status                      = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   IsPageTableValid (PageTable, PagingMode);\r
   MapCount = 0;\r
@@ -360,7 +360,7 @@ TestCaseManualChangeReadWrite (
   //\r
   MapAttribute.Bits.ReadWrite = 1;\r
   PageTableBufferSize         = 0;\r
-  Status                      = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status                      = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, 0, SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   IsPageTableValid (PageTable, PagingMode);\r
   MapCount = 0;\r
@@ -434,10 +434,10 @@ TestCaseManualSizeNotMatch (
   //\r
   // Create Page table to cover [2M-4K, 4M], with ReadWrite = 1\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB + SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB + SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB + SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB + SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   IsPageTableValid (PageTable, PagingMode);\r
 \r
@@ -493,7 +493,7 @@ TestCaseManualSizeNotMatch (
   MapAttribute.Bits.ReadWrite            = 1;\r
   PageTableBufferSize                    = 0;\r
   MapAttribute.Bits.PageTableBaseAddress = (SIZE_2MB - SIZE_4KB) >> 12;\r
-  Status                                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB * 2, &MapAttribute, &MapMask);\r
+  Status                                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2MB - SIZE_4KB, SIZE_4KB * 2, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   return UNIT_TEST_PASSED;\r
 }\r
@@ -540,10 +540,10 @@ TestCaseManualNotMergeEntry (
   //\r
   // Create Page table to cover [0,4M], and [4M, 1G] is not present\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB * 2, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB * 2, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB * 2, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB * 2, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
   if (TestStatus != UNIT_TEST_PASSED) {\r
@@ -555,7 +555,7 @@ TestCaseManualNotMergeEntry (
   // It looks like the chioce is not bad, but sometime, we need to keep some small entry\r
   //\r
   PageTableBufferSize = 0;\r
-  Status              = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask);\r
+  Status              = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
   if (TestStatus != UNIT_TEST_PASSED) {\r
@@ -564,7 +564,7 @@ TestCaseManualNotMergeEntry (
 \r
   MapAttribute.Bits.Accessed = 1;\r
   PageTableBufferSize        = 0;\r
-  Status                     = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB, &MapAttribute, &MapMask);\r
+  Status                     = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_2MB, &MapAttribute, &MapMask, NULL);\r
   //\r
   // If it didn't use a big 1G entry to cover whole range, only change [0,2M] for some attribute won't need extra memory\r
   //\r
@@ -619,10 +619,10 @@ TestCaseManualChangeNx (
   //\r
   // Create Page table to cover [0,2G], with Nx = 0\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB * 2, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB * 2, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB * 2, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB * 2, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
   if (TestStatus != UNIT_TEST_PASSED) {\r
@@ -666,7 +666,7 @@ TestCaseManualChangeNx (
   //\r
   // Call library to change Nx to 0 for [0,1G]\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, NULL, &PageTableBufferSize, (UINT64)0, (UINT64)SIZE_1GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   TestStatus = IsPageTableValid (PageTable, PagingMode);\r
   if (TestStatus != UNIT_TEST_PASSED) {\r
@@ -741,30 +741,30 @@ TestCaseToCheckMapMaskAndAttr (
   //\r
   // Create Page table to cover [0, 2G]. All fields of MapMask should be set.\r
   //\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER);\r
   MapMask.Uint64 = MAX_UINT64;\r
-  Status         = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status         = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
 \r
   //\r
   // Update Page table to set [2G - 8K, 2G] from present to non-present. All fields of MapMask except present should not be set.\r
   //\r
   PageTableBufferSize    = 0;\r
-  MapAttribute.Uint64    = SIZE_2GB - SIZE_8KB;\r
+  MapAttribute.Uint64    = 0;\r
   MapMask.Uint64         = 0;\r
   MapMask.Bits.Present   = 1;\r
   MapMask.Bits.ReadWrite = 1;\r
-  Status                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER);\r
   MapMask.Bits.ReadWrite = 0;\r
-  Status                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status                 = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_BUFFER_TOO_SMALL);\r
   Buffer = AllocatePages (EFI_SIZE_TO_PAGES (PageTableBufferSize));\r
-  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, 0, SIZE_2GB, &MapAttribute, &MapMask);\r
+  Status = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
 \r
   //\r
@@ -774,11 +774,11 @@ TestCaseToCheckMapMaskAndAttr (
   MapAttribute.Uint64  = 0;\r
   MapMask.Uint64       = 0;\r
   MapMask.Bits.Present = 1;\r
-  Status               = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status               = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
   MapAttribute.Bits.ReadWrite = 1;\r
   MapMask.Bits.ReadWrite      = 1;\r
-  Status                      = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status                      = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER);\r
 \r
   //\r
@@ -791,10 +791,10 @@ TestCaseToCheckMapMaskAndAttr (
   MapMask.Uint64              = 0;\r
   MapMask.Bits.ReadWrite      = 1;\r
   MapMask.Bits.Present        = 1;\r
-  Status                      = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status                      = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_INVALID_PARAMETER);\r
   MapMask.Uint64 = MAX_UINT64;\r
-  Status         = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask);\r
+  Status         = PageTableMap (&PageTable, PagingMode, Buffer, &PageTableBufferSize, SIZE_2GB - SIZE_8KB, SIZE_8KB, &MapAttribute, &MapMask, NULL);\r
   UT_ASSERT_EQUAL (Status, RETURN_SUCCESS);\r
 \r
   MapCount = 0;\r

diff --git a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
index 121cc4f2b2e2c16342bd17d6fadc3f1ef00a1bfe..e603dba269da5369cfd1858fb5adcc6ae93c8261 100644 (file)
--- a/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/UnitTest/RandomTest.c
@@ -699,7 +699,8 @@ SingleMapEntryTest (
                           LastMapEntry->LinearAddress,\r
                           LastMapEntry->Length,\r
                           &LastMapEntry->Attribute,\r
-                          &LastMapEntry->Mask\r
+                          &LastMapEntry->Mask,\r
+                          NULL\r
                           );\r
 \r
   Attribute = &LastMapEntry->Attribute;\r
@@ -759,7 +760,8 @@ SingleMapEntryTest (
                LastMapEntry->LinearAddress,\r
                LastMapEntry->Length,\r
                &LastMapEntry->Attribute,\r
-               &LastMapEntry->Mask\r
+               &LastMapEntry->Mask,\r
+               NULL\r
                );\r
   }\r
 \r

diff --git a/UefiCpuPkg/Library/MpInitLib/X64/CreatePageTable.c b/UefiCpuPkg/Library/MpInitLib/X64/CreatePageTable.c
index f20068152bb181723bed97903de4c00923b4e21d..da8729e752fbb93b63f624acfbbe62a0b6af445a 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/X64/CreatePageTable.c
+++ b/UefiCpuPkg/Library/MpInitLib/X64/CreatePageTable.c
@@ -57,7 +57,8 @@ CreatePageTable (
              Address,\r
              Length,\r
              &MapAttribute,\r
-             &MapMask\r
+             &MapMask,\r
+             NULL\r
              );\r
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);\r
   DEBUG ((DEBUG_INFO, "AP Page Table Buffer Size = %x\n", PageTableBufferSize));\r
@@ -72,7 +73,8 @@ CreatePageTable (
              Address,\r
              Length,\r
              &MapAttribute,\r
-             &MapMask\r
+             &MapMask,\r
+             NULL\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
   return PageTable;\r