From nobody Mon Dec 23 17:15:20 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 151667929221916.43654379307145; Mon, 22 Jan 2018 19:48:12 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6A1462233379B; Mon, 22 Jan 2018 19:42:44 -0800 (PST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 68A3F22333762 for ; Mon, 22 Jan 2018 19:42:42 -0800 (PST) Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2018 19:48:08 -0800 Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.135]) by orsmga008.jf.intel.com with ESMTP; 22 Jan 2018 19:48:07 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=dandan.bi@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,399,1511856000"; d="scan'208";a="12262534" From: Dandan Bi To: edk2-devel@lists.01.org Date: Tue, 23 Jan 2018 11:47:30 +0800 Message-Id: <1516679255-12328-4-git-send-email-dandan.bi@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1516679255-12328-1-git-send-email-dandan.bi@intel.com> References: <1516679255-12328-1-git-send-email-dandan.bi@intel.com> Subject: [edk2] [patch 3/8] MdeModulePkg/DxeCorePerformanceLib:Track FPDT record in DXE phase X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Star Zeng , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Updated to convert Pref enrty to FPDT record in DXE phase and then export records to FPDT table. Cc: Liming Gao Cc: Star Zeng Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dandan Bi --- .../DxeCorePerformanceLib/DxeCorePerformanceLib.c | 1130 ++++++++++++++--= ---- .../DxeCorePerformanceLib.inf | 14 +- .../DxeCorePerformanceLibInternal.h | 14 +- 3 files changed, 839 insertions(+), 319 deletions(-) diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceL= ib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c index 7c0e207..6c7dd35 100644 --- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c +++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c @@ -8,11 +8,11 @@ which are consumed by DxePerformanceLib to logging performance data in D= XE phase. =20 This library is mainly used by DxeCore to start performance logging to e= nsure that Performance Protocol is installed at the very beginning of DXE phase. =20 -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
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 http://opensource.org/licenses/bsd-license.php @@ -23,27 +23,36 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITH= ER EXPRESS OR IMPLIED. **/ =20 =20 #include "DxeCorePerformanceLibInternal.h" =20 - -// -// The data structure to hold global performance data. -// -GAUGE_DATA_HEADER *mGaugeData; - -// -// The current maximum number of logging entries. If current number of=20 -// entries exceeds this value, it will re-allocate a larger array and -// migration the old data to the larger array. -// -UINT32 mMaxGaugeRecords; - // -// The handle to install Performance Protocol instance. +// Data for FPDT performance records. // -EFI_HANDLE mHandle =3D NULL; +#define STRING_SIZE (EDKII_STRING_EVENT_RECORD_NAME_LENGTH * s= izeof (CHAR8)) +#define MAX_RECORD_SIZE (sizeof (FPDT_RECORD) + STRING_SIZE) +#define FIRMWARE_RECORD_BUFFER 0x100000 +#define CACHE_HANDLE_GUID_COUNT 0x1000 + +typedef struct { + EFI_HANDLE Handle; + CHAR8 NameString[EDKII_STRING_EVENT_RECORD_NAME_LENGTH]; + EFI_GUID ModuleGuid; +} HANDLE_GUID_MAP; + +HANDLE_GUID_MAP mCacheHandleGuidTable[CACHE_HANDLE_GUID_COUNT]; +UINTN mCachePairCount =3D 0; + +UINT32 mLoadImageCount =3D 0; +UINTN mPerformanceLength =3D 0; +UINTN mMaxPerformanceLength =3D 0; +BOOLEAN mFpdtDataIsReported =3D FALSE; +BOOLEAN mStartFpdtDataReport =3D FALSE; +CHAR8 *mPlatformLanguage =3D NULL; +UINT8 *mPerformancePointer =3D NULL; + +EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText =3D NULL; =20 // // Interfaces for Performance Protocol. // PERFORMANCE_PROTOCOL mPerformanceInterface =3D { @@ -61,179 +70,837 @@ PERFORMANCE_EX_PROTOCOL mPerformanceExInterface =3D { GetGaugeEx }; =20 PERFORMANCE_PROPERTY mPerformanceProperty; =20 -// -// Gauge record lock to avoid data corruption or even memory overflow -// -STATIC EFI_LOCK mPerfRecordLock =3D EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTI= FY); +/** +Check whether the Token is a known one which is uesed by core. + +@param Token Pointer to a Null-terminated ASCII string + +@retval TRUE Is a known one used by core. +@retval FALSE Not a known one. + +**/ +BOOLEAN +IsKnownTokens ( + IN CONST CHAR8 *Token + ) +{ + if (AsciiStrCmp (Token, SEC_TOK) =3D=3D 0 || + AsciiStrCmp (Token, PEI_TOK) =3D=3D 0 || + AsciiStrCmp (Token, DXE_TOK) =3D=3D 0 || + AsciiStrCmp (Token, BDS_TOK) =3D=3D 0 || + AsciiStrCmp (Token, DRIVERBINDING_START_TOK) =3D=3D 0 || + AsciiStrCmp (Token, DRIVERBINDING_SUPPORT_TOK) =3D=3D 0 || + AsciiStrCmp (Token, DRIVERBINDING_STOP_TOK) =3D=3D 0 || + AsciiStrCmp (Token, LOAD_IMAGE_TOK) =3D=3D 0 || + AsciiStrCmp (Token, START_IMAGE_TOK) =3D=3D 0 || + AsciiStrCmp (Token, PEIM_TOK) =3D=3D 0) { + return TRUE; + } else { + return FALSE; + } +} =20 /** - Searches in the gauge array with keyword Handle, Token, Module and Ident= ifier. +Check whether the ID is a known one which map to the known Token. + +@param Identifier 32-bit identifier. + +@retval TRUE Is a known one used by core. +@retval FALSE Not a known one. + +**/ +BOOLEAN +IsKnownID ( + IN UINT32 Identifier + ) +{ + if (Identifier =3D=3D MODULE_START_ID || + Identifier =3D=3D MODULE_END_ID || + Identifier =3D=3D MODULE_LOADIMAGE_START_ID || + Identifier =3D=3D MODULE_LOADIMAGE_END_ID || + Identifier =3D=3D MODULE_DB_START_ID || + Identifier =3D=3D MODULE_DB_END_ID || + Identifier =3D=3D MODULE_DB_SUPPORT_START_ID || + Identifier =3D=3D MODULE_DB_SUPPORT_END_ID || + Identifier =3D=3D MODULE_DB_STOP_START_ID || + Identifier =3D=3D MODULE_DB_STOP_END_ID) { + return TRUE; + } else { + return FALSE; + } +} + +/** + Get a human readable module name and module guid for the given image han= dle. + If module name can't be found, "" string will return. + If module guid can't be found, Zero Guid will return. + + @param Handle Image handle or Controller handle. + @param NameString The ascii string will be filled into it. If not = found, null string will return. + @param BufferSize Size of the input NameString buffer. + @param ModuleGuid Point to the guid buffer to store the got module= guid value. + + @retval EFI_SUCCESS Successfully get module name and guid. + @retval EFI_INVALID_PARAMETER The input parameter NameString is NULL. + @retval other value Module Name can't be got. +**/ +EFI_STATUS +GetModuleInfoFromHandle ( + IN EFI_HANDLE Handle, + OUT CHAR8 *NameString, + IN UINTN BufferSize, + OUT EFI_GUID *ModuleGuid OPTIONAL + ) +{ + EFI_STATUS Status; + EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; + EFI_DRIVER_BINDING_PROTOCOL *DriverBinding; + CHAR8 *PdbFileName; + EFI_GUID *TempGuid; + UINTN StartIndex; + UINTN Index; + INTN Count; + BOOLEAN ModuleGuidIsGet; + UINTN StringSize; + CHAR16 *StringPtr; + EFI_COMPONENT_NAME2_PROTOCOL *ComponentName2; + MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFilePath; + + if (NameString =3D=3D NULL || BufferSize =3D=3D 0) { + return EFI_INVALID_PARAMETER; + } + // + // Try to get the ModuleGuid and name string form the caached array. + // + if (mCachePairCount > 0) { + for (Count =3D mCachePairCount -1; Count >=3D 0; Count--) { + if (Handle =3D=3D mCacheHandleGuidTable[Count].Handle) { + CopyGuid (ModuleGuid, &mCacheHandleGuidTable[Count].ModuleGuid); + AsciiStrCpyS (NameString, EDKII_STRING_EVENT_RECORD_NAME_LENGTH, m= CacheHandleGuidTable[Count].NameString); + return EFI_SUCCESS; + } + } + } + + Status =3D EFI_INVALID_PARAMETER; + LoadedImage =3D NULL; + ModuleGuidIsGet =3D FALSE; + + // + // Initialize GUID as zero value. + // + TempGuid =3D &gZeroGuid; + // + // Initialize it as "" string. + // + NameString[0] =3D 0; + + if (Handle !=3D NULL) { + // + // Try Handle as ImageHandle. + // + Status =3D gBS->HandleProtocol ( + Handle, + &gEfiLoadedImageProtocolGuid, + (VOID**) &LoadedImage + ); + + if (EFI_ERROR (Status)) { + // + // Try Handle as Controller Handle + // + Status =3D gBS->OpenProtocol ( + Handle, + &gEfiDriverBindingProtocolGuid, + (VOID **) &DriverBinding, + NULL, + NULL, + EFI_OPEN_PROTOCOL_GET_PROTOCOL + ); + if (!EFI_ERROR (Status)) { + // + // Get Image protocol from ImageHandle + // + Status =3D gBS->HandleProtocol ( + DriverBinding->ImageHandle, + &gEfiLoadedImageProtocolGuid, + (VOID**) &LoadedImage + ); + } + } + } + + if (!EFI_ERROR (Status) && LoadedImage !=3D NULL) { + // + // Get Module Guid from DevicePath. + // + if (LoadedImage->FilePath !=3D NULL && + LoadedImage->FilePath->Type =3D=3D MEDIA_DEVICE_PATH && + LoadedImage->FilePath->SubType =3D=3D MEDIA_PIWG_FW_FILE_DP + ) { + // + // Determine GUID associated with module logging performance + // + ModuleGuidIsGet =3D TRUE; + FvFilePath =3D (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *) LoadedImag= e->FilePath; + TempGuid =3D &FvFilePath->FvFileName; + } + + // + // Method 1 Get Module Name from PDB string. + // + PdbFileName =3D PeCoffLoaderGetPdbPointer (LoadedImage->ImageBase); + if (PdbFileName !=3D NULL && BufferSize > 0) { + StartIndex =3D 0; + for (Index =3D 0; PdbFileName[Index] !=3D 0; Index++) { + if ((PdbFileName[Index] =3D=3D '\\') || (PdbFileName[Index] =3D=3D= '/')) { + StartIndex =3D Index + 1; + } + } + // + // Copy the PDB file name to our temporary string. + // If the length is bigger than BufferSize, trim the redudant charac= ters to avoid overflow in array boundary. + // + for (Index =3D 0; Index < BufferSize - 1; Index++) { + NameString[Index] =3D PdbFileName[Index + StartIndex]; + if (NameString[Index] =3D=3D 0 || NameString[Index] =3D=3D '.') { + NameString[Index] =3D 0; + break; + } + } + + if (Index =3D=3D BufferSize - 1) { + NameString[Index] =3D 0; + } + // + // Module Name is got. + // + goto Done; + } + } + + // + // Method 2: Get the name string from ComponentName2 protocol + // + Status =3D gBS->HandleProtocol ( + Handle, + &gEfiComponentName2ProtocolGuid, + (VOID **) &ComponentName2 + ); + if (!EFI_ERROR (Status)) { + // + // Get the current platform language setting + // + if (mPlatformLanguage =3D=3D NULL) { + GetEfiGlobalVariable2 (L"PlatformLang", (VOID **) &mPlatformLanguage= , NULL); + } + if (mPlatformLanguage !=3D NULL) { + Status =3D ComponentName2->GetDriverName ( + ComponentName2, + mPlatformLanguage !=3D NULL ? mPlatformLa= nguage : "en-US", + &StringPtr + ); + if (!EFI_ERROR (Status)) { + for (Index =3D 0; Index < BufferSize - 1 && StringPtr[Index] !=3D = 0; Index++) { + NameString[Index] =3D (CHAR8) StringPtr[Index]; + } + NameString[Index] =3D 0; + // + // Module Name is got. + // + goto Done; + } + } + } + + if (ModuleGuidIsGet) { + // + // Method 3 Try to get the image's FFS UI section by image GUID + // + StringPtr =3D NULL; + StringSize =3D 0; + Status =3D GetSectionFromAnyFv ( + TempGuid, + EFI_SECTION_USER_INTERFACE, + 0, + (VOID **) &StringPtr, + &StringSize + ); + + if (!EFI_ERROR (Status)) { + // + // Method 3. Get the name string from FFS UI section + // + for (Index =3D 0; Index < BufferSize - 1 && StringPtr[Index] !=3D 0;= Index++) { + NameString[Index] =3D (CHAR8) StringPtr[Index]; + } + NameString[Index] =3D 0; + FreePool (StringPtr); + } + } + +Done: + // + // Copy Module Guid + // + if (ModuleGuid !=3D NULL) { + CopyGuid (ModuleGuid, TempGuid); + if (IsZeroGuid(TempGuid) && (Handle !=3D NULL) && !ModuleGuidIsGet) { + // Handle is GUID + CopyGuid (ModuleGuid, (EFI_GUID *) Handle); + } + } =20 - This internal function searches for the gauge entry in the gauge array. - If there is an entry that exactly matches the given keywords - and its end time stamp is zero, then the index of that gauge entry is re= turned; - otherwise, the the number of gauge entries in the array is returned. + // + // Cache the Handle and Guid pairs. + // + if (mCachePairCount < CACHE_HANDLE_GUID_COUNT) { + mCacheHandleGuidTable[mCachePairCount].Handle =3D Handle; + CopyGuid (&mCacheHandleGuidTable[mCachePairCount].ModuleGuid, ModuleGu= id); + AsciiStrCpyS (mCacheHandleGuidTable[mCachePairCount].NameString, EDKII= _STRING_EVENT_RECORD_NAME_LENGTH, NameString); + mCachePairCount ++; + } + + return Status; +} =20 +/** + Get the FPDT record info. + + @param IsStart TRUE if the performance log is start log. @param Handle Pointer to environment specific context = used to identify the component being measured. @param Token Pointer to a Null-terminated ASCII string that identifies the component being meas= ured. @param Module Pointer to a Null-terminated ASCII string that identifies the module being measure= d. - @param Identifier 32-bit identifier. + @param RecordInfo On return, pointer to the info of the re= cord. + @param UseModuleName Only useful for DYNAMIC_STRING_EVENT_TYP= E, indicate that whether need use + Module name to fill the string field in = the DYNAMIC_STRING_EVENT_RECORD. =20 - @retval The index of gauge entry in the array. + @retval EFI_SUCCESS Get record info successfully. + @retval EFI_UNSUPPORTED No matched FPDT record. =20 **/ -UINT32 -InternalSearchForGaugeEntry ( - IN CONST VOID *Handle, OPTIONAL - IN CONST CHAR8 *Token, OPTIONAL - IN CONST CHAR8 *Module, OPTIONAL - IN UINT32 Identifier +EFI_STATUS +GetFpdtRecordInfo ( + IN BOOLEAN IsStart, + IN CONST VOID *Handle, + IN CONST CHAR8 *Token, + IN CONST CHAR8 *Module, + OUT BASIC_RECORD_INFO *RecordInfo, + IN OUT BOOLEAN *UseModuleName ) { - UINT32 Index; - UINT32 Index2; - UINT32 NumberOfEntries; - GAUGE_DATA_ENTRY_EX *GaugeEntryExArray; + UINT16 RecordType; + UINTN StringSize; =20 - if (Token =3D=3D NULL) { - Token =3D ""; - } - if (Module =3D=3D NULL) { - Module =3D ""; + RecordType =3D DYNAMIC_STRING_EVENT_TYPE; + + // + // Token to Type and Id. + // + if (Token !=3D NULL) { + if (AsciiStrCmp (Token, START_IMAGE_TOK) =3D=3D 0) { //= "StartImage:" + *UseModuleName =3D TRUE; + RecordType =3D GUID_EVENT_TYPE; + if (IsStart) { + RecordInfo->ProgressID =3D MODULE_START_ID; + } else { + RecordInfo->ProgressID =3D MODULE_END_ID; + } + } else if (AsciiStrCmp (Token, LOAD_IMAGE_TOK) =3D=3D 0) { //= "LoadImage:" + *UseModuleName =3D TRUE; + RecordType =3D GUID_QWORD_EVENT_TYPE; + if (IsStart) { + RecordInfo->ProgressID =3D MODULE_LOADIMAGE_START_ID; + } else { + RecordInfo->ProgressID =3D MODULE_LOADIMAGE_END_ID; + } + } else if (AsciiStrCmp (Token, DRIVERBINDING_START_TOK) =3D=3D 0) { /= / "DB:Start:" + *UseModuleName =3D TRUE; + if (IsStart) { + RecordInfo->ProgressID =3D MODULE_DB_START_ID; + RecordType =3D GUID_QWORD_EVENT_TYPE; + } else { + RecordInfo->ProgressID =3D MODULE_DB_END_ID; + RecordType =3D GUID_QWORD_STRING_EVENT_TYPE; + } + } else if (AsciiStrCmp (Token, DRIVERBINDING_SUPPORT_TOK) =3D=3D 0) { = // "DB:Support:" + *UseModuleName =3D TRUE; + if (PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) { + return RETURN_UNSUPPORTED; + } + RecordType =3D GUID_QWORD_EVENT_TYPE; + if (IsStart) { + RecordInfo->ProgressID =3D MODULE_DB_SUPPORT_START_ID; + } else { + RecordInfo->ProgressID =3D MODULE_DB_SUPPORT_END_ID; + } + } else if (AsciiStrCmp (Token, DRIVERBINDING_STOP_TOK) =3D=3D 0) { = // "DB:Stop:" + *UseModuleName =3D TRUE; + if (PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) { + return RETURN_UNSUPPORTED; + } + RecordType =3D GUID_QWORD_EVENT_TYPE; + if (IsStart) { + RecordInfo->ProgressID =3D MODULE_DB_STOP_START_ID; + } else { + RecordInfo->ProgressID =3D MODULE_DB_STOP_END_ID; + } + } else if (AsciiStrCmp (Token, PEI_TOK) =3D=3D 0 || = // "PEI" + AsciiStrCmp (Token, DXE_TOK) =3D=3D 0 || = // "DXE" + AsciiStrCmp (Token, BDS_TOK) =3D=3D 0) { = // "BDS" + if (IsStart) { + RecordInfo->ProgressID =3D PERF_CROSSMODULE_START_ID; + } else { + RecordInfo->ProgressID =3D PERF_CROSSMODULE_END_ID; + } + } else { // P= ref used in Modules. + if (IsStart) { + RecordInfo->ProgressID =3D PERF_INMODULE_START_ID; + } else { + RecordInfo->ProgressID =3D PERF_INMODULE_END_ID; + } + } + } else if (Handle!=3D NULL || Module !=3D NULL) { = // Pref used in Modules. + if (IsStart) { + RecordInfo->ProgressID =3D PERF_INMODULE_START_ID; + } else { + RecordInfo->ProgressID =3D PERF_INMODULE_END_ID; + } + } else { + return EFI_UNSUPPORTED; } =20 - NumberOfEntries =3D mGaugeData->NumberOfEntries; - GaugeEntryExArray =3D (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1); + // + // Get Record size baesed on the record type. + // When PcdEdkiiFpdtStringRecordEnableOnly is TRUE, all records are with= type of DYNAMIC_STRING_EVENT_TYPE. + // + if (PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) { + RecordType =3D DYNAMIC_STRING_EVENT_TYPE; + RecordInfo->RecordSize =3D sizeof (DYNAMIC_STRING_EVENT_RECORD) + ST= RING_SIZE; + } else { + switch (RecordType) { + case GUID_EVENT_TYPE: + RecordInfo->RecordSize =3D sizeof (GUID_EVENT_RECORD); + break; =20 - Index2 =3D 0; + case DYNAMIC_STRING_EVENT_TYPE: + if (*UseModuleName) { + StringSize =3D STRING_SIZE; + } else if (Token !=3D NULL) { + StringSize =3D AsciiStrSize (Token); + } else if (Module !=3D NULL) { + StringSize =3D AsciiStrSize (Module); + } else { + StringSize =3D STRING_SIZE; + } + if (StringSize > STRING_SIZE) { + StringSize =3D STRING_SIZE; + } + RecordInfo->RecordSize =3D (UINT8)(sizeof (DYNAMIC_STRING_EVENT_RECO= RD) + StringSize); + break; =20 - for (Index =3D 0; Index < NumberOfEntries; Index++) { - Index2 =3D NumberOfEntries - 1 - Index; - if (GaugeEntryExArray[Index2].EndTimeStamp =3D=3D 0 && - (GaugeEntryExArray[Index2].Handle =3D=3D (EFI_PHYSICAL_ADDRESS) (U= INTN) Handle) && - AsciiStrnCmp (GaugeEntryExArray[Index2].Token, Token, DXE_PERFORMA= NCE_STRING_LENGTH) =3D=3D 0 && - AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module, DXE_PERFOR= MANCE_STRING_LENGTH) =3D=3D 0) { - Index =3D Index2; + case GUID_QWORD_EVENT_TYPE: + RecordInfo->RecordSize =3D (UINT8)sizeof (GUID_QWORD_EVENT_RECORD); break; + + case GUID_QWORD_STRING_EVENT_TYPE: + RecordInfo->RecordSize =3D (UINT8)sizeof (GUID_QWORD_STRING_EVENT_RE= CORD); + break; + + default: + // + // Record is unsupported yet, return EFI_UNSUPPORTED + // + return EFI_UNSUPPORTED; } } =20 - return Index; + RecordInfo->Type =3D RecordType; + return EFI_SUCCESS; } =20 /** - Adds a record at the end of the performance measurement log - that records the start time of a performance measurement. - - Adds a record to the end of the performance measurement log - that contains the Handle, Token, Module and Identifier. - The end time of the new record must be set to zero. - If TimeStamp is not zero, then TimeStamp is used to fill in the start ti= me in the record. - If TimeStamp is zero, the start time in the record is filled in with the= value - read from the current time stamp. + Add performance log to FPDT boot record table. =20 + @param IsStart TRUE if the performance log is start log. @param Handle Pointer to environment specific context = used to identify the component being measured. @param Token Pointer to a Null-terminated ASCII string that identifies the component being meas= ured. @param Module Pointer to a Null-terminated ASCII string that identifies the module being measure= d. - @param TimeStamp 64-bit time stamp. + @param Ticker 64-bit time stamp. @param Identifier 32-bit identifier. If the value is 0, th= e created record is same as the one created by StartGauge= of PERFORMANCE_PROTOCOL. =20 - @retval EFI_SUCCESS The data was read correctly from the dev= ice. + @retval EFI_SUCCESS Add FPDT boot record. @retval EFI_OUT_OF_RESOURCES There are not enough resources to record= the measurement. + @retval EFI_UNSUPPORTED No matched FPDT record. =20 **/ EFI_STATUS -EFIAPI -StartGaugeEx ( +InsertFpdtMeasurement ( + IN BOOLEAN IsStart, IN CONST VOID *Handle, OPTIONAL IN CONST CHAR8 *Token, OPTIONAL IN CONST CHAR8 *Module, OPTIONAL - IN UINT64 TimeStamp, + IN UINT64 Ticker, IN UINT32 Identifier ) { - GAUGE_DATA_ENTRY_EX *GaugeEntryExArray; - UINTN GaugeDataSize; - GAUGE_DATA_HEADER *NewGaugeData; - UINTN OldGaugeDataSize; - GAUGE_DATA_HEADER *OldGaugeData; - UINT32 Index; - EFI_STATUS Status; + EFI_GUID ModuleGuid; + CHAR8 ModuleName[EDKII_STRING_EVENT_RECORD_NAME_L= ENGTH]; + UINT8 FpdtRecord[MAX_RECORD_SIZE]; + EFI_STATUS Status; + FPDT_RECORD_PTR FpdtRecordPtr; + BASIC_RECORD_INFO RecordInfo; + UINT64 TimeStamp; + UINTN DestMax; + UINTN StrLength; + CONST CHAR8 *StringPtr; + BOOLEAN UseModuleName; + + StringPtr =3D NULL; + UseModuleName =3D FALSE; + ZeroMem (ModuleName, sizeof (ModuleName)); + ZeroMem (FpdtRecord, sizeof (FpdtRecord)); =20 - Status =3D EfiAcquireLockOrFail (&mPerfRecordLock); + // + // Get record info (type, size, ProgressID and Module Guid). + // + Status =3D GetFpdtRecordInfo (IsStart, Handle, Token, Module, &RecordInf= o, &UseModuleName); if (EFI_ERROR (Status)) { return Status; } =20 - Index =3D mGaugeData->NumberOfEntries; - if (Index >=3D mMaxGaugeRecords) { + // + // If PERF_START()/PERF_END() have specified the ProgressID,it has high = priority. + // !!! Note: If the Pref is not the known Token used in the core but hav= e same + // ID with the core Token, this case will not be supported. + // And in currtnt usage mode, for the unkown ID, there is a general rule: + // If it is start pref: the lower 4 bits of the ID should be 0. + // If it is end pref: the lower 4 bits of the ID should not be 0. + // If input ID doesn't follow the rule, we will adjust it. + // + if ((Identifier !=3D 0) && (IsKnownID (Identifier)) && (!IsKnownTokens (= Token))) { + return EFI_UNSUPPORTED; + } else if ((Identifier !=3D 0) && (!IsKnownID (Identifier)) && (!IsKnown= Tokens (Token))) { + if (IsStart && ((Identifier & 0x000F) !=3D 0)) { + Identifier &=3D 0xFFF0; + } else if ((!IsStart) && ((Identifier & 0x000F) =3D=3D 0)) { + Identifier +=3D 1; + } + RecordInfo.ProgressID =3D (UINT16)Identifier; + } + + if (mFpdtDataIsReported) { + FpdtRecordPtr.RecordHeader =3D (EFI_ACPI_5_0_FPDT_PERFORMANCE_RECORD_H= EADER *)FpdtRecord; + } else { + if (mStartFpdtDataReport) { + return EFI_UNSUPPORTED; + } + // + // Check if pre-allocated buffer is full + // + if (mPerformanceLength + RecordInfo.RecordSize > mMaxPerformanceLength= ) { + mPerformancePointer =3D ReallocatePool ( + mPerformanceLength, + mPerformanceLength + RecordInfo.RecordSize += FIRMWARE_RECORD_BUFFER, + mPerformancePointer + ); + + if (mPerformancePointer =3D=3D NULL) { + return EFI_OUT_OF_RESOURCES; + } + mMaxPerformanceLength =3D mPerformanceLength + RecordInfo.RecordSize= + FIRMWARE_RECORD_BUFFER; + } // - // Try to enlarge the scale of gauge array. + // Covert buffer to FPDT Ptr Union type. // - OldGaugeData =3D mGaugeData; - OldGaugeDataSize =3D sizeof (GAUGE_DATA_HEADER) + sizeof (GAUGE_DATA_= ENTRY_EX) * mMaxGaugeRecords; + FpdtRecordPtr.RecordHeader =3D (EFI_ACPI_5_0_FPDT_PERFORMANCE_RECORD_H= EADER *)(mPerformancePointer + mPerformanceLength); + } + FpdtRecordPtr.RecordHeader->Length =3D 0; =20 - GaugeDataSize =3D sizeof (GAUGE_DATA_HEADER) + sizeof (GAUGE_DATA_= ENTRY_EX) * mMaxGaugeRecords * 2; + // + // Get the TimeStamp. + // + if (Ticker =3D=3D 0) { + Ticker =3D GetPerformanceCounter (); + TimeStamp =3D GetTimeInNanoSecond (Ticker); + } else if (Ticker =3D=3D 1) { + TimeStamp =3D 0; + } else { + TimeStamp =3D GetTimeInNanoSecond (Ticker); + } =20 - NewGaugeData =3D AllocateZeroPool (GaugeDataSize); - if (NewGaugeData =3D=3D NULL) { - EfiReleaseLock (&mPerfRecordLock); - return EFI_OUT_OF_RESOURCES; + // + // Get the ModuleName and ModuleGuid form the handle. + // + GetModuleInfoFromHandle ((EFI_HANDLE *)Handle, ModuleName, sizeof (Modul= eName), &ModuleGuid); + + // + // Fill in the record information. + // + switch (RecordInfo.Type) { + case GUID_EVENT_TYPE: + FpdtRecordPtr.GuidEvent->Header.Type =3D GUID_EVENT_TYP= E; + FpdtRecordPtr.GuidEvent->Header.Length =3D RecordInfo.Rec= ordSize; + FpdtRecordPtr.GuidEvent->Header.Revision =3D RECORD_REVISIO= N_1; + FpdtRecordPtr.GuidEvent->ProgressID =3D RecordInfo.Pro= gressID; + FpdtRecordPtr.GuidEvent->Timestamp =3D TimeStamp; + CopyMem (&FpdtRecordPtr.GuidEvent->Guid, &ModuleGuid, sizeof (FpdtReco= rdPtr.GuidEvent->Guid)); + break; + + case DYNAMIC_STRING_EVENT_TYPE: + FpdtRecordPtr.DynamicStringEvent->Header.Type =3D DYNAMIC_STRING= _EVENT_TYPE; + FpdtRecordPtr.DynamicStringEvent->Header.Length =3D RecordInfo.Rec= ordSize; + FpdtRecordPtr.DynamicStringEvent->Header.Revision =3D RECORD_REVISIO= N_1; + FpdtRecordPtr.DynamicStringEvent->ProgressID =3D RecordInfo.Pro= gressID; + FpdtRecordPtr.DynamicStringEvent->Timestamp =3D TimeStamp; + CopyMem (&FpdtRecordPtr.DynamicStringEvent->Guid, &ModuleGuid, sizeof = (FpdtRecordPtr.DynamicStringEvent->Guid)); + + if (UseModuleName) { + StringPtr =3D ModuleName; + } else if (Token !=3D NULL) { + StringPtr =3D Token; + } else if (Module !=3D NULL) { + StringPtr =3D Module; + } else if (ModuleName !=3D NULL) { + StringPtr =3D ModuleName; + } + if (StringPtr !=3D NULL && AsciiStrLen (StringPtr) !=3D 0) { + StrLength =3D AsciiStrLen (StringPtr); + DestMax =3D (RecordInfo.RecordSize - sizeof (DYNAMIC_STRING_EV= ENT_RECORD)) / sizeof (CHAR8); + if (StrLength >=3D DestMax) { + StrLength =3D DestMax -1; + } + AsciiStrnCpyS (FpdtRecordPtr.DynamicStringEvent->String, DestMax, St= ringPtr, StrLength); + } + break; + + case GUID_QWORD_EVENT_TYPE: + FpdtRecordPtr.GuidQwordEvent->Header.Type =3D GUID_QWORD_EVE= NT_TYPE; + FpdtRecordPtr.GuidQwordEvent->Header.Length =3D RecordInfo.Rec= ordSize; + FpdtRecordPtr.GuidQwordEvent->Header.Revision =3D RECORD_REVISIO= N_1; + FpdtRecordPtr.GuidQwordEvent->ProgressID =3D RecordInfo.Pro= gressID; + FpdtRecordPtr.GuidQwordEvent->Timestamp =3D TimeStamp; + CopyMem (&FpdtRecordPtr.GuidQwordEvent->Guid, &ModuleGuid, sizeof (Fpd= tRecordPtr.GuidQwordEvent->Guid)); + if ((MODULE_LOADIMAGE_START_ID =3D=3D RecordInfo.ProgressID) && AsciiS= trCmp (Token, LOAD_IMAGE_TOK) =3D=3D 0) { + mLoadImageCount++; + FpdtRecordPtr.GuidQwordEvent->Qword =3D mLoadImageCoun= t; } + break; + + case GUID_QWORD_STRING_EVENT_TYPE: + FpdtRecordPtr.GuidQwordStringEvent->Header.Type =3D GUID_QWORD_STR= ING_EVENT_TYPE; + FpdtRecordPtr.GuidQwordStringEvent->Header.Length =3D RecordInfo.Rec= ordSize; + FpdtRecordPtr.GuidQwordStringEvent->Header.Revision =3D RECORD_REVISIO= N_1; + FpdtRecordPtr.GuidQwordStringEvent->ProgressID =3D RecordInfo.Pro= gressID; + FpdtRecordPtr.GuidQwordStringEvent->Timestamp =3D TimeStamp; + CopyMem (&FpdtRecordPtr.GuidQwordStringEvent->Guid, &ModuleGuid, sizeo= f (FpdtRecordPtr.GuidQwordStringEvent->Guid)); + break; + + default: + // + // Record is not supported in current DXE phase, return EFI_ABORTED + // + return EFI_UNSUPPORTED; + } + + // + // Report record one by one after records have been reported together. + // + if (mFpdtDataIsReported) { + REPORT_STATUS_CODE_EX ( + EFI_PROGRESS_CODE, + EFI_SOFTWARE_DXE_BS_DRIVER, + 0, + NULL, + &gEfiFirmwarePerformanceGuid, + FpdtRecordPtr.RecordHeader, + FpdtRecordPtr.RecordHeader->Length + ); + } else { + // + // Update the cached FPDT record buffer. + // + mPerformanceLength +=3D FpdtRecordPtr.RecordHeader->Length; + } =20 - mGaugeData =3D NewGaugeData; - mMaxGaugeRecords *=3D 2; + return EFI_SUCCESS; +} =20 +/** + Dumps all the PEI performance. + + @param HobStart A pointer to a Guid. + + This internal function dumps all the PEI performance log to the DXE perf= ormance gauge array. + It retrieves the optional GUID HOB for PEI performance and then saves th= e performance data + to DXE performance data structures. + +**/ +VOID +InternalGetPeiPerformance ( + VOID *HobStart + ) +{ + UINT8 *FirmwarePerformanceHob; + PEI_EXT_FIRMWARE_PERF_HEADER *PeiPerformanceLogHeader; + UINT8 *EventRec; + EFI_HOB_GUID_TYPE *GuidHob; + + GuidHob =3D GetNextGuidHob (&gEdkiiExtendedFirmwarePerformanceGuid, HobS= tart); + while (GuidHob !=3D NULL) { + FirmwarePerformanceHob =3D GET_GUID_HOB_DATA (GuidHob); + PeiPerformanceLogHeader =3D (PEI_EXT_FIRMWARE_PERF_HEADER *)FirmwarePe= rformanceHob; + + if (mPerformanceLength + PeiPerformanceLogHeader->SizeOfAllEntries > m= MaxPerformanceLength) { + mPerformancePointer =3D ReallocatePool ( + mPerformanceLength, + mPerformanceLength + + (UINTN)PeiPerformanceLogHeader->SizeOfAllEnt= ries + + FIRMWARE_RECORD_BUFFER, + mPerformancePointer + ); + ASSERT (mPerformancePointer !=3D NULL); + mMaxPerformanceLength =3D mPerformanceLength + + (UINTN)(PeiPerformanceLogHeader->SizeOfAllEn= tries) + + FIRMWARE_RECORD_BUFFER; + } + + EventRec =3D mPerformancePointer + mPerformanceLength; + CopyMem (EventRec, FirmwarePerformanceHob + sizeof (PEI_EXT_FIRMWARE_P= ERF_HEADER), (UINTN)(PeiPerformanceLogHeader->SizeOfAllEntries)); // - // Initialize new data array and migrate old data one. + // Update the used buffer size. // - mGaugeData =3D CopyMem (mGaugeData, OldGaugeData, OldGaugeDataSize); + mPerformanceLength +=3D (UINTN)(PeiPerformanceLogHeader->SizeOfAllEntr= ies); + mLoadImageCount +=3D PeiPerformanceLogHeader->LoadImageCount; =20 - FreePool (OldGaugeData); + // + // Get next performance guid hob + // + GuidHob =3D GetNextGuidHob (&gEdkiiExtendedFirmwarePerformanceGuid, GE= T_NEXT_HOB (GuidHob)); } +} =20 - GaugeEntryExArray =3D (GAUGE_DATA_ENTRY_EX *) (mGaugeData = + 1); - GaugeEntryExArray[Index].Handle =3D (EFI_PHYSICAL_ADDRESS) (UINTN) Handl= e; +/** + Report all FPDT record as report status code. =20 - if (Token !=3D NULL) { - AsciiStrnCpyS (GaugeEntryExArray[Index].Token, DXE_PERFORMANCE_STRING_= SIZE, Token, DXE_PERFORMANCE_STRING_LENGTH); - } - if (Module !=3D NULL) { - AsciiStrnCpyS (GaugeEntryExArray[Index].Module, DXE_PERFORMANCE_STRING= _SIZE, Module, DXE_PERFORMANCE_STRING_LENGTH); + @param Event The event of notify protocol. + @param Context Notify event context. + +**/ +VOID +EFIAPI +ReportFpdtRecordData ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + UINT8 *PerfBuffer; + UINTN MaxUint16; + + PerfBuffer =3D mPerformancePointer; + MaxUint16 =3D 0xFFFF; + + if (mPerformanceLength =3D=3D 0 || mPerformancePointer =3D=3D NULL) { + return; } =20 - GaugeEntryExArray[Index].EndTimeStamp =3D 0; - GaugeEntryExArray[Index].Identifier =3D Identifier; + mStartFpdtDataReport =3D TRUE; =20 - if (TimeStamp =3D=3D 0) { - TimeStamp =3D GetPerformanceCounter (); + while (mPerformanceLength > MaxUint16) { + // + // Report extension data size is UINT16. So, the size of report data c= an't exceed 0xFFFF. + // + REPORT_STATUS_CODE_EX ( + EFI_PROGRESS_CODE, + EFI_SOFTWARE_DXE_BS_DRIVER, + 0, + NULL, + &gEfiFirmwarePerformanceGuid, + PerfBuffer, + MaxUint16 + ); + mPerformanceLength =3D mPerformanceLength - MaxUint16; + PerfBuffer =3D PerfBuffer + MaxUint16; } - GaugeEntryExArray[Index].StartTimeStamp =3D TimeStamp; =20 - mGaugeData->NumberOfEntries++; + REPORT_STATUS_CODE_EX ( + EFI_PROGRESS_CODE, + EFI_SOFTWARE_DXE_BS_DRIVER, + 0, + NULL, + &gEfiFirmwarePerformanceGuid, + PerfBuffer, + mPerformanceLength + ); + // + // Free Cached FPDT record Buffer + // + FreePool (mPerformancePointer); + mPerformancePointer =3D NULL; + mPerformanceLength =3D 0; + mMaxPerformanceLength =3D 0; + // + // Set FPDT report state to TRUE. + // + mFpdtDataIsReported =3D TRUE; + mStartFpdtDataReport =3D FALSE; +} =20 - EfiReleaseLock (&mPerfRecordLock); +/** + Adds a record at the end of the performance measurement log + that records the start time of a performance measurement. =20 - return EFI_SUCCESS; + Adds a record to the end of the performance measurement log + that contains the Handle, Token, Module and Identifier. + The end time of the new record must be set to zero. + If TimeStamp is not zero, then TimeStamp is used to fill in the start ti= me in the record. + If TimeStamp is zero, the start time in the record is filled in with the= value + read from the current time stamp. + + @param Handle Pointer to environment specific context = used + to identify the component being measured. + @param Token Pointer to a Null-terminated ASCII string + that identifies the component being meas= ured. + @param Module Pointer to a Null-terminated ASCII string + that identifies the module being measure= d. + @param TimeStamp 64-bit time stamp. + @param Identifier 32-bit identifier. If the value is 0, th= e created record + is same as the one created by StartGauge= of PERFORMANCE_PROTOCOL. + + @retval EFI_SUCCESS The data was read correctly from the dev= ice. + @retval EFI_OUT_OF_RESOURCES There are not enough resources to record= the measurement. + +**/ +EFI_STATUS +EFIAPI +StartGaugeEx ( + IN CONST VOID *Handle, OPTIONAL + IN CONST CHAR8 *Token, OPTIONAL + IN CONST CHAR8 *Module, OPTIONAL + IN UINT64 TimeStamp, + IN UINT32 Identifier + ) +{ + return InsertFpdtMeasurement (TRUE, Handle, Token, Module, TimeStamp, Id= entifier); } =20 /** Searches the performance measurement log from the beginning of the log for the first matching record that contains a zero end time and fills in= a valid end time. =20 Searches the performance measurement log from the beginning of the log - for the first record that matches Handle, Token and Module and has an en= d time value of zero. + for the first record that matches Handle, Token, Module and Identifier a= nd has an end time value of zero. If the record can not be found then return EFI_NOT_FOUND. If the record is found and TimeStamp is not zero, then the end time in the record is filled in with the value specified by= TimeStamp. If the record is found and TimeStamp is zero, then the end time in the m= atching record is filled in with the current time stamp value. @@ -260,89 +927,19 @@ EndGaugeEx ( IN CONST CHAR8 *Module, OPTIONAL IN UINT64 TimeStamp, IN UINT32 Identifier ) { - GAUGE_DATA_ENTRY_EX *GaugeEntryExArray; - UINT32 Index; - EFI_STATUS Status; - - Status =3D EfiAcquireLockOrFail (&mPerfRecordLock); - if (EFI_ERROR (Status)) { - return Status; - } - - if (TimeStamp =3D=3D 0) { - TimeStamp =3D GetPerformanceCounter (); - } - - Index =3D InternalSearchForGaugeEntry (Handle, Token, Module, Identifier= ); - if (Index >=3D mGaugeData->NumberOfEntries) { - EfiReleaseLock (&mPerfRecordLock); - return EFI_NOT_FOUND; - } - GaugeEntryExArray =3D (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1); - GaugeEntryExArray[Index].EndTimeStamp =3D TimeStamp; - - EfiReleaseLock (&mPerfRecordLock); - return EFI_SUCCESS; + return InsertFpdtMeasurement (FALSE, Handle, Token, Module, TimeStamp, I= dentifier); } =20 /** Retrieves a previously logged performance measurement. It can also retrieve the log created by StartGauge and EndGauge of PERFO= RMANCE_PROTOCOL, and then assign the Identifier with 0. =20 - Retrieves the performance log entry from the performance log specified b= y LogEntryKey. - If it stands for a valid entry, then EFI_SUCCESS is returned and - GaugeDataEntryEx stores the pointer to that entry. - - This internal function is added to avoid releasing lock before each retu= rn statement. - - @param LogEntryKey The key for the previous performance mea= surement log entry. - If 0, then the first performance measure= ment log entry is retrieved. - @param GaugeDataEntryEx The indirect pointer to the extended gau= ge data entry specified by LogEntryKey - if the retrieval is successful. - - @retval EFI_SUCCESS The GuageDataEntryEx is successfully fou= nd based on LogEntryKey. - @retval EFI_NOT_FOUND The LogEntryKey is the last entry (equal= s to the total entry number). - @retval EFI_INVALIDE_PARAMETER The LogEntryKey is not a valid entry (gr= eater than the total entry number). - @retval EFI_INVALIDE_PARAMETER GaugeDataEntryEx is NULL. - -**/ -EFI_STATUS -EFIAPI -InternalGetGaugeEx ( - IN UINTN LogEntryKey, - OUT GAUGE_DATA_ENTRY_EX **GaugeDataEntryEx - ) -{ - UINTN NumberOfEntries; - GAUGE_DATA_ENTRY_EX *GaugeEntryExArray; - - NumberOfEntries =3D (UINTN) (mGaugeData->NumberOfEntries); - if (LogEntryKey > NumberOfEntries) { - return EFI_INVALID_PARAMETER; - } - if (LogEntryKey =3D=3D NumberOfEntries) { - return EFI_NOT_FOUND; - } - - GaugeEntryExArray =3D (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1); - - if (GaugeDataEntryEx =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - *GaugeDataEntryEx =3D &GaugeEntryExArray[LogEntryKey]; - - return EFI_SUCCESS; -} - -/** - Retrieves a previously logged performance measurement. - It can also retrieve the log created by StartGauge and EndGauge of PERFO= RMANCE_PROTOCOL, - and then assign the Identifier with 0. + !!! Not support!!! =20 Retrieves the performance log entry from the performance log specified b= y LogEntryKey. If it stands for a valid entry, then EFI_SUCCESS is returned and GaugeDataEntryEx stores the pointer to that entry. =20 @@ -362,22 +959,11 @@ EFIAPI GetGaugeEx ( IN UINTN LogEntryKey, OUT GAUGE_DATA_ENTRY_EX **GaugeDataEntryEx ) { - EFI_STATUS Status; - - Status =3D EfiAcquireLockOrFail (&mPerfRecordLock); - if (EFI_ERROR (Status)) { - return Status; - } - - Status =3D InternalGetGaugeEx (LogEntryKey, GaugeDataEntryEx); - - EfiReleaseLock (&mPerfRecordLock); - - return Status; + return EFI_UNSUPPORTED; } =20 /** Adds a record at the end of the performance measurement log that records the start time of a performance measurement. @@ -452,10 +1038,12 @@ EndGauge ( /** Retrieves a previously logged performance measurement. It can also retrieve the log created by StartGaugeEx and EndGaugeEx of P= ERFORMANCE_EX_PROTOCOL, and then eliminate the Identifier. =20 + !!! Not support!!! + Retrieves the performance log entry from the performance log specified b= y LogEntryKey. If it stands for a valid entry, then EFI_SUCCESS is returned and GaugeDataEntry stores the pointer to that entry. =20 @param LogEntryKey The key for the previous performance mea= surement log entry. @@ -474,81 +1062,13 @@ EFIAPI GetGauge ( IN UINTN LogEntryKey, OUT GAUGE_DATA_ENTRY **GaugeDataEntry ) { - EFI_STATUS Status; - GAUGE_DATA_ENTRY_EX *GaugeEntryEx; - - GaugeEntryEx =3D NULL; - - Status =3D GetGaugeEx (LogEntryKey, &GaugeEntryEx); - if (EFI_ERROR (Status)) { - return Status; - } - - if (GaugeDataEntry =3D=3D NULL) { - return EFI_INVALID_PARAMETER; - } - - *GaugeDataEntry =3D (GAUGE_DATA_ENTRY *) GaugeEntryEx; - - return EFI_SUCCESS; + return EFI_UNSUPPORTED; } =20 -/** - Dumps all the PEI performance log to DXE performance gauge array. - - This internal function dumps all the PEI performance log to the DXE perf= ormance gauge array. - It retrieves the optional GUID HOB for PEI performance and then saves th= e performance data - to DXE performance data structures. - -**/ -VOID -InternalGetPeiPerformance ( - VOID - ) -{ - EFI_HOB_GUID_TYPE *GuidHob; - PEI_PERFORMANCE_LOG_HEADER *LogHob; - PEI_PERFORMANCE_LOG_ENTRY *LogEntryArray; - UINT32 *LogIdArray; - GAUGE_DATA_ENTRY_EX *GaugeEntryExArray; - UINT32 Index; - UINT32 NumberOfEntries; - - NumberOfEntries =3D 0; - GaugeEntryExArray =3D (GAUGE_DATA_ENTRY_EX *) (mGaugeData + 1); - - // - // Dump PEI Log Entries to DXE Guage Data structure. - // - GuidHob =3D GetFirstGuidHob (&gPerformanceProtocolGuid); - if (GuidHob !=3D NULL) { - LogHob =3D GET_GUID_HOB_DATA (GuidHob); - LogEntryArray =3D (PEI_PERFORMANCE_LOG_ENTRY *) (LogHob + 1); - - NumberOfEntries =3D LogHob->NumberOfEntries; - for (Index =3D 0; Index < NumberOfEntries; Index++) { - GaugeEntryExArray[Index].Handle =3D LogEntryArray[Index].Han= dle; - AsciiStrCpyS (GaugeEntryExArray[Index].Token, DXE_PERFORMANCE_STRIN= G_SIZE, LogEntryArray[Index].Token); - AsciiStrCpyS (GaugeEntryExArray[Index].Module, DXE_PERFORMANCE_STRIN= G_SIZE, LogEntryArray[Index].Module); - GaugeEntryExArray[Index].StartTimeStamp =3D LogEntryArray[Index].Sta= rtTimeStamp; - GaugeEntryExArray[Index].EndTimeStamp =3D LogEntryArray[Index].End= TimeStamp; - GaugeEntryExArray[Index].Identifier =3D 0; - } - - GuidHob =3D GetFirstGuidHob (&gPerformanceExProtocolGuid); - if (GuidHob !=3D NULL) { - LogIdArray =3D GET_GUID_HOB_DATA (GuidHob); - for (Index =3D 0; Index < NumberOfEntries; Index++) { - GaugeEntryExArray[Index].Identifier =3D LogIdArray[Index]; - } - } - } - mGaugeData->NumberOfEntries =3D NumberOfEntries; -} =20 /** The constructor function initializes Performance infrastructure for DXE = phase. =20 The constructor function publishes Performance and PerformanceEx protoco= l, allocates memory to log DXE performance @@ -567,40 +1087,53 @@ DxeCorePerformanceLibConstructor ( IN EFI_HANDLE ImageHandle, IN EFI_SYSTEM_TABLE *SystemTable ) { EFI_STATUS Status; + EFI_HANDLE Handle; + EFI_EVENT ReadyToBootEvent; PERFORMANCE_PROPERTY *PerformanceProperty; =20 - if (!PerformanceMeasurementEnabled ()) { // // Do not initialize performance infrastructure if not required. // return EFI_SUCCESS; } + + // + // Dump normal PEI performance records + // + InternalGetPeiPerformance (GetHobList()); + // - // Install the protocol interfaces. + // Install the protocol interfaces for DXE performance library instance. // + Handle =3D NULL; Status =3D gBS->InstallMultipleProtocolInterfaces ( - &mHandle, + &Handle, &gPerformanceProtocolGuid, &mPerformanceInterface, &gPerformanceExProtocolGuid, &mPerformanceExInterface, NULL ); ASSERT_EFI_ERROR (Status); =20 - mMaxGaugeRecords =3D INIT_DXE_GAUGE_DATA_ENTRIES + (UINT16) (PcdGet16 (P= cdMaxPeiPerformanceLogEntries16) !=3D 0 ? - PcdGet16 (Pcd= MaxPeiPerformanceLogEntries16) : - PcdGet8 (PcdM= axPeiPerformanceLogEntries)); - - mGaugeData =3D AllocateZeroPool (sizeof (GAUGE_DATA_HEADER) + (sizeof (G= AUGE_DATA_ENTRY_EX) * mMaxGaugeRecords)); - ASSERT (mGaugeData !=3D NULL); + // + // Register End of DXE event to report StatusCode data + // + Status =3D gBS->CreateEventEx ( + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + ReportFpdtRecordData, + NULL, + &gEfiEventReadyToBootGuid, + &ReadyToBootEvent + ); =20 - InternalGetPeiPerformance (); + ASSERT_EFI_ERROR (Status); =20 Status =3D EfiGetSystemConfigurationTable (&gPerformanceProtocolGuid, (V= OID **) &PerformanceProperty); if (EFI_ERROR (Status)) { // // Install configuration table for performance property. @@ -651,19 +1184,19 @@ StartPerformanceMeasurementEx ( IN CONST CHAR8 *Module, OPTIONAL IN UINT64 TimeStamp, IN UINT32 Identifier ) { - return (RETURN_STATUS) StartGaugeEx (Handle, Token, Module, TimeStamp, I= dentifier); + return InsertFpdtMeasurement (TRUE, Handle, Token, Module, TimeStamp, Id= entifier); } =20 /** Searches the performance measurement log from the beginning of the log for the first matching record that contains a zero end time and fills in= a valid end time. =20 Searches the performance measurement log from the beginning of the log - for the first record that matches Handle, Token and Module and has an en= d time value of zero. + for the first record that matches Handle, Token, Module and Identifier a= nd has an end time value of zero. If the record can not be found then return RETURN_NOT_FOUND. If the record is found and TimeStamp is not zero, then the end time in the record is filled in with the value specified by= TimeStamp. If the record is found and TimeStamp is zero, then the end time in the m= atching record is filled in with the current time stamp value. @@ -690,18 +1223,20 @@ EndPerformanceMeasurementEx ( IN CONST CHAR8 *Module, OPTIONAL IN UINT64 TimeStamp, IN UINT32 Identifier ) { - return (RETURN_STATUS) EndGaugeEx (Handle, Token, Module, TimeStamp, Ide= ntifier); + return InsertFpdtMeasurement (FALSE, Handle, Token, Module, TimeStamp, I= dentifier); } =20 /** Attempts to retrieve a performance measurement log entry from the perfor= mance measurement log. It can also retrieve the log created by StartPerformanceMeasurement and = EndPerformanceMeasurement, and then assign the Identifier with 0. =20 + !!! Not support!!! + Attempts to retrieve the performance log entry specified by LogEntryKey.= If LogEntryKey is zero on entry, then an attempt is made to retrieve the first entry from = the performance log, and the key for the second entry in the log is returned. If the perform= ance log is empty, then no entry is retrieved and zero is returned. If LogEntryKey is not = zero, then the performance log entry associated with LogEntryKey is retrieved, and the key for the = next entry in the log is @@ -729,63 +1264,29 @@ EndPerformanceMeasurementEx ( being measured. @param StartTimeStamp Pointer to the 64-bit time stamp that wa= s recorded when the measurement was started. @param EndTimeStamp Pointer to the 64-bit time stamp that wa= s recorded when the measurement was ended. - @param Identifier Pointer to the 32-bit identifier that wa= s recorded. + @param Identifier Pointer to the 32-bit identifier that wa= s recorded when the measurement + was ended. =20 @return The key for the next performance log entry (in general case). =20 **/ UINTN EFIAPI GetPerformanceMeasurementEx ( - IN UINTN LogEntryKey,=20 + IN UINTN LogEntryKey, OUT CONST VOID **Handle, OUT CONST CHAR8 **Token, OUT CONST CHAR8 **Module, OUT UINT64 *StartTimeStamp, OUT UINT64 *EndTimeStamp, OUT UINT32 *Identifier ) { - EFI_STATUS Status; - GAUGE_DATA_ENTRY_EX *GaugeData; - - GaugeData =3D NULL; - =20 - ASSERT (Handle !=3D NULL); - ASSERT (Token !=3D NULL); - ASSERT (Module !=3D NULL); - ASSERT (StartTimeStamp !=3D NULL); - ASSERT (EndTimeStamp !=3D NULL); - ASSERT (Identifier !=3D NULL); - - Status =3D GetGaugeEx (LogEntryKey++, &GaugeData); - - // - // Make sure that LogEntryKey is a valid log entry key, - // - ASSERT (Status !=3D EFI_INVALID_PARAMETER); - - if (EFI_ERROR (Status)) { - // - // The LogEntryKey is the last entry (equals to the total entry number= ). - // - return 0; - } - - ASSERT (GaugeData !=3D NULL); - - *Handle =3D (VOID *) (UINTN) GaugeData->Handle; - *Token =3D GaugeData->Token; - *Module =3D GaugeData->Module; - *StartTimeStamp =3D GaugeData->StartTimeStamp; - *EndTimeStamp =3D GaugeData->EndTimeStamp; - *Identifier =3D GaugeData->Identifier; - - return LogEntryKey; + return 0; } =20 /** Adds a record at the end of the performance measurement log that records the start time of a performance measurement. @@ -816,11 +1317,11 @@ StartPerformanceMeasurement ( IN CONST CHAR8 *Token, OPTIONAL IN CONST CHAR8 *Module, OPTIONAL IN UINT64 TimeStamp ) { - return StartPerformanceMeasurementEx (Handle, Token, Module, TimeStamp, = 0); + return InsertFpdtMeasurement (TRUE, Handle, Token, Module, TimeStamp, 0); } =20 /** Searches the performance measurement log from the beginning of the log for the first matching record that contains a zero end time and fills in= a valid end time. @@ -852,18 +1353,20 @@ EndPerformanceMeasurement ( IN CONST CHAR8 *Token, OPTIONAL IN CONST CHAR8 *Module, OPTIONAL IN UINT64 TimeStamp ) { - return EndPerformanceMeasurementEx (Handle, Token, Module, TimeStamp, 0); + return InsertFpdtMeasurement (FALSE, Handle, Token, Module, TimeStamp, 0= ); } =20 /** Attempts to retrieve a performance measurement log entry from the perfor= mance measurement log. It can also retrieve the log created by StartPerformanceMeasurementEx an= d EndPerformanceMeasurementEx, and then eliminate the Identifier. =20 + !!! Not support!!! + Attempts to retrieve the performance log entry specified by LogEntryKey.= If LogEntryKey is zero on entry, then an attempt is made to retrieve the first entry from = the performance log, and the key for the second entry in the log is returned. If the perform= ance log is empty, then no entry is retrieved and zero is returned. If LogEntryKey is not = zero, then the performance log entry associated with LogEntryKey is retrieved, and the key for the = next entry in the log is @@ -905,12 +1408,11 @@ GetPerformanceMeasurement ( OUT CONST CHAR8 **Module, OUT UINT64 *StartTimeStamp, OUT UINT64 *EndTimeStamp ) { - UINT32 Identifier; - return GetPerformanceMeasurementEx (LogEntryKey, Handle, Token, Module, = StartTimeStamp, EndTimeStamp, &Identifier); + return 0; } =20 /** Returns TRUE if the performance measurement macros are enabled. =20 diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceL= ib.inf b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.i= nf index 5b89ce2..c2e5ccf 100644 --- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf +++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf @@ -7,11 +7,11 @@ # It initializes DXE phase performance logging by publishing the Performa= nce and PerformanceEx Protocol, # which is consumed by DxePerformanceLib to logging performance data in D= XE phase. # This library is mainly used by DxeCore to start performance logging to = ensure that # Performance and PerformanceEx Protocol are installed at the very beginn= ing of DXE phase. # =20 -# Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
# (C) Copyright 2016 Hewlett Packard Enterprise Development LP
# This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License # which accompanies this distribution. The full text of the license may = be found at # http://opensource.org/licenses/bsd-license.php @@ -55,20 +55,26 @@ BaseMemoryLib BaseLib HobLib DebugLib UefiLib + ReportStatusCodeLib + DxeServicesLib + PeCoffGetEntryPointLib =20 =20 [Guids] ## SOMETIMES_CONSUMES ## HOB ## PRODUCES ## UNDEFINED # Install protocol ## PRODUCES ## SystemTable gPerformanceProtocolGuid ## SOMETIMES_CONSUMES ## HOB ## PRODUCES ## UNDEFINED # Install protocol gPerformanceExProtocolGuid + gZeroGuid ## SOMETIMES_CONSUMES ## G= UID + gEfiFirmwarePerformanceGuid ## SOMETIMES_PRODUCES ## U= NDEFINED # StatusCode Data + gEdkiiExtendedFirmwarePerformanceGuid ## SOMETIMES_CONSUMES ## H= OB + gEfiEventReadyToBootGuid ## CONSUMES ## E= vent =20 [Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries ## CONSU= MES - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries16 ## CONSU= MES - gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask ## CONSU= MES + gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask ## CO= NSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdEdkiiFpdtStringRecordEnableOnly ## CO= NSUMES diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceL= ibInternal.h b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanc= eLibInternal.h index f1540d8..42fce9b 100644 --- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInter= nal.h +++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLibInter= nal.h @@ -2,11 +2,11 @@ Master header files for DxeCorePerformanceLib instance. =20 This header file holds the prototypes of the Performance and Performance= Ex Protocol published by this library instance at its constructor. =20 -Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
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 http://opensource.org/licenses/bsd-license.php =20 @@ -20,10 +20,19 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITH= ER EXPRESS OR IMPLIED. =20 =20 #include =20 #include +#include +#include +#include +#include + +#include +#include +#include +#include =20 #include #include #include #include @@ -31,10 +40,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITH= ER EXPRESS OR IMPLIED. #include #include #include #include #include +#include +#include +#include =20 // // Interface declarations for PerformanceEx Protocol. // /** --=20 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel