From nobody Thu May 16 09:34:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+108118+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108118+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1693380966; cv=none; d=zohomail.com; s=zohoarc; b=cUGb/sqAUQf76ca9DCSFbZTR+1mTd1c1rRx+TcNLirK7Qe0DPg0Xf4LFW8Q2Hx9xrKmKIP1HryxKwsHQyZtEBL4E0ux3T4Q1zKSRUi/5pOeaUoyLrJOHkT7J/QIYWduyRK5ZWVHjXY4hxugwGlUI7Zvs3hdiXtybf4Wa1ywj0so= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693380966; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=csaU5dYNd0e5YSaBtSvRTY+Ops7zLtVXDpj3zp9n0gM=; b=GvcUqp3An2egwrYP4JrUa5WRa97cTGWwTN+Phkj/Z5huRTBvO0uLj7WxdGziXp08cNTUooKjAWVrCiy9FBiYei3wAHBZjMDz5fT7FfKr5WtiXk2V8P54JLjKOIvE2WF1AvRInR2N0EApSZmAQOghobMGWXsRTsxBkHx9f1ylUKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108118+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1693380966218634.5556949055682; Wed, 30 Aug 2023 00:36:06 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=b9bbxNzTk79DjQ5TjKBk20MfVHLzZWZxX1pDHcNIsNo=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1693380965; v=1; b=iJXvGBuIQ9xLUwLl/LsoZYWnrFSN0wgg/4hORfJEcqHhUXpfxIPhNPoeOrjcSbNPIFTQhL+i YdsI8rb7zCF4rNYs5zrr1z9q8K0ItfFF6lLen+3pZUWtmSOhzQhQE84vZpyPKtf6Y931yCdQQut WlzVKDVh4u6p06OsG5WIVNns= X-Received: by 127.0.0.2 with SMTP id aofDYY1788612xGQfMarYjjx; Wed, 30 Aug 2023 00:36:05 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.8948.1693380964773428465 for ; Wed, 30 Aug 2023 00:36:05 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="406571040" X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="406571040" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 00:35:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="804412812" X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="804412812" X-Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.43]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 00:35:53 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Ray Ni Subject: [edk2-devel] [Patch V2] MdeModulePkg/DxeCorePerformanceLib:fix smm perf issue Date: Wed, 30 Aug 2023 15:35:30 +0800 Message-Id: <20230830073530.675-1-dun.tan@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,dun.tan@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: WE1E7eXpfHkl4Z0I0uDQuFspx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1693380967535100001 Content-Type: text/plain; charset="utf-8" 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=3D4470 Signed-off-by: Dun Tan Cc: Jian J Wang Cc: Liming Gao Cc: Ray Ni Reviewed-by: Ray Ni --- MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c | 32 ++= +++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceL= ib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c index ef14bc0738..0a994be6a5 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 e= nsure that Performance Protocol is installed at the very beginning of DXE phase. =20 -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 =20 @@ -73,6 +73,7 @@ UINT8 *mPerformancePointer =3D NULL; UINT8 *mBootRecordBuffer =3D NULL; BOOLEAN mLockInsertRecord =3D FALSE; CHAR8 *mDevicePathString =3D NULL; +UINTN mSmmBootRecordOffset =3D 0; =20 EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *mDevicePathToText =3D NULL; =20 @@ -236,6 +237,7 @@ InternalGetSmmPerfData ( VOID *SmmBootRecordData; UINTN SmmBootRecordDataSize; UINTN ReservedMemSize; + UINTN SmmBootRecordDataRetrieved; =20 // // Collect boot records from SMM drivers. @@ -297,28 +299,32 @@ InternalGetSmmPerfData ( } =20 // - // Get all boot records + // Get boot records starting from mSmmBootRecordOffset // - SmmCommData->Function =3D SMM_FPDT_FUNCTION_GET_BOOT_RECORD_DATA= _BY_OFFSET; - SmmBootRecordDataSize =3D SmmCommData->BootRecordSize; - SmmBootRecordData =3D AllocateZeroPool (SmmBootRecordDataSiz= e); + SmmCommData->Function =3D SMM_FPDT_FUNCTION_GET_BOOT_REC= ORD_DATA_BY_OFFSET; + SmmCommData->BootRecordOffset =3D mSmmBootRecordOffset; + SmmBootRecordDataSize =3D SmmCommData->BootRecordSize - = mSmmBootRecordOffset; + SmmBootRecordData =3D AllocateZeroPool (SmmBootRecor= dDataSize); + SmmBootRecordDataRetrieved =3D 0; ASSERT (SmmBootRecordData !=3D NULL); - SmmCommData->BootRecordOffset =3D 0; - SmmCommData->BootRecordData =3D (VOID *)((UINTN)SmmCommMemRegi= on->PhysicalStart + SMM_BOOT_RECORD_COMM_SIZE); - SmmCommData->BootRecordSize =3D ReservedMemSize - SMM_BOOT_REC= ORD_COMM_SIZE; - while (SmmCommData->BootRecordOffset < SmmBootRecordDataSize) { + SmmCommData->BootRecordData =3D (VOID *)((UINTN)SmmCommMemRegion= ->PhysicalStart + SMM_BOOT_RECORD_COMM_SIZE); + SmmCommData->BootRecordSize =3D ReservedMemSize - SMM_BOOT_RECOR= D_COMM_SIZE; + while (SmmBootRecordDataRetrieved < SmmBootRecordDataSize) { Status =3D Communication->Communicate (Communication, SmmBootR= ecordCommBuffer, &CommSize); ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (SmmCommData->ReturnStatus); - if (SmmCommData->BootRecordOffset + SmmCommData->BootRecordSiz= e > SmmBootRecordDataSize) { - CopyMem ((UINT8 *)SmmBootRecordData + SmmCommData->BootRecor= dOffset, SmmCommData->BootRecordData, SmmBootRecordDataSize - SmmCommData->= BootRecordOffset); + if (SmmBootRecordDataRetrieved + SmmCommData->BootRecordSize >= SmmBootRecordDataSize) { + CopyMem ((UINT8 *)SmmBootRecordData + SmmBootRecordDataRetri= eved, SmmCommData->BootRecordData, SmmBootRecordDataSize - SmmBootRecordDat= aRetrieved); } else { - CopyMem ((UINT8 *)SmmBootRecordData + SmmCommData->BootRecor= dOffset, SmmCommData->BootRecordData, SmmCommData->BootRecordSize); + CopyMem ((UINT8 *)SmmBootRecordData + SmmBootRecordDataRetri= eved, SmmCommData->BootRecordData, SmmCommData->BootRecordSize); } =20 - SmmCommData->BootRecordOffset =3D SmmCommData->BootRecordOffse= t + SmmCommData->BootRecordSize; + SmmBootRecordDataRetrieved +=3D SmmCommData->BootRecordSize; + SmmCommData->BootRecordOffset +=3D SmmCommData->BootRecordSize; } =20 + mSmmBootRecordOffset =3D SmmCommData->BootRecordOffset; + *SmmPerfData =3D SmmBootRecordData; *SmmPerfDataSize =3D SmmBootRecordDataSize; } --=20 2.31.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108118): https://edk2.groups.io/g/devel/message/108118 Mute This Topic: https://groups.io/mt/101047988/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-