REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3996

This change added more token fixers for other node types, including
NamedComponentNode, RootComplexNode, and SmmuV3Node.

The corresponding entries for tokenFixer functions table is also updated.

Cc: Sami Mujawar <Sami.Mujawar@...>
Cc: Alexei Fedorov <Alexei.Fedorov@...>

Co-authored-by: Joe Lopez <joelopez@...>
Signed-off-by: Kun Qin <kuqin12@...>
---
DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c | 78 +++++++++++++++++++-
1 file changed, 75 insertions(+), 3 deletions(-)

diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
index 84e4bb7e3bc8..345acab53f74 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
@@ -64,6 +64,78 @@ TokenFixerItsGroup (
return EFI_SUCCESS;

}


+/** EArmObjNamedComponent token fixer.

+

+ CmObjectToken fixer function that updates the Tokens in the CmObjects.

+

+ @param [in] CmObject Pointer to the Configuration Manager Object.

+ @param [in] Token Token to be updated in the CmObject.

+

+ @retval EFI_SUCCESS Success.

+ @retval EFI_INVALID_PARAMETER A parameter is invalid.

+ @retval EFI_UNSUPPORTED Not supported.

+**/

+STATIC

+EFI_STATUS

+EFIAPI

+TokenFixerNamedComponentNode (

+ IN CM_OBJ_DESCRIPTOR *CmObject,

+ IN CM_OBJECT_TOKEN Token

+ )

+{

+ ASSERT (CmObject != NULL);

+ ((CM_ARM_NAMED_COMPONENT_NODE *)CmObject->Data)->Token = Token;

+ return EFI_SUCCESS;

+}

+

+/** EArmObjRootComplex token fixer.

+

+ CmObjectToken fixer function that updates the Tokens in the CmObjects.

+

+ @param [in] CmObject Pointer to the Configuration Manager Object.

+ @param [in] Token Token to be updated in the CmObject.

+

+ @retval EFI_SUCCESS Success.

+ @retval EFI_INVALID_PARAMETER A parameter is invalid.

+ @retval EFI_UNSUPPORTED Not supported.

+**/

+STATIC

+EFI_STATUS

+EFIAPI

+TokenFixerRootComplexNode (

+ IN CM_OBJ_DESCRIPTOR *CmObject,

+ IN CM_OBJECT_TOKEN Token

+ )

+{

+ ASSERT (CmObject != NULL);

+ ((CM_ARM_ROOT_COMPLEX_NODE *)CmObject->Data)->Token = Token;

+ return EFI_SUCCESS;

+}

+

+/** EArmObjSmmuV3 token fixer.

+

+ CmObjectToken fixer function that updates the Tokens in the CmObjects.

+

+ @param [in] CmObject Pointer to the Configuration Manager Object.

+ @param [in] Token Token to be updated in the CmObject.

+

+ @retval EFI_SUCCESS Success.

+ @retval EFI_INVALID_PARAMETER A parameter is invalid.

+ @retval EFI_UNSUPPORTED Not supported.

+**/

+STATIC

+EFI_STATUS

+EFIAPI

+TokenFixerSmmuV3Node (

+ IN CM_OBJ_DESCRIPTOR *CmObject,

+ IN CM_OBJECT_TOKEN Token

+ )

+{

+ ASSERT (CmObject != NULL);

+ ((CM_ARM_SMMUV3_NODE *)CmObject->Data)->Token = Token;

+ return EFI_SUCCESS;

+}

+

/** TokenFixer functions table.


A CmObj having a CM_OBJECT_TOKEN field might need to have its

@@ -90,10 +162,10 @@ CM_OBJECT_TOKEN_FIXER TokenFixer[EArmObjMax] = {
NULL, ///< 16 - Hypervisor Vendor Id

NULL, ///< 17 - Fixed feature flags for FADT

TokenFixerItsGroup, ///< 18 - ITS Group

- TokenFixerNotImplemented, ///< 19 - Named Component

- TokenFixerNotImplemented, ///< 20 - Root Complex

+ TokenFixerNamedComponentNode, ///< 19 - Named Component

+ TokenFixerRootComplexNode, ///< 20 - Root Complex

TokenFixerNotImplemented, ///< 21 - SMMUv1 or SMMUv2

- TokenFixerNotImplemented, ///< 22 - SMMUv3

+ TokenFixerSmmuV3Node, ///< 22 - SMMUv3

TokenFixerNotImplemented, ///< 23 - PMCG

NULL, ///< 24 - GIC ITS Identifier Array

NULL, ///< 25 - ID Mapping Array

-----Original Message-----
From: Shindo, Miki <miki.shindo@...>
Sent: Wednesday, July 20, 2022 4:28 AM
To: devel@edk2.groups.io
Cc: Andrew Fish <afish@...>; Ni, Ray <ray.ni@...>
Subject: [PATCH] EmulatorPkg/PosixFileSystem: Add NULL check on memory
allocation

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4001

This commit adds NULL check on memory allocation of the size
for FileName in ASCII string format at PosixFileSetInfo().

Signed-off-by: Miki Shindo <miki.shindo@...>
Cc: Andrew Fish <afish@...>
Cc: Ray Ni <ray.ni@...>
---
EmulatorPkg/Unix/Host/PosixFileSystem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/EmulatorPkg/Unix/Host/PosixFileSystem.c
b/EmulatorPkg/Unix/Host/PosixFileSystem.c
index ae3fe72a05..b69d3d5520 100644
--- a/EmulatorPkg/Unix/Host/PosixFileSystem.c
+++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c
@@ -1187,7 +1187,7 @@ PosixFileSetInfo (
}



OldFileName = malloc (AsciiStrSize (PrivateFile->FileName));

- if (OldFileInfo == NULL) {

+ if (OldFileName == NULL) {

goto Done;

}



--
2.27.0.windows.1

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3996

The content of token should be derived from the data section of the
`CmObject` instead of the object itself.

This change fixed the issue by dereferencing the token value from the
data buffer of input CmObject.

Cc: Sami Mujawar <Sami.Mujawar@...>
Cc: Alexei Fedorov <Alexei.Fedorov@...>

Co-authored-by: Joe Lopez <joelopez@...>
Signed-off-by: Kun Qin <kuqin12@...>
---
DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
index 80d0aa17bc1a..84e4bb7e3bc8 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/CmObjectTokenFixer.c
@@ -60,7 +60,7 @@ TokenFixerItsGroup (
)

{

ASSERT (CmObject != NULL);

- ((CM_ARM_ITS_GROUP_NODE *)CmObject)->Token = Token;

+ ((CM_ARM_ITS_GROUP_NODE *)CmObject->Data)->Token = Token;

return EFI_SUCCESS;

}

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3996

The DynamicPlatRepoLib has multiple reference to MemoryAllocationLib,
such as DynamicPlatRepo.c and TokenMapper.c. Not including it in the
library inf file could lead to potential build break.

This change added the MemoryAllocationLib into this inf file.

Cc: Sami Mujawar <Sami.Mujawar@...>
Cc: Alexei Fedorov <Alexei.Fedorov@...>

Co-authored-by: Joe Lopez <joelopez@...>
Signed-off-by: Kun Qin <kuqin12@...>
---
DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf | 1 +
1 file changed, 1 insertion(+)

diff --git a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf
index 9a3cc87fd91d..8423352550c2 100644
--- a/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf
+++ b/DynamicTablesPkg/Library/Common/DynamicPlatRepoLib/DynamicPlatRepoLib.inf
@@ -31,3 +31,4 @@ [Packages]
[LibraryClasses]

AcpiHelperLib

BaseLib

+ MemoryAllocationLib

-----Original Message-----
From: Xu, Min M <min.m.xu@...>
Sent: Sunday, June 26, 2022 11:06 AM
To: devel@edk2.groups.io
Cc: Xu, Min M <min.m.xu@...>; Leif Lindholm
<quic_llindhol@...>; Ard Biesheuvel <ardb+tianocore@...>;
Chang, Abner <abner.chang@...>; Schaefer, Daniel
<daniel.schaefer@...>; Gerd Hoffmann <kraxel@...>
Subject: [PATCH V2 3/8] EmbeddedPkg: Add AllocateRuntimePages in
PrePiMemoryAllocationLib

From: Min M Xu <min.m.xu@...>

AllocateRuntimePages is used to allocate one or more 4KB pages of type
EfiRuntimeServicesData.

Cc: Leif Lindholm <quic_llindhol@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Abner Chang <abner.chang@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
Cc: Gerd Hoffmann <kraxel@...>
Signed-off-by: Min Xu <min.m.xu@...>
---
EmbeddedPkg/Include/Library/PrePiLib.h | 19 ++++++
.../MemoryAllocationLib.c | 64 ++++++++++++++-----
2 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h
b/EmbeddedPkg/Include/Library/PrePiLib.h
index 7b2cea296f1c..3741b08c4478 100644
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -665,6 +665,25 @@ AllocatePages (
IN UINTN Pages
);

+/**
+ Allocates one or more 4KB pages of type EfiRuntimeServicesData.
+
+ Allocates the number of 4KB pages of type EfiRuntimeServicesData and
+ returns a pointer to the allocated buffer. The buffer returned is
+ aligned on a 4KB boundary. If Pages is 0, then NULL is returned. If
+ there is not enough memory remaining to satisfy the request, then NULL is
returned.
+
+ @param Pages The number of 4 KB pages to allocate.
+
+ @return A pointer to the allocated buffer or NULL if allocation fails.
+
+**/
+VOID *
+EFIAPI
+AllocateRuntimePages (
+ IN UINTN Pages
+ );
+
/**
Allocates a buffer of type EfiBootServicesData.

diff --git
a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
index 78f8da5e9527..9d7b34ad28fa 100644
---
a/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
+++
b/EmbeddedPkg/Library/PrePiMemoryAllocationLib/MemoryAllocationLib.c
@@ -14,23 +14,11 @@
#include <Library/PrePiLib.h>
#include <Library/DebugLib.h>

-/**
- Allocates one or more 4KB pages of type EfiBootServicesData.
-
- Allocates the number of 4KB pages of MemoryType and returns a pointer
to the
- allocated buffer. The buffer returned is aligned on a 4KB boundary. If
Pages is 0, then NULL
- is returned. If there is not enough memory remaining to satisfy the
request, then NULL is
- returned.
-
- @param Pages The number of 4 KB pages to allocate.
-
- @return A pointer to the allocated buffer or NULL if allocation fails.
-
-**/
VOID *
EFIAPI
-AllocatePages (
- IN UINTN Pages
+InternalAllocatePages (
+ IN UINTN Pages,
+ IN EFI_MEMORY_TYPE MemoryType
)
{
EFI_PEI_HOB_POINTERS Hob;
@@ -65,12 +53,56 @@ AllocatePages (
BuildMemoryAllocationHob (
Hob.HandoffInformationTable->EfiFreeMemoryTop,
Pages * EFI_PAGE_SIZE,
- EfiBootServicesData
+ MemoryType
);
return (VOID *)(UINTN)Hob.HandoffInformationTable-

EfiFreeMemoryTop;

}
}

+/**
+ Allocates one or more 4KB pages of type EfiBootServicesData.
+
+ Allocates the number of 4KB pages of MemoryType and returns a pointer
+ to the allocated buffer. The buffer returned is aligned on a 4KB
+ boundary. If Pages is 0, then NULL is returned. If there is not
+ enough memory remaining to satisfy the request, then NULL is returned.
+
+ @param Pages The number of 4 KB pages to allocate.
+
+ @return A pointer to the allocated buffer or NULL if allocation fails.
+
+**/
+VOID *
+EFIAPI
+AllocatePages (
+ IN UINTN Pages
+ )
+{
+ return InternalAllocatePages (Pages, EfiBootServicesData); }
+
+/**
+ Allocates one or more 4KB pages of type EfiRuntimeServicesData.
+
+ Allocates the number of 4KB pages of type EfiRuntimeServicesData and
+ returns a pointer to the allocated buffer. The buffer returned is
+ aligned on a 4KB boundary. If Pages is 0, then NULL is returned. If
+ there is not enough memory remaining to satisfy the request, then NULL is
returned.
+
+ @param Pages The number of 4 KB pages to allocate.
+
+ @return A pointer to the allocated buffer or NULL if allocation fails.
+
+**/
+VOID *
+EFIAPI
+AllocateRuntimePages (
+ IN UINTN Pages
+ )
+{
+ return InternalAllocatePages (Pages, EfiRuntimeServicesData); }
+
/**
Allocates one or more 4KB pages of type EfiBootServicesData at a specified
alignment.

--
2.29.2.windows.2

-----Original Message-----
From: Xu, Min M <min.m.xu@...>
Sent: Friday, July 1, 2022 7:29 AM
To: devel@edk2.groups.io
Cc: Xu, Min M <min.m.xu@...>; Leif Lindholm
<quic_llindhol@...>; Ard Biesheuvel <ardb+tianocore@...>;
Chang, Abner <abner.chang@...>; Schaefer, Daniel
<daniel.schaefer@...>; Aktas, Erdem <erdemaktas@...>;
James Bottomley <jejb@...>; Yao, Jiewen
<jiewen.yao@...>; Tom Lendacky <thomas.lendacky@...>;
Gerd Hoffmann <kraxel@...>
Subject: [PATCH V4 0/8] Enable secure-boot when lauch OVMF with -bios
parameter

Secure-Boot related variables include the PK/KEK/DB/DBX and they are
stored in NvVarStore (OVMF_VARS.fd). When lauching with -pflash,
QEMU/OVMF will use emulated flash, and fully support UEFI variables.
But when launching with -bios parameter, UEFI variables will be partially
emulated, and non-volatile variables may lose their contents after a reboot.
See OvmfPkg/README.

Tdx guest is an example that -pflash is not supported. So this patch-set is
designed to initialize the NvVarStore with the content of in OVMF_VARS.fd.

patch 1:
Add a new function (AllocateRuntimePages) in PrePiMemoryAllocationLib.
This function will be used in PeilessStartupLib which will run in SEC phase.

patch 2:
Delete the TdxValidateCfv in PeilessStartupLib. Because it is going to be
renamed to PlatformValidateNvVarStore and be moved to PlatformInitLib.

patch 3 - 7:
Then we add functions for EmuVariableNvStore in PlatformInitLib. This lib
will then be called in OvmfPkg/PlatformPei and PeilessStartupLib.
We also shortcut ConnectNvVarsToFileSystem in secure-boot.

patch 8:
At last a build-flag (SECURE_BOOT_FEATURE_ENABLED) is introduced in the
dsc in OvmfPkg. Because the copy over of OVMR_VARS.fd to
EmuVariableNvStore is only required when secure-boot is enabled.

Code: https://github.com/mxu9/edk2/tree/secure-boot.v4

v4 chagnes:
- "EmbeddedPkg: Add AllocateRuntimePages in PrePiMemoryAllocationLib"
is
missed in v3. It is added in this version.
- No other changes.

v3 changes:
- Renamed TdxValidateCfv to PlatformValidateNvVarStore and implemented
in PlatformInitlLib/Platform.c.
- Shortcut ConnectNvVarsToFileSystem in secure-boot.
- Other minor changes, such as adding log in
PlatformInitEmuVariableNvStore.

v2 changes:
- The v1 title is "Enable Secure-Boot in Tdx guest". Because the
patch-setwe was first designed to fix the gap when secure-boot feature
was enabled in Tdx guest. After discussing with the community (see
the disuccsions under https://edk2.groups.io/g/devel/message/90589)
this patch-set can fix the secure-boot issue when OVMF is lauched
with -bios parameter. So the title is updated.
- Add a new function (AllocateRuntimePages) in PrePiMemoryAllocationLib.
- Add build-flag SECURE_BOOT_FEATURE_ENABLED to control the copy over
of OVMF_VARS.fd to EmuVariableNvStore.

Cc: Leif Lindholm <quic_llindhol@...>
Cc: Ard Biesheuvel <ardb+tianocore@...>
Cc: Abner Chang <abner.chang@...>
Cc: Daniel Schaefer <daniel.schaefer@...>
Cc: Erdem Aktas <erdemaktas@...>
Cc: James Bottomley <jejb@...> [jejb]
Cc: Jiewen Yao <jiewen.yao@...> [jyao1]
Cc: Tom Lendacky <thomas.lendacky@...> [tlendacky]
Cc: Gerd Hoffmann <kraxel@...>
Signed-off-by: Min Xu <min.m.xu@...>

Min M Xu (8):
EmbeddedPkg: Add AllocateRuntimePages in PrePiMemoryAllocationLib
OvmfPkg/PeilessStartupLib: Delete TdxValidateCfv
OvmfPkg/PlatformInitLib: Add functions for EmuVariableNvStore
OvmfPkg/PlatformPei: Update ReserveEmuVariableNvStore
OvmfPkg: Reserve and init EmuVariableNvStore in Pei-less Startup
OvmfPkg/NvVarsFileLib: Shortcut ConnectNvVarsToFileSystem in
secure-boot
OvmfPkg/TdxDxe: Set PcdEmuVariableNvStoreReserved
OvmfPkg: Add build-flag SECURE_BOOT_FEATURE_ENABLED

EmbeddedPkg/Include/Library/PrePiLib.h | 19 ++
.../MemoryAllocationLib.c | 64 +++--
OvmfPkg/CloudHv/CloudHvX64.dsc | 9 +
OvmfPkg/Include/Library/PlatformInitLib.h | 51 ++++
OvmfPkg/IntelTdx/IntelTdxX64.dsc | 9 +
OvmfPkg/Library/NvVarsFileLib/NvVarsFileLib.c | 7 +
OvmfPkg/Library/PeilessStartupLib/IntelTdx.c | 153 -----------
.../PeilessStartupLib/PeilessStartup.c | 15 +-
.../PeilessStartupInternal.h | 17 --
OvmfPkg/Library/PlatformInitLib/Platform.c | 238 ++++++++++++++++++
.../PlatformInitLib/PlatformInitLib.inf | 3 +
OvmfPkg/OvmfPkgIa32.dsc | 9 +
OvmfPkg/OvmfPkgIa32X64.dsc | 9 +
OvmfPkg/OvmfPkgX64.dsc | 9 +
OvmfPkg/PlatformPei/Platform.c | 25 +-
OvmfPkg/TdxDxe/TdxDxe.c | 2 +
OvmfPkg/TdxDxe/TdxDxe.inf | 1 +
17 files changed, 428 insertions(+), 212 deletions(-)

--
2.29.2.windows.2