From 0c4d0b6c8a05a6a62c0dca042f8e15e579e6f4af Mon Sep 17 00:00:00 2001 From: "Tan, Dun" Date: Wed, 30 Aug 2023 15:36:05 +0800 Subject: MdeModulePkg/DxeCorePerformanceLib:fix smm perf issue Fix smm perf issue in DxeCorePerformanceLib. In current code logic, total SMM perf record is copied multiple times to FPDT table if multiple ReadyToBoot events are signaled. This patch changes the function InternalGetSmmPerfData() to only get newly generated Smm perf data. Then previous generated Smm perf data won't be copied to FPDT again. BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4470 Signed-off-by: Dun Tan Cc: Jian J Wang Cc: Liming Gao Reviewed-by: Ray Ni --- .../DxeCorePerformanceLib/DxeCorePerformanceLib.c | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'MdeModulePkg') diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c index ef14bc0..0a994be 100644 --- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c +++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c @@ -10,7 +10,7 @@ This library is mainly used by DxeCore to start performance logging to ensure that Performance Protocol is installed at the very beginning of DXE phase. -Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2023, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -73,6 +73,7 @@ UINT8 *mPerformancePointer = NULL; UINT8 *mBootRecordBuffer = NULL; BOOLEAN mLockInsertRecord = FALSE; CHAR8 *mDevicePathString = NULL; +UINTN mSmmBootRecordOffset = 0; EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText = NULL; @@ -236,6 +237,7 @@ InternalGetSmmPerfData ( VOID *SmmBootRecordData; UINTN SmmBootRecordDataSize; UINTN ReservedMemSize; + UINTN SmmBootRecordDataRetrieved; // // Collect boot records from SMM drivers. @@ -297,28 +299,32 @@ InternalGetSmmPerfData ( } // - // Get all boot records + // Get boot records starting from mSmmBootRecordOffset // - SmmCommData->Function = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA_BY_OFFSET; - SmmBootRecordDataSize = SmmCommData->BootRecordSize; - SmmBootRecordData = AllocateZeroPool (SmmBootRecordDataSize); + SmmCommData->Function = SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA_BY_OFFSET; + SmmCommData->BootRecordOffset = mSmmBootRecordOffset; + SmmBootRecordDataSize = SmmCommData->BootRecordSize - mSmmBootRecordOffset; + SmmBootRecordData = AllocateZeroPool (SmmBootRecordDataSize); + SmmBootRecordDataRetrieved = 0; ASSERT (SmmBootRecordData != NULL); - SmmCommData->BootRecordOffset = 0; - SmmCommData->BootRecordData = (VOID *)((UINTN)SmmCommMemRegion->PhysicalStart + SMM_BOOT_RECORD_COMM_SIZE); - SmmCommData->BootRecordSize = ReservedMemSize - SMM_BOOT_RECORD_COMM_SIZE; - while (SmmCommData->BootRecordOffset < SmmBootRecordDataSize) { + SmmCommData->BootRecordData = (VOID *)((UINTN)SmmCommMemRegion->PhysicalStart + SMM_BOOT_RECORD_COMM_SIZE); + SmmCommData->BootRecordSize = ReservedMemSize - SMM_BOOT_RECORD_COMM_SIZE; + while (SmmBootRecordDataRetrieved < SmmBootRecordDataSize) { Status = Communication->Communicate (Communication, SmmBootRecordCommBuffer, &CommSize); ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (SmmCommData->ReturnStatus); - if (SmmCommData->BootRecordOffset + SmmCommData->BootRecordSize > SmmBootRecordDataSize) { - CopyMem ((UINT8 *)SmmBootRecordData + SmmCommData->BootRecordOffset, SmmCommData->BootRecordData, SmmBootRecordDataSize - SmmCommData->BootRecordOffset); + if (SmmBootRecordDataRetrieved + SmmCommData->BootRecordSize > SmmBootRecordDataSize) { + CopyMem ((UINT8 *)SmmBootRecordData + SmmBootRecordDataRetrieved, SmmCommData->BootRecordData, SmmBootRecordDataSize - SmmBootRecordDataRetrieved); } else { - CopyMem ((UINT8 *)SmmBootRecordData + SmmCommData->BootRecordOffset, SmmCommData->BootRecordData, SmmCommData->BootRecordSize); + CopyMem ((UINT8 *)SmmBootRecordData + SmmBootRecordDataRetrieved, SmmCommData->BootRecordData, SmmCommData->BootRecordSize); } - SmmCommData->BootRecordOffset = SmmCommData->BootRecordOffset + SmmCommData->BootRecordSize; + SmmBootRecordDataRetrieved += SmmCommData->BootRecordSize; + SmmCommData->BootRecordOffset += SmmCommData->BootRecordSize; } + mSmmBootRecordOffset = SmmCommData->BootRecordOffset; + *SmmPerfData = SmmBootRecordData; *SmmPerfDataSize = SmmBootRecordDataSize; } -- cgit v1.1