UefiCpuPkg/PiSmmCpuDxeSmm: Add support for PCD PcdPteMemoryEncryptionAddressOrMask

This PCD holds the address mask for page table entries when memory
encryption is enabled on AMD processors supporting the Secure Encrypted
Virtualization (SEV) feature.

The mask is applied when page tables entriees are created or modified.

CC: Jeff Fan <jeff.fan@intel.com>
Cc: Feng Tian <feng.tian@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leo Duran <leo.duran@amd.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

1 files changed, 22 insertions, 19 deletions

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index 17b2f4c..19b19d8 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -2,6 +2,8 @@
 Page Fault (#PF) handler for X64 processors

 

 Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2017, AMD Incorporated. 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

@@ -16,6 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 #define PAGE_TABLE_PAGES            8

 #define ACC_MAX_BIT                 BIT3

+

 LIST_ENTRY                          mPagePool = INITIALIZE_LIST_HEAD_VARIABLE (mPagePool);

 BOOLEAN                             m1GPageTableSupport = FALSE;

 UINT8                               mPhysicalAddressBits;

@@ -168,13 +171,13 @@ SetStaticPageTable (
     //

     // Each PML4 entry points to a page of Page Directory Pointer entries.

     //

-    PageDirectoryPointerEntry = (UINT64 *) ((*PageMapLevel4Entry) & gPhyMask);

+    PageDirectoryPointerEntry = (UINT64 *) ((*PageMapLevel4Entry) & ~mAddressEncMask & gPhyMask);

     if (PageDirectoryPointerEntry == NULL) {

       PageDirectoryPointerEntry = AllocatePageTableMemory (1);

       ASSERT(PageDirectoryPointerEntry != NULL);

       ZeroMem (PageDirectoryPointerEntry, EFI_PAGES_TO_SIZE(1));

 

-      *PageMapLevel4Entry = ((UINTN)PageDirectoryPointerEntry & gPhyMask)  | PAGE_ATTRIBUTE_BITS;

+      *PageMapLevel4Entry = (UINT64)(UINTN)PageDirectoryPointerEntry | mAddressEncMask | PAGE_ATTRIBUTE_BITS;

     }

 

     if (m1GPageTableSupport) {

@@ -189,7 +192,7 @@ SetStaticPageTable (
         //

         // Fill in the Page Directory entries

         //

-        *PageDirectory1GEntry = (PageAddress & gPhyMask) | IA32_PG_PS | PAGE_ATTRIBUTE_BITS;

+        *PageDirectory1GEntry = PageAddress | mAddressEncMask | IA32_PG_PS | PAGE_ATTRIBUTE_BITS;

       }

     } else {

       PageAddress = BASE_4GB;

@@ -204,7 +207,7 @@ SetStaticPageTable (
         // Each Directory Pointer entries points to a page of Page Directory entires.

         // So allocate space for them and fill them in in the IndexOfPageDirectoryEntries loop.

         //

-        PageDirectoryEntry = (UINT64 *) ((*PageDirectoryPointerEntry) & gPhyMask);

+        PageDirectoryEntry = (UINT64 *) ((*PageDirectoryPointerEntry) & ~mAddressEncMask & gPhyMask);

         if (PageDirectoryEntry == NULL) {

           PageDirectoryEntry = AllocatePageTableMemory (1);

           ASSERT(PageDirectoryEntry != NULL);

@@ -213,14 +216,14 @@ SetStaticPageTable (
           //

           // Fill in a Page Directory Pointer Entries

           //

-          *PageDirectoryPointerEntry = (UINT64)(UINTN)PageDirectoryEntry | PAGE_ATTRIBUTE_BITS;

+          *PageDirectoryPointerEntry = (UINT64)(UINTN)PageDirectoryEntry | mAddressEncMask | PAGE_ATTRIBUTE_BITS;

         }

 

         for (IndexOfPageDirectoryEntries = 0; IndexOfPageDirectoryEntries < 512; IndexOfPageDirectoryEntries++, PageDirectoryEntry++, PageAddress += SIZE_2MB) {

           //

           // Fill in the Page Directory entries

           //

-          *PageDirectoryEntry = (UINT64)PageAddress | IA32_PG_PS | PAGE_ATTRIBUTE_BITS;

+          *PageDirectoryEntry = PageAddress | mAddressEncMask | IA32_PG_PS | PAGE_ATTRIBUTE_BITS;

         }

       }

     }

@@ -276,7 +279,7 @@ SmmInitPageTable (
   //

   PTEntry = (UINT64*)AllocatePageTableMemory (1);

   ASSERT (PTEntry != NULL);

-  *PTEntry = Pages | PAGE_ATTRIBUTE_BITS;

+  *PTEntry = Pages | mAddressEncMask | PAGE_ATTRIBUTE_BITS;

   ZeroMem (PTEntry + 1, EFI_PAGE_SIZE - sizeof (*PTEntry));

 

   //

@@ -457,7 +460,7 @@ ReclaimPages (
       //

       continue;

     }

-    Pdpt = (UINT64*)(UINTN)(Pml4[Pml4Index] & gPhyMask);

+    Pdpt = (UINT64*)(UINTN)(Pml4[Pml4Index] & ~mAddressEncMask & gPhyMask);

     PML4EIgnore = FALSE;

     for (PdptIndex = 0; PdptIndex < EFI_PAGE_SIZE / sizeof (*Pdpt); PdptIndex++) {

       if ((Pdpt[PdptIndex] & IA32_PG_P) == 0 || (Pdpt[PdptIndex] & IA32_PG_PMNT) != 0) {

@@ -478,7 +481,7 @@ ReclaimPages (
         // we will not check PML4 entry more

         //

         PML4EIgnore = TRUE;

-        Pdt =  (UINT64*)(UINTN)(Pdpt[PdptIndex] & gPhyMask);

+        Pdt =  (UINT64*)(UINTN)(Pdpt[PdptIndex] & ~mAddressEncMask & gPhyMask);

         PDPTEIgnore = FALSE;

         for (PdtIndex = 0; PdtIndex < EFI_PAGE_SIZE / sizeof(*Pdt); PdtIndex++) {

           if ((Pdt[PdtIndex] & IA32_PG_P) == 0 || (Pdt[PdtIndex] & IA32_PG_PMNT) != 0) {

@@ -560,7 +563,7 @@ ReclaimPages (
   //

   // Secondly, insert the page pointed by this entry into page pool and clear this entry

   //

-  InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(*ReleasePageAddress & gPhyMask));

+  InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(*ReleasePageAddress & ~mAddressEncMask & gPhyMask));

   *ReleasePageAddress = 0;

 

   //

@@ -572,14 +575,14 @@ ReclaimPages (
       //

       // If 4 KByte Page Table is released, check the PDPT entry

       //

-      Pdpt = (UINT64*)(UINTN)(Pml4[MinPml4] & gPhyMask);

+      Pdpt = (UINT64*)(UINTN)(Pml4[MinPml4] & ~mAddressEncMask & gPhyMask);

       SubEntriesNum = GetSubEntriesNum(Pdpt + MinPdpt);

       if (SubEntriesNum == 0) {

         //

         // Release the empty Page Directory table if there was no more 4 KByte Page Table entry

         // clear the Page directory entry

         //

-        InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pdpt[MinPdpt] & gPhyMask));

+        InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pdpt[MinPdpt] & ~mAddressEncMask & gPhyMask));

         Pdpt[MinPdpt] = 0;

         //

         // Go on checking the PML4 table

@@ -603,7 +606,7 @@ ReclaimPages (
         // Release the empty PML4 table if there was no more 1G KByte Page Table entry

         // clear the Page directory entry

         //

-        InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pml4[MinPml4] & gPhyMask));

+        InsertTailList (&mPagePool, (LIST_ENTRY*)(UINTN)(Pml4[MinPml4] & ~mAddressEncMask & gPhyMask));

         Pml4[MinPml4] = 0;

         MinPdpt = (UINTN)-1;

         continue;

@@ -747,7 +750,7 @@ SmiDefaultPFHandler (
         //

         // If the entry is not present, allocate one page from page pool for it

         //

-        PageTable[PTIndex] = AllocPage () | PAGE_ATTRIBUTE_BITS;

+        PageTable[PTIndex] = AllocPage () | mAddressEncMask | PAGE_ATTRIBUTE_BITS;

       } else {

         //

         // Save the upper entry address

@@ -760,7 +763,7 @@ SmiDefaultPFHandler (
       //

       PageTable[PTIndex] |= (UINT64)IA32_PG_A;

       SetAccNum (PageTable + PTIndex, 7);

-      PageTable = (UINT64*)(UINTN)(PageTable[PTIndex] & gPhyMask);

+      PageTable = (UINT64*)(UINTN)(PageTable[PTIndex] & ~mAddressEncMask & gPhyMask);

     }

 

     PTIndex = BitFieldRead64 (PFAddress, StartBit, StartBit + 8);

@@ -776,7 +779,7 @@ SmiDefaultPFHandler (
     //

     // Fill the new entry

     //

-    PageTable[PTIndex] = (PFAddress & gPhyMask & ~((1ull << EndBit) - 1)) |

+    PageTable[PTIndex] = ((PFAddress | mAddressEncMask) & gPhyMask & ~((1ull << EndBit) - 1)) |

                          PageAttribute | IA32_PG_A | PAGE_ATTRIBUTE_BITS;

     if (UpperEntry != NULL) {

       SetSubEntriesNum (UpperEntry, GetSubEntriesNum (UpperEntry) + 1);

@@ -927,7 +930,7 @@ SetPageTableAttributes (
     PageTableSplitted = (PageTableSplitted || IsSplitted);

 

     for (Index4 = 0; Index4 < SIZE_4KB/sizeof(UINT64); Index4++) {

-      L3PageTable = (UINT64 *)(UINTN)(L4PageTable[Index4] & PAGING_4K_ADDRESS_MASK_64);

+      L3PageTable = (UINT64 *)(UINTN)(L4PageTable[Index4] & ~mAddressEncMask & PAGING_4K_ADDRESS_MASK_64);

       if (L3PageTable == NULL) {

         continue;

       }

@@ -940,7 +943,7 @@ SetPageTableAttributes (
           // 1G

           continue;

         }

-        L2PageTable = (UINT64 *)(UINTN)(L3PageTable[Index3] & PAGING_4K_ADDRESS_MASK_64);

+        L2PageTable = (UINT64 *)(UINTN)(L3PageTable[Index3] & ~mAddressEncMask & PAGING_4K_ADDRESS_MASK_64);

         if (L2PageTable == NULL) {

           continue;

         }

@@ -953,7 +956,7 @@ SetPageTableAttributes (
             // 2M

             continue;

           }

-          L1PageTable = (UINT64 *)(UINTN)(L2PageTable[Index2] & PAGING_4K_ADDRESS_MASK_64);

+          L1PageTable = (UINT64 *)(UINTN)(L2PageTable[Index2] & ~mAddressEncMask & PAGING_4K_ADDRESS_MASK_64);

           if (L1PageTable == NULL) {

             continue;

           }