From nobody Thu May 16 13:45:40 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+108001+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+108001+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692866606; cv=none; d=zohomail.com; s=zohoarc; b=E+McntaG5sdf/SJ4aHfydBvNvVI6RP4D61brUnJmxAYXvPwBnTHomhHOqZ+8XRdAnlq6GTN5xa0XnP2PH1F/zLKFqgx8HmRAYwrf2ngxiA26JGJ8fxNw6RvzLjPLvmaVQUn+hNkCU066n7ja8vBClpSEmnA043anM6fVoYUJp/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692866606; 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=lKQf2WFNhynm9uDM0LGxjHZmZ0IosMQvXKMCSY5TOAE=; b=mpFJWHE6E2K7+BuV+sAjPgwknxRnM+SByv96mLH6Msp/wCXWM5V+5dqANVot/gtVg92zcdIYaOnglRs0OIFwOv8H6rifwZNhw0zxZn40K7eIOITVWgjXmURJ6b6PWbsE8kf3iimjTXG/41JLfAE6rrFe3pTu5yd8hcQyG28pDlo= 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+108001+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 1692866606537206.07046013884337; Thu, 24 Aug 2023 01:43:26 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=FQ+4yx+sl2qcn8tB94B5aSCDDBHnoy21h4eGjtrPlX0=; 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=1692866606; v=1; b=L+Czn1yZ0JiIB3JjPopvxwY96JycyKSMDw8mysJdvGAMjzlg1gKGGz804/P6RTPSIpcN6oa0 nO+tDR3+4dWftnQVu2LJ1q4gUcKBM/mzVJMDJpD/NS+zPaToPxQdMmtLdCz2e4vqwrkf7FeF+Mj 9vKgttysxwtnIUM5trR/7lB8= X-Received: by 127.0.0.2 with SMTP id alivYY1788612xaKNbPJlG8N; Thu, 24 Aug 2023 01:43:26 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web10.6676.1692866605425606282 for ; Thu, 24 Aug 2023 01:43:25 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="405386079" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="405386079" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 01:43:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10811"; a="713883339" X-IronPort-AV: E=Sophos;i="6.01,195,1684825200"; d="scan'208";a="713883339" X-Received: from shwdeopenlab702.ccr.corp.intel.com ([10.239.55.43]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 01:43:22 -0700 From: "duntan" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Ray Ni Subject: [edk2-devel] [PATCH] MdeModulePkg/DxeCorePerformanceLib:fix smm perf issue Date: Thu, 24 Aug 2023 16:42:15 +0800 Message-Id: <20230824084215.876-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: ylu32MSMJdJUJTivDI2jog8hx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1692866608659100002 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 --- 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..2c7b960c30 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 mBootRecordOffset =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 CurrentRecordOffset; =20 // // Collect boot records from SMM drivers. @@ -297,28 +299,32 @@ InternalGetSmmPerfData ( } =20 // - // Get all boot records + // Get boot records starting from mBootRecordOffset // - 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 mBootRecordOffset; + SmmBootRecordDataSize =3D SmmCommData->BootRecordSize - = mBootRecordOffset; + SmmBootRecordData =3D AllocateZeroPool (SmmBootRecor= dDataSize); + CurrentRecordOffset =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 (CurrentRecordOffset < 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 (CurrentRecordOffset + SmmCommData->BootRecordSize > SmmBoo= tRecordDataSize) { + CopyMem ((UINT8 *)SmmBootRecordData + CurrentRecordOffset, S= mmCommData->BootRecordData, SmmBootRecordDataSize - CurrentRecordOffset); } else { - CopyMem ((UINT8 *)SmmBootRecordData + SmmCommData->BootRecor= dOffset, SmmCommData->BootRecordData, SmmCommData->BootRecordSize); + CopyMem ((UINT8 *)SmmBootRecordData + CurrentRecordOffset, S= mmCommData->BootRecordData, SmmCommData->BootRecordSize); } =20 - SmmCommData->BootRecordOffset =3D SmmCommData->BootRecordOffse= t + SmmCommData->BootRecordSize; + CurrentRecordOffset +=3D SmmCommData->BootRecordSize; + SmmCommData->BootRecordOffset +=3D SmmCommData->BootRecordSize; } =20 + mBootRecordOffset =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 (#108001): https://edk2.groups.io/g/devel/message/108001 Mute This Topic: https://groups.io/mt/100931879/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-