public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Min Xu" <min.m.xu@intel.com>
To: devel@edk2.groups.io
Cc: Min Xu <min.m.xu@intel.com>,
	Brijesh Singh <brijesh.singh@amd.com>,
	Erdem Aktas <erdemaktas@google.com>,
	James Bottomley <jejb@linux.ibm.com>,
	Jiewen Yao <jiewen.yao@intel.com>,
	Tom Lendacky <thomas.lendacky@amd.com>,
	Eric Dong <eric.dong@intel.com>, Ray Ni <ray.ni@intel.com>,
	Rahul Kumar <rahul1.kumar@intel.com>,
	Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH V11 37/47] UefiCpuPkg: Update AddressEncMask in CpuPageTable
Date: Mon, 28 Mar 2022 16:08:16 +0800	[thread overview]
Message-ID: <1c3df6874e1d74f7946c53b09a83d6a1707dffa6.1648454441.git.min.m.xu@intel.com> (raw)
In-Reply-To: <cover.1648454440.git.min.m.xu@intel.com>

RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429

MMIO region in Tdx guest is set with PcdTdxSharedBitMask in TdxDxe's
entry point. In SEV guest the page table entries is set with
PcdPteMemoryEncryptionAddressOrMask when creating 1:1 identity table.

So the AddressEncMask in GetPageTableEntry (@CpuPageTable.c) is either
PcdPteMemoryEncryptionAddressOrMask (in SEV guest), or
PcdTdxSharedBitMask (in TDX guest), or all-0 (in Legacy guest).

Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
---
 UefiCpuPkg/CpuDxe/CpuDxe.inf     | 1 +
 UefiCpuPkg/CpuDxe/CpuPageTable.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/UefiCpuPkg/CpuDxe/CpuDxe.inf b/UefiCpuPkg/CpuDxe/CpuDxe.inf
index d87fe503d152..235241899222 100644
--- a/UefiCpuPkg/CpuDxe/CpuDxe.inf
+++ b/UefiCpuPkg/CpuDxe/CpuDxe.inf
@@ -80,6 +80,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdNullPointerDetectionPropertyMask    ## CONSUMES
   gUefiCpuPkgTokenSpaceGuid.PcdCpuStackSwitchExceptionList              ## CONSUMES
   gUefiCpuPkgTokenSpaceGuid.PcdCpuKnownGoodStackSize                    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask                    ## CONSUMES
 
 [Depex]
   TRUE
diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTable.c
index d9e65ab4b22a..f7a4d92e921a 100644
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
+++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c
@@ -307,6 +307,9 @@ GetPageTableEntry (
   // Make sure AddressEncMask is contained to smallest supported address field.
   //
   AddressEncMask = PcdGet64 (PcdPteMemoryEncryptionAddressOrMask) & PAGING_1G_ADDRESS_MASK_64;
+  if (AddressEncMask == 0) {
+    AddressEncMask = PcdGet64 (PcdTdxSharedBitMask) & PAGING_1G_ADDRESS_MASK_64;
+  }
 
   if (PagingContext->MachineType == IMAGE_FILE_MACHINE_X64) {
     if ((PagingContext->ContextData.X64.Attributes & PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_5_LEVEL) != 0) {
-- 
2.29.2.windows.2


  parent reply	other threads:[~2022-03-28  8:10 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28  8:07 [PATCH V11 00/47] Enable Intel TDX in OvmfPkg (Config-A) Min Xu
2022-03-28  8:07 ` [PATCH V11 01/47] MdePkg: Add Tdx.h Min Xu
2022-03-28  8:07 ` [PATCH V11 02/47] MdePkg: Update Cpuid.h for Tdx Min Xu
2022-03-28  8:07 ` [PATCH V11 03/47] MdePkg: Introduce basic Tdx functions in BaseLib Min Xu
2022-03-28  8:07 ` [PATCH V11 04/47] MdePkg: Add TdxLib to wrap Tdx operations Min Xu
2022-03-28  8:07 ` [PATCH V11 05/47] UefiCpuPkg: Extend VmgExitLibNull to handle #VE exception Min Xu
2022-03-28  8:07 ` [PATCH V11 06/47] OvmfPkg: Extend VmgExitLib " Min Xu
2022-03-28  8:07 ` [PATCH V11 07/47] UefiCpuPkg/CpuExceptionHandler: Add base support for the " Min Xu
2022-03-28  8:07 ` [PATCH V11 08/47] MdePkg: Add helper functions for Tdx guest in BaseIoLibIntrinsic Min Xu
2022-03-28  8:07 ` [PATCH V11 09/47] MdePkg: Support mmio " Min Xu
2022-03-28  8:07 ` [PATCH V11 10/47] MdePkg: Support IoFifo " Min Xu
2022-03-28  8:07 ` [PATCH V11 11/47] MdePkg: Support IoRead/IoWrite " Min Xu
2022-03-28  8:07 ` [PATCH V11 12/47] UefiCpuPkg: Support TDX in BaseXApicX2ApicLib Min Xu
2022-03-28  8:07 ` [PATCH V11 13/47] MdePkg: Add macro to check SEV / TDX guest Min Xu
2022-03-28  8:07 ` [PATCH V11 14/47] UefiCpuPkg: Enable Tdx support in MpInitLib Min Xu
2022-03-28  8:24   ` Ni, Ray
2022-03-29 12:03     ` Min Xu
2022-03-28  8:07 ` [PATCH V11 15/47] OvmfPkg: Add IntelTdx.h in OvmfPkg/Include/IndustryStandard Min Xu
2022-03-28  8:07 ` [PATCH V11 16/47] OvmfPkg: Add TdxMailboxLib Min Xu
2022-03-28  8:07 ` [PATCH V11 17/47] OvmfPkg: Create initial version of PlatformInitLib Min Xu
2022-03-28  8:07 ` [PATCH V11 18/47] OvmfPkg/PlatformInitLib: Add hob functions Min Xu
2022-03-28  8:07 ` [PATCH V11 19/47] OvmfPkg/PlatformPei: Move global variables to PlatformInfoHob Min Xu
2022-03-28  8:07 ` [PATCH V11 20/47] OvmfPkg/PlatformPei: Refactor MiscInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 21/47] OvmfPkg/PlatformPei: Refactor MiscInitialization for CloudHV Min Xu
2022-03-28  8:08 ` [PATCH V11 22/47] OvmfPkg/PlatformPei: Refactor AddressWidthInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 23/47] OvmfPkg/PlatformPei: Refactor MaxCpuCountInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 24/47] OvmfPkg/PlatformPei: Refactor QemuUc32BaseInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 25/47] OvmfPkg/PlatformPei: Refactor InitializeRamRegions Min Xu
2022-03-28  8:08 ` [PATCH V11 26/47] OvmfPkg/PlatformPei: Refactor MemMapInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 27/47] OvmfPkg/PlatformPei: Refactor NoexecDxeInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 28/47] OvmfPkg/PlatformPei: Refactor MiscInitialization Min Xu
2022-03-28  8:08 ` [PATCH V11 30/47] OvmfPkg/PlatformInitLib: Move functions to Platform.c Min Xu
2022-03-28  8:08 ` [PATCH V11 31/47] OvmfPkg: Update PlatformInitLib to process Tdx hoblist Min Xu
2022-03-28  8:08 ` [PATCH V11 32/47] OvmfPkg/Sec: Declare local variable as volatile in SecCoreStartupWithStack Min Xu
2022-03-28  8:08 ` [PATCH V11 33/47] OvmfPkg: Update Sec to support Tdx Min Xu
2022-03-28  8:08 ` [PATCH V11 34/47] OvmfPkg: Check Tdx in QemuFwCfgPei to avoid DMA operation Min Xu
2022-03-28  8:08 ` [PATCH V11 35/47] MdeModulePkg: Skip setting IA32_ERER.NXE if it has already been set Min Xu
2022-03-28  8:08 ` [PATCH V11 36/47] MdeModulePkg: Add PcdTdxSharedBitMask Min Xu
2022-03-28  8:08 ` Min Xu [this message]
2022-03-28  8:08 ` [PATCH V11 38/47] OvmfPkg: Update PlatformInitLib for Tdx guest Min Xu
2022-03-28  8:08 ` [PATCH V11 39/47] OvmfPkg: Update PlatformPei to support " Min Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1c3df6874e1d74f7946c53b09a83d6a1707dffa6.1648454441.git.min.m.xu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox