From: "Min Xu" <min.m.xu@intel.com>
To: devel@edk2.groups.io
Cc: Min Xu <min.m.xu@intel.com>, Jian J Wang <jian.j.wang@intel.com>,
Hao A Wu <hao.a.wu@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>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [PATCH V5 19/33] MdeModulePkg: EFER should not be changed in TDX
Date: Sun, 23 Jan 2022 09:36:50 +0800 [thread overview]
Message-ID: <03c535b90c1590c9107e83c002d75c8c8c8edf21.1642899774.git.min.m.xu@intel.com> (raw)
In-Reply-To: <cover.1642899774.git.min.m.xu@intel.com>
RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3429
In TDX IA32_ERER is RO to host VMM. It could not be changed.
PcdIa32EferChangeAllowed is added in MdeModulePkg.dec and it is
to be set to FALSE in Tdx guest.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
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: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>
---
MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf | 1 +
MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c | 7 +++++++
MdeModulePkg/MdeModulePkg.dec | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index 19b8a4c8aefa..106b679b6bd0 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -117,6 +117,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdUse5LevelPageTable ## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbBase ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize ## CONSUMES
+ gEfiMdeModulePkgTokenSpaceGuid.PcdIa32EferChangeAllowed ## CONSUMES
[Pcd.IA32,Pcd.X64,Pcd.ARM,Pcd.AARCH64]
gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack ## SOMETIMES_CONSUMES
diff --git a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
index 0700f310b203..5c647c74e773 100644
--- a/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
+++ b/MdeModulePkg/Core/DxeIplPeim/X64/VirtualMemory.c
@@ -159,6 +159,13 @@ IsEnableNonExecNeeded (
return FALSE;
}
+ //
+ // Intel TDX sets this flag to FALSE.
+ //
+ if (!PcdGetBool (PcdIa32EferChangeAllowed)) {
+ return FALSE;
+ }
+
//
// XD flag (BIT63) in page table entry is only valid if IA32_EFER.NXE is set.
// Features controlled by Following PCDs need this feature to be enabled.
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 463e889e9a68..453f2a74b11d 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -2138,6 +2138,11 @@
# @Prompt GHCB Pool Size
gEfiMdeModulePkgTokenSpaceGuid.PcdGhcbSize|0|UINT64|0x00030008
+ ## This dynamic PCD indicates if IA32_EFER can be changed. The default value is TRUE but in
+ # Intel TDX change of IA32_EFER is not allowed.
+ # @Prompt The flag which indicates if IA32_EFER is allowed to be changed.
+ gEfiMdeModulePkgTokenSpaceGuid.PcdIa32EferChangeAllowed|TRUE|BOOLEAN|0x00030009
+
[PcdsDynamicEx]
## This dynamic PCD enables the default variable setting.
# Its value is the default store ID value. The default value is zero as Standard default.
--
2.29.2.windows.2
next prev parent reply other threads:[~2022-01-23 1:39 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 1:36 [PATCH V5 00/33] Enable Intel TDX in OvmfPkg (Config-A) Min Xu
2022-01-23 1:36 ` [PATCH V5 01/33] MdePkg: Add Tdx.h Min Xu
2022-01-23 1:36 ` [PATCH V5 02/33] MdePkg: Introduce basic Tdx functions in BaseLib Min Xu
2022-01-23 1:36 ` [PATCH V5 03/33] MdePkg: Add TdxLib to wrap Tdx operations Min Xu
2022-01-23 1:36 ` [PATCH V5 04/33] UefiCpuPkg: Extend VmgExitLibNull to handle #VE exception Min Xu
2022-01-23 1:36 ` [PATCH V5 05/33] OvmfPkg: Extend VmgExitLib " Min Xu
2022-01-26 11:24 ` Gerd Hoffmann
2022-01-23 1:36 ` [PATCH V5 06/33] UefiCpuPkg/CpuExceptionHandler: Add base support for the " Min Xu
2022-01-23 1:36 ` [PATCH V5 07/33] MdePkg: Add helper functions for Tdx guest in BaseIoLibIntrinsic Min Xu
2022-01-23 1:36 ` [PATCH V5 08/33] MdePkg: Support mmio " Min Xu
2022-01-23 1:36 ` [PATCH V5 09/33] MdePkg: Support IoFifo " Min Xu
2022-01-23 1:36 ` [PATCH V5 10/33] MdePkg: Support IoRead/IoWrite " Min Xu
2022-01-23 1:36 ` [PATCH V5 11/33] UefiCpuPkg: Support TDX in BaseXApicX2ApicLib Min Xu
2022-01-23 1:36 ` [PATCH V5 12/33] MdePkg: Add macro to check SEV / TDX guest Min Xu
2022-01-23 1:36 ` [PATCH V5 13/33] UefiCpuPkg: Enable Tdx support in MpInitLib Min Xu
2022-01-23 1:36 ` [PATCH V5 14/33] OvmfPkg: Add IntelTdx.h in OvmfPkg/Include/IndustryStandard Min Xu
2022-01-26 11:26 ` Gerd Hoffmann
2022-01-23 1:36 ` [PATCH V5 15/33] OvmfPkg: Add TdxMailboxLib Min Xu
2022-01-23 1:36 ` [PATCH V5 16/33] MdePkg: Add EFI_RESOURCE_ATTRIBUTE_ENCRYPTED in PiHob.h Min Xu
2022-01-23 1:36 ` [PATCH V5 17/33] OvmfPkg: Update Sec to support Tdx Min Xu
2022-01-26 11:53 ` Gerd Hoffmann
2022-01-28 6:20 ` [edk2-devel] " Min Xu
2022-01-23 1:36 ` [PATCH V5 18/33] OvmfPkg: Check Tdx in QemuFwCfgPei to avoid DMA operation Min Xu
2022-01-26 12:06 ` Gerd Hoffmann
2022-01-28 6:45 ` Min Xu
2022-01-23 1:36 ` Min Xu [this message]
2022-01-23 1:36 ` [PATCH V5 20/33] MdeModulePkg: Add PcdTdxSharedBitMask Min Xu
2022-01-23 1:36 ` [PATCH V5 21/33] UefiCpuPkg: Update AddressEncMask in CpuPageTable Min Xu
2022-01-23 1:36 ` [PATCH V5 22/33] OvmfPkg: Add PlatformInitLib Min Xu
2022-01-26 13:04 ` Gerd Hoffmann
2022-01-28 7:14 ` [edk2-devel] " Min Xu
2022-01-23 1:36 ` [PATCH V5 23/33] OvmfPkg: Refactor PlatformPei with PlatformInitLib Min Xu
2022-01-23 1:36 ` [PATCH V5 24/33] OvmfPkg: Update PlatformInitLib to support Tdx guest Min Xu
2022-01-27 10:11 ` Gerd Hoffmann
2022-01-23 1:36 ` [PATCH V5 25/33] OvmfPkg: Update PlatformPei " Min Xu
2022-01-27 10:16 ` Gerd Hoffmann
2022-02-17 8:43 ` Min Xu
2022-01-23 1:36 ` [PATCH V5 26/33] OvmfPkg: Update AcpiPlatformDxe to alter MADT table Min Xu
2022-01-23 1:36 ` [PATCH V5 27/33] OvmfPkg/BaseMemEncryptTdxLib: Add TDX helper library Min Xu
2022-01-27 10:18 ` Gerd Hoffmann
2022-01-23 1:36 ` [PATCH V5 28/33] OvmfPkg: Add TdxDxe driver Min Xu
2022-01-23 1:37 ` [PATCH V5 29/33] OvmfPkg/QemuFwCfgLib: Support Tdx in QemuFwCfgDxe Min Xu
2022-01-23 1:37 ` [PATCH V5 30/33] OvmfPkg: Update IoMmuDxe to support TDX Min Xu
2022-01-23 1:37 ` [PATCH V5 31/33] OvmfPkg: Rename XenTimerDxe to LocalApicTimerDxe Min Xu
2022-01-23 1:37 ` [PATCH V5 32/33] UefiCpuPkg: Setting initial-count register as the last step Min Xu
2022-01-23 1:37 ` [PATCH V5 33/33] OvmfPkg: Switch timer in build time for OvmfPkg 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=03c535b90c1590c9107e83c002d75c8c8c8edf21.1642899774.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