Can we use a SecMeasurementLib here? Instead of implementing all things in Startup.
> -----Original Message----- > From: Xu, Min M <min.m...@intel.com> > Sent: Friday, April 8, 2022 2:39 PM > To: devel@edk2.groups.io > Cc: Xu, Min M <min.m...@intel.com>; Ard Biesheuvel > <ardb+tianoc...@kernel.org>; Yao, Jiewen <jiewen....@intel.com>; Justen, > Jordan L <jordan.l.jus...@intel.com>; Brijesh Singh <brijesh.si...@amd.com>; > Aktas, Erdem <erdemak...@google.com>; James Bottomley > <j...@linux.ibm.com>; Tom Lendacky <thomas.lenda...@amd.com>; Gerd > Hoffmann <kra...@redhat.com> > Subject: [PATCH V2 4/8] OvmfPkg/IntelTdx: Measure Td HobList and > Configuration FV > > RFC: https://bugzilla.tianocore.org/show_bug.cgi?id=3853 > > TdHobList and Configuration FV are external data provided by Host VMM. > These are not trusted in Td guest. So they should be validated , measured > and extended to Td RTMR registers. In the meantime 2 EFI_CC_EVENT_HOB are > created. These 2 GUIDed HOBs carry the hash value of TdHobList and > Configuration FV. In DXE phase EFI_CC_EVENT can be created based on these > 2 GUIDed HOBs. > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Brijesh Singh <brijesh.si...@amd.com> > Cc: Erdem Aktas <erdemak...@google.com> > Cc: James Bottomley <j...@linux.ibm.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Tom Lendacky <thomas.lenda...@amd.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Signed-off-by: Min Xu <min.m...@intel.com> > --- > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 3 + > OvmfPkg/Library/PeilessStartupLib/IntelTdx.c | 498 ++++++++++++++++++ > .../PeilessStartupLib/PeilessStartup.c | 30 ++ > .../PeilessStartupInternal.h | 57 ++ > .../PeilessStartupLib/PeilessStartupLib.inf | 7 +- > 5 files changed, 593 insertions(+), 2 deletions(-) > create mode 100644 OvmfPkg/Library/PeilessStartupLib/IntelTdx.c > > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > index 245155d41b30..caae49d524f9 100644 > --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > @@ -520,6 +520,9 @@ > OvmfPkg/IntelTdx/Sec/SecMain.inf { > <LibraryClasses> > > NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecom > pressLib.inf > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SecCryptLib.inf > + > HashLib|SecurityPkg/Library/HashLibBaseCryptoRouter/HashLibBaseCryptoRout > erTdx.inf > + > NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf > } > > # > diff --git a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c > b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c > new file mode 100644 > index 000000000000..bb905cf5cd6a > --- /dev/null > +++ b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c > @@ -0,0 +1,498 @@ > +/** @file > + Copyright (c) 2022, Intel Corporation. All rights reserved.<BR> > + SPDX-License-Identifier: BSD-2-Clause-Patent > +**/ > + > +#include <PiPei.h> > +#include <Library/BaseLib.h> > +#include <Library/BaseMemoryLib.h> > +#include <Library/DebugLib.h> > +#include <Library/HobLib.h> > +#include <IndustryStandard/UefiTcgPlatform.h> > +#include <IndustryStandard/Tpm20.h> > +#include <Library/HashLib.h> > +#include <Protocol/CcMeasurement.h> > +#include <Guid/VariableFormat.h> > +#include <Guid/SystemNvDataGuid.h> > +#include <Guid/CcEventHob.h> > +#include <Library/PrintLib.h> > +#include "PeilessStartupInternal.h" > + > +#pragma pack(1) > + > +typedef struct { > + UINT32 count; > + TPMI_ALG_HASH hashAlg; > + BYTE sha384[SHA384_DIGEST_SIZE]; > +} TDX_DIGEST_VALUE; > + > +#define HANDOFF_TABLE_DESC "TdxTable" > +typedef struct { > + UINT8 TableDescriptionSize; > + UINT8 TableDescription[sizeof (HANDOFF_TABLE_DESC)]; > + UINT64 NumberOfTables; > + EFI_CONFIGURATION_TABLE TableEntry[1]; > +} TDX_HANDOFF_TABLE_POINTERS2; > + > +#define FV_HANDOFF_TABLE_DESC "Fv(XXXXXXXX-XXXX-XXXX-XXXX- > XXXXXXXXXXXX)" > +typedef struct { > + UINT8 BlobDescriptionSize; > + UINT8 BlobDescription[sizeof (FV_HANDOFF_TABLE_DESC)]; > + EFI_PHYSICAL_ADDRESS BlobBase; > + UINT64 BlobLength; > +} FV_HANDOFF_TABLE_POINTERS2; > + > +#pragma pack() > + > +#define INVALID_PCR2MR_INDEX 0xFF > + > +/** > + RTMR[0] => PCR[1,7] > + RTMR[1] => PCR[2,3,4,5] > + RTMR[2] => PCR[8~15] > + RTMR[3] => NA > + Note: > + PCR[0] is mapped to MRTD and should not appear here. > + PCR[6] is reserved for OEM. It is not used. > +**/ > +UINT8 > +GetMappedRtmrIndex ( > + UINT32 PCRIndex > + ) > +{ > + UINT8 RtmrIndex; > + > + if ((PCRIndex == 6) || (PCRIndex == 0) || (PCRIndex > 15)) { > + DEBUG ((DEBUG_ERROR, "Invalid PCRIndex(%d) map to MR Index.\n", > PCRIndex)); > + ASSERT (FALSE); > + return INVALID_PCR2MR_INDEX; > + } > + > + RtmrIndex = 0; > + if ((PCRIndex == 1) || (PCRIndex == 7)) { > + RtmrIndex = 0; > + } else if ((PCRIndex >= 2) && (PCRIndex < 6)) { > + RtmrIndex = 1; > + } else if ((PCRIndex >= 8) && (PCRIndex <= 15)) { > + RtmrIndex = 2; > + } > + > + return RtmrIndex; > +} > + > +/** > + Tpm measure and log data, and extend the measurement result into a specific > PCR. > + @param[in] PcrIndex PCR Index. > + @param[in] EventType Event type. > + @param[in] EventLog Measurement event log. > + @param[in] LogLen Event log length in bytes. > + @param[in] HashData The start of the data buffer to be hashed, > extended. > + @param[in] HashDataLen The length, in bytes, of the buffer > referenced by > HashData > + @retval EFI_SUCCESS Operation completed successfully. > + @retval EFI_UNSUPPORTED TPM device not available. > + @retval EFI_OUT_OF_RESOURCES Out of memory. > + @retval EFI_DEVICE_ERROR The operation was unsuccessful. > +**/ > +EFI_STATUS > +EFIAPI > +TdxMeasureAndLogData ( > + IN UINT32 PcrIndex, > + IN UINT32 EventType, > + IN VOID *EventLog, > + IN UINT32 LogLen, > + IN VOID *HashData, > + IN UINT64 HashDataLen > + ) > +{ > + EFI_STATUS Status; > + UINT32 RtmrIndex; > + VOID *EventHobData; > + TCG_PCR_EVENT2 *TcgPcrEvent2; > + UINT8 *DigestBuffer; > + TDX_DIGEST_VALUE *TdxDigest; > + TPML_DIGEST_VALUES DigestList; > + UINT8 *Ptr; > + > + RtmrIndex = GetMappedRtmrIndex (PcrIndex); > + if (RtmrIndex == INVALID_PCR2MR_INDEX) { > + return EFI_INVALID_PARAMETER; > + } > + > + DEBUG ((DEBUG_INFO, "Creating TdTcg2PcrEvent PCR[%d]/RTMR[%d] > EventType 0x%x\n", PcrIndex, RtmrIndex, EventType)); > + > + Status = HashAndExtend ( > + RtmrIndex, > + (VOID *)HashData, > + HashDataLen, > + &DigestList > + ); > + > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_INFO, "Failed to HashAndExtend. %r\n", Status)); > + return Status; > + } > + > + // > + // Use TDX_DIGEST_VALUE in the GUID HOB DataLength calculation > + // to reserve enough buffer to hold TPML_DIGEST_VALUES compact binary > + // which is limited to a SHA384 digest list > + // > + EventHobData = BuildGuidHob ( > + &gCcEventEntryHobGuid, > + sizeof (TcgPcrEvent2->PCRIndex) + sizeof > (TcgPcrEvent2->EventType) > + > + sizeof (TDX_DIGEST_VALUE) + > + sizeof (TcgPcrEvent2->EventSize) + LogLen > + ); > + > + if (EventHobData == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + > + Ptr = (UINT8 *)EventHobData; > + // > + // Initialize PcrEvent data now > + // > + RtmrIndex++; > + CopyMem (Ptr, &RtmrIndex, sizeof (UINT32)); > + Ptr += sizeof (UINT32); > + CopyMem (Ptr, &EventType, sizeof (TCG_EVENTTYPE)); > + Ptr += sizeof (TCG_EVENTTYPE); > + > + DigestBuffer = Ptr; > + > + TdxDigest = (TDX_DIGEST_VALUE *)DigestBuffer; > + TdxDigest->count = 1; > + TdxDigest->hashAlg = TPM_ALG_SHA384; > + CopyMem ( > + TdxDigest->sha384, > + DigestList.digests[0].digest.sha384, > + SHA384_DIGEST_SIZE > + ); > + > + Ptr += sizeof (TDX_DIGEST_VALUE); > + > + CopyMem (Ptr, &LogLen, sizeof (UINT32)); > + Ptr += sizeof (UINT32); > + CopyMem (Ptr, EventLog, LogLen); > + Ptr += LogLen; > + > + Status = EFI_SUCCESS; > + return Status; > +} > + > +/** > + Measure the Hoblist passed from the VMM. > + > + This function will create a unique GUID hob entry will be > + found from the TCG driver building the event log. > + This module will generate the measurement with the data in > + this hob, and log the event. > + > + @param[in] VmmHobList The Hoblist pass the firmware > + > + @retval EFI_SUCCESS Fv image is measured successfully > + or it has been already measured. > + @retval Others Other errors as indicated > +**/ > +EFI_STATUS > +EFIAPI > +MeasureHobList ( > + IN CONST VOID *VmmHobList > + ) > +{ > + EFI_PEI_HOB_POINTERS Hob; > + TDX_HANDOFF_TABLE_POINTERS2 HandoffTables; > + EFI_STATUS Status; > + > + if (!TdIsEnabled ()) { > + ASSERT (FALSE); > + return EFI_UNSUPPORTED; > + } > + > + Hob.Raw = (UINT8 *)VmmHobList; > + > + // > + // Parse the HOB list until end of list. > + // > + while (!END_OF_HOB_LIST (Hob)) { > + Hob.Raw = GET_NEXT_HOB (Hob); > + } > + > + // > + // Init the log event for HOB measurement > + // > + > + HandoffTables.TableDescriptionSize = sizeof > (HandoffTables.TableDescription); > + CopyMem (HandoffTables.TableDescription, HANDOFF_TABLE_DESC, sizeof > (HandoffTables.TableDescription)); > + HandoffTables.NumberOfTables = 1; > + CopyGuid (&(HandoffTables.TableEntry[0].VendorGuid), > &gUefiOvmfPkgTokenSpaceGuid); > + HandoffTables.TableEntry[0].VendorTable = (VOID *)VmmHobList; > + > + Status = TdxMeasureAndLogData ( > + 1, // PCRIndex > + EV_EFI_HANDOFF_TABLES2, // EventType > + (VOID *)&HandoffTables, // EventData > + sizeof (HandoffTables), // EventSize > + (UINT8 *)(UINTN)VmmHobList, // HashData > + (UINTN)((UINT8 *)Hob.Raw - (UINT8 *)VmmHobList) // HashDataLen > + ); > + > + if (EFI_ERROR (Status)) { > + ASSERT (FALSE); > + } > + > + return Status; > +} > + > +/** > + Check padding data all bit should be 1. > + > + @param[in] Buffer - A pointer to buffer header > + @param[in] BufferSize - Buffer size > + > + @retval TRUE - The padding data is valid. > + @retval TRUE - The padding data is invalid. > + > +**/ > +BOOLEAN > +CheckPaddingData ( > + IN UINT8 *Buffer, > + IN UINT32 BufferSize > + ) > +{ > + UINT32 index; > + > + for (index = 0; index < BufferSize; index++) { > + if (Buffer[index] != 0xFF) { > + return FALSE; > + } > + } > + > + return TRUE; > +} > + > +/** > + Check the integrity of CFV data. > + > + @param[in] TdxCfvBase - A pointer to CFV header > + @param[in] TdxCfvSize - CFV data size > + > + @retval TRUE - The CFV data is valid. > + @retval FALSE - The CFV data is invalid. > + > +**/ > +BOOLEAN > +EFIAPI > +TdxValidateCfv ( > + IN UINT8 *TdxCfvBase, > + IN UINT32 TdxCfvSize > + ) > +{ > + UINT16 Checksum; > + UINTN VariableBase; > + UINT32 VariableOffset; > + UINT32 VariableOffsetBeforeAlign; > + EFI_FIRMWARE_VOLUME_HEADER *CfvFvHeader; > + VARIABLE_STORE_HEADER *CfvVariableStoreHeader; > + AUTHENTICATED_VARIABLE_HEADER *VariableHeader; > + > + static EFI_GUID FvHdrGUID = EFI_SYSTEM_NV_DATA_FV_GUID; > + static EFI_GUID VarStoreHdrGUID = EFI_AUTHENTICATED_VARIABLE_GUID; > + > + VariableOffset = 0; > + > + if (TdxCfvBase == NULL) { > + DEBUG ((DEBUG_ERROR, "TDX CFV: CFV pointer is NULL\n")); > + return FALSE; > + } > + > + // > + // Verify the header zerovetor, filesystemguid, > + // revision, signature, attributes, fvlength, checksum > + // HeaderLength cannot be an odd number > + // > + CfvFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)TdxCfvBase; > + > + if ((!IsZeroBuffer (CfvFvHeader->ZeroVector, 16)) || > + (!CompareGuid (&FvHdrGUID, &CfvFvHeader->FileSystemGuid)) || > + (CfvFvHeader->Signature != EFI_FVH_SIGNATURE) || > + (CfvFvHeader->Attributes != 0x4feff) || > + (CfvFvHeader->Revision != EFI_FVH_REVISION) || > + (CfvFvHeader->FvLength != TdxCfvSize) > + ) > + { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Basic FV headers were invalid\n")); > + return FALSE; > + } > + > + // > + // Verify the header checksum > + // > + Checksum = CalculateSum16 ((VOID *)CfvFvHeader, CfvFvHeader- > >HeaderLength); > + > + if (Checksum != 0) { > + DEBUG ((DEBUG_ERROR, "TDX CFV: FV checksum was invalid\n")); > + return FALSE; > + } > + > + // > + // Verify the header signature, size, format, state > + // > + CfvVariableStoreHeader = (VARIABLE_STORE_HEADER *)(TdxCfvBase + > CfvFvHeader->HeaderLength); > + if ((!CompareGuid (&VarStoreHdrGUID, &CfvVariableStoreHeader->Signature)) > || > + (CfvVariableStoreHeader->Format != VARIABLE_STORE_FORMATTED) || > + (CfvVariableStoreHeader->State != VARIABLE_STORE_HEALTHY) || > + (CfvVariableStoreHeader->Size > (CfvFvHeader->FvLength - CfvFvHeader- > >HeaderLength)) || > + (CfvVariableStoreHeader->Size < sizeof (VARIABLE_STORE_HEADER)) > + ) > + { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Variable Store header was invalid\n")); > + return FALSE; > + } > + > + // > + // Verify the header startId, state > + // Verify data to the end > + // > + VariableBase = (UINTN)TdxCfvBase + CfvFvHeader->HeaderLength + sizeof > (VARIABLE_STORE_HEADER); > + while (VariableOffset < (CfvVariableStoreHeader->Size - sizeof > (VARIABLE_STORE_HEADER))) { > + VariableHeader = (AUTHENTICATED_VARIABLE_HEADER *)(VariableBase + > VariableOffset); > + if (VariableHeader->StartId != VARIABLE_DATA) { > + if (!CheckPaddingData ((UINT8 *)VariableHeader, CfvVariableStoreHeader- > >Size - sizeof (VARIABLE_STORE_HEADER) - VariableOffset)) { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Variable header was invalid\n")); > + return FALSE; > + } > + > + VariableOffset = CfvVariableStoreHeader->Size - sizeof > (VARIABLE_STORE_HEADER); > + } else { > + if (!((VariableHeader->State == VAR_IN_DELETED_TRANSITION) || > + (VariableHeader->State == VAR_DELETED) || > + (VariableHeader->State == VAR_HEADER_VALID_ONLY) || > + (VariableHeader->State == VAR_ADDED))) > + { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Variable header was invalid\n")); > + return FALSE; > + } > + > + VariableOffset += sizeof (AUTHENTICATED_VARIABLE_HEADER) + > VariableHeader->NameSize + VariableHeader->DataSize; > + // Verify VariableOffset should be less than or equal > CfvVariableStoreHeader->Size - sizeof(VARIABLE_STORE_HEADER) > + if (VariableOffset > (CfvVariableStoreHeader->Size - sizeof > (VARIABLE_STORE_HEADER))) { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Variable header was invalid\n")); > + return FALSE; > + } > + > + VariableOffsetBeforeAlign = VariableOffset; > + // 4 byte align > + VariableOffset = (VariableOffset + 3) & (UINTN)(~3); > + > + if (!CheckPaddingData ((UINT8 *)(VariableBase + > VariableOffsetBeforeAlign), > VariableOffset - VariableOffsetBeforeAlign)) { > + DEBUG ((DEBUG_ERROR, "TDX CFV: Variable header was invalid\n")); > + return FALSE; > + } > + } > + } > + > + return TRUE; > +} > + > +/** > + Get the FvName from the FV header. > + > + Causion: The FV is untrusted input. > + > + @param[in] FvBase Base address of FV image. > + @param[in] FvLength Length of FV image. > + > + @return FvName pointer > + @retval NULL FvName is NOT found > +**/ > +VOID * > +GetFvName ( > + IN EFI_PHYSICAL_ADDRESS FvBase, > + IN UINT64 FvLength > + ) > +{ > + EFI_FIRMWARE_VOLUME_HEADER *FvHeader; > + EFI_FIRMWARE_VOLUME_EXT_HEADER *FvExtHeader; > + > + if (FvBase >= MAX_ADDRESS) { > + return NULL; > + } > + > + if (FvLength >= MAX_ADDRESS - FvBase) { > + return NULL; > + } > + > + if (FvLength < sizeof (EFI_FIRMWARE_VOLUME_HEADER)) { > + return NULL; > + } > + > + FvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FvBase; > + if (FvHeader->ExtHeaderOffset < sizeof (EFI_FIRMWARE_VOLUME_HEADER)) > { > + return NULL; > + } > + > + if (FvHeader->ExtHeaderOffset + sizeof > (EFI_FIRMWARE_VOLUME_EXT_HEADER) > FvLength) { > + return NULL; > + } > + > + FvExtHeader = (EFI_FIRMWARE_VOLUME_EXT_HEADER *)(UINTN)(FvBase + > FvHeader->ExtHeaderOffset); > + > + return &FvExtHeader->FvName; > +} > + > +/** > + Measure FV image. > + Add it into the measured FV list after the FV is measured successfully. > + > + @param[in] FvBase Base address of FV image. > + @param[in] FvLength Length of FV image. > + @param[in] PcrIndex Index of PCR > + > + @retval EFI_SUCCESS Fv image is measured successfully > + or it has been already measured. > + @retval EFI_OUT_OF_RESOURCES No enough memory to log the new event. > + @retval EFI_DEVICE_ERROR The command was unsuccessful. > + > +**/ > +EFI_STATUS > +EFIAPI > +TdxMeasureCfvImage ( > + IN EFI_PHYSICAL_ADDRESS FvBase, > + IN UINT64 FvLength, > + IN UINT8 PcrIndex > + ) > +{ > + EFI_STATUS Status; > + FV_HANDOFF_TABLE_POINTERS2 FvBlob2; > + VOID *FvName; > + > + // > + // Init the log event for FV measurement > + // > + FvBlob2.BlobDescriptionSize = sizeof (FvBlob2.BlobDescription); > + CopyMem (FvBlob2.BlobDescription, FV_HANDOFF_TABLE_DESC, sizeof > (FvBlob2.BlobDescription)); > + FvName = GetFvName (FvBase, FvLength); > + if (FvName != NULL) { > + AsciiSPrint ((CHAR8 *)FvBlob2.BlobDescription, sizeof > (FvBlob2.BlobDescription), "Fv(%g)", FvName); > + } > + > + FvBlob2.BlobBase = FvBase; > + FvBlob2.BlobLength = FvLength; > + > + Status = TdxMeasureAndLogData ( > + 1, // PCRIndex > + EV_EFI_PLATFORM_FIRMWARE_BLOB2, // EventType > + (VOID *)&FvBlob2, // EventData > + sizeof (FvBlob2), // EventSize > + (UINT8 *)(UINTN)FvBase, // HashData > + (UINTN)(FvLength) // HashDataLen > + ); > + > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "The FV which failed to be measured starts at: > 0x%x\n", FvBase)); > + ASSERT (FALSE); > + } > + > + return Status; > +} > diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c > b/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c > index 126eb74048f4..aea7f98da92d 100644 > --- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c > +++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c > @@ -133,11 +133,13 @@ PeilessStartup ( > UINT32 DxeCodeSize; > TD_RETURN_DATA TdReturnData; > VOID *VmmHobList; > + UINT8 *CfvBase; > > Status = EFI_SUCCESS; > BootFv = NULL; > VmmHobList = NULL; > SecCoreData = (EFI_SEC_PEI_HAND_OFF *)Context; > + CfvBase = (UINT8 *)(UINTN)FixedPcdGet32 (PcdCfvBase); > > ZeroMem (&PlatformInfoHob, sizeof (PlatformInfoHob)); > > @@ -167,6 +169,34 @@ PeilessStartup ( > > DEBUG ((DEBUG_INFO, "HobList: %p\n", GetHobList ())); > > + if (TdIsEnabled ()) { > + // > + // Measure HobList > + // > + Status = MeasureHobList (VmmHobList); > + if (EFI_ERROR (Status)) { > + ASSERT (FALSE); > + CpuDeadLoop (); > + } > + > + // > + // Validate Tdx CFV > + // > + if (!TdxValidateCfv (CfvBase, FixedPcdGet32 (PcdCfvRawDataSize))) { > + ASSERT (FALSE); > + CpuDeadLoop (); > + } > + > + // > + // Measure Tdx CFV > + // > + Status = TdxMeasureCfvImage ((EFI_PHYSICAL_ADDRESS)(UINTN)CfvBase, > FixedPcdGet32 (PcdCfvRawDataSize), 1); > + if (EFI_ERROR (Status)) { > + ASSERT (FALSE); > + CpuDeadLoop (); > + } > + } > + > // > // Initialize the Platform > // > diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupInternal.h > b/OvmfPkg/Library/PeilessStartupLib/PeilessStartupInternal.h > index 23e9e0be53f1..2a100270ff20 100644 > --- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupInternal.h > +++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartupInternal.h > @@ -52,4 +52,61 @@ EFIAPI > ConstructSecHobList ( > ); > > +/** > + Measure the Hoblist passed from the VMM. > + > + This function will create a unique GUID hob entry will be > + found from the TCG driver building the event log. > + This module will generate the measurement with the data in > + this hob, and log the event. > + > + @param[in] VmmHobList The Hoblist pass the firmware > + > + @retval EFI_SUCCESS Fv image is measured successfully > + or it has been already measured. > + @retval Others Other errors as indicated > +**/ > +EFI_STATUS > +EFIAPI > +MeasureHobList ( > + IN CONST VOID *VmmHobList > + ); > + > +/** > + Check the integrity of CFV data. > + > + @param[in] TdxCfvBase - A pointer to CFV header > + @param[in] TdxCfvSize - CFV data size > + > + @retval TRUE - The CFV data is valid. > + @retval FALSE - The CFV data is invalid. > + > +**/ > +BOOLEAN > +EFIAPI > +TdxValidateCfv ( > + IN UINT8 *TdxCfvBase, > + IN UINT32 TdxCfvSize > + ); > + > +/** > + Measure FV image. > + Add it into the measured FV list after the FV is measured successfully. > + > + @param[in] FvBase Base address of FV image. > + @param[in] FvLength Length of FV image. > + @param[in] PcrIndex Index of PCR > + > + @retval EFI_SUCCESS Fv image is measured successfully > + or it has been already measured. > + @retval Others Other errors as indicated > +**/ > +EFI_STATUS > +EFIAPI > +TdxMeasureCfvImage ( > + IN EFI_PHYSICAL_ADDRESS FvBase, > + IN UINT64 FvLength, > + IN UINT8 PcrIndex > + ); > + > #endif > diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf > b/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf > index 8791984586a4..178b4c35d472 100644 > --- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf > +++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartupLib.inf > @@ -29,8 +29,7 @@ > PeilessStartup.c > Hob.c > DxeLoad.c > - > -[Sources.X64] > + IntelTdx.c > X64/VirtualMemory.c > > [Packages] > @@ -39,6 +38,8 @@ > UefiCpuPkg/UefiCpuPkg.dec > OvmfPkg/OvmfPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > + CryptoPkg/CryptoPkg.dec > + SecurityPkg/SecurityPkg.dec > > [LibraryClasses] > BaseLib > @@ -56,6 +57,7 @@ > PrePiLib > QemuFwCfgLib > PlatformInitLib > + HashLib > > [Guids] > gEfiHobMemoryAllocModuleGuid > @@ -63,6 +65,7 @@ > gUefiOvmfPkgPlatformInfoGuid > gEfiMemoryTypeInformationGuid > gPcdDataBaseHobGuid > + gCcEventEntryHobGuid > > [Pcd] > gUefiOvmfPkgTokenSpaceGuid.PcdCfvBase > -- > 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#88597): https://edk2.groups.io/g/devel/message/88597 Mute This Topic: https://groups.io/mt/90330666/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
