From nobody Fri Apr 26 22:57:56 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+69533+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+69533+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1609737156; cv=none; d=zohomail.com; s=zohoarc; b=AH4pYpRbGT9AYOts3ZfRcPP9GKiAqasctISSRWZbHaQDvTlZo+jN1jcxjpPfsCU15R4OipW6VMmkOUupH5cd7yffyuKzJ8C6U8I+wbG/nZf4RIBG1+5EOWp8F0H6YHUaPDkUvhcX1iMUrmOxyOxPaWlxAK32T4sSP/2JEIhkGNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609737156; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=05f6Orv5juUQG7w4HV4f8K1We8amkUy9SCUp0QlnRpg=; b=PY6tbgh8k7c4ljFY9z5gbUihN6yVO1jFSSk+Yx8SxsfX1z9Kx71WEnYMiu4w0pS6K8vT+rSs80O2FzHtGt2dcOZCWAi3yZA+U+ZhJuWV0vKcriS/oiSo/YU0ptZ9373nYpwu/g/iT+H7bxzK+FuqI0rlPM5XthN2s1LlO2jugGs= 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+69533+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1609737156089101.63603931252135; Sun, 3 Jan 2021 21:12:36 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id dDTKYY1788612xH9vIC65y34; Sun, 03 Jan 2021 21:12:35 -0800 X-Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web09.9661.1609737150033778369 for ; Sun, 03 Jan 2021 21:12:30 -0800 IronPort-SDR: oRgRd0MiVK0ut8g43lk0A5yVbXaE7m7urNMm/8gxLLm9fBvV+Gv6OKIOSSwov93NxqRAOG+bpc F1Sqkt6KTI5Q== X-IronPort-AV: E=McAfee;i="6000,8403,9853"; a="176132142" X-IronPort-AV: E=Sophos;i="5.78,473,1599548400"; d="scan'208";a="176132142" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2021 21:12:29 -0800 IronPort-SDR: Jb/QSU4NsVu2gXm35XcSC+cn5q9/1qWKUbznt2ExQg0WemRzt31/8CB64lc2Dxwm9/QSgOzzU7 2Dtw9B7DFI5w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,473,1599548400"; d="scan'208";a="349764129" X-Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.37]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2021 21:12:19 -0800 From: "Zeng, Star" To: devel@edk2.groups.io, [, D, C, D Cc: Star Zeng , Ray Ni , Eric Dong , Laszlo Ersek Subject: [edk2-devel] [PATCH] UefiCpuPkg PiSmmCpuDxeSmm: Reduce SMRAM consumption in CpuS3.c Date: Mon, 4 Jan 2021 13:11:56 +0800 Message-Id: <20210104051156.14216-1-star.zeng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,star.zeng@intel.com X-Gm-Message-State: vXtx87l6QqLwNgnxjM3t7QE7x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1609737155; bh=3LmBpbour0vPXrQsaDfb7mVKPRXJdwtVESNNlXL2j/8=; h=Cc:Date:From:Reply-To:Subject:To; b=DHbfI6VtZMC5xEMenyZzcQhzhfDSnzfi30pKtoIy2B7kaE2lfZEdK3E7wrnK19AjrYW eB5AYbzCSJasJEkOyxVEj93L3+s4kWIMqBjrku2f5kQIygRsuXWSKVzWepePTCnXRI9IA YkYI6Ha19pTbm4e68kJpNJRw8XV17p03Bok= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch makes two refinements to reduce SMRAM consumption in CpuS3.c. 1. Only do CopyRegisterTable() when register table is not empty, IsRegisterTableEmpty() is created to check whether the register table is empty or not. Take empty PreSmmInitRegisterTable as example, about 24K SMRAM consumption could be reduced when mAcpiCpuData.NumberOfCpus=3D1024. sizeof (CPU_REGISTER_TABLE) =3D 24 mAcpiCpuData.NumberOfCpus =3D 1024 =3D 1K mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE) =3D 24K 2. Only copy table entries buffer instead of whole buffer. AllocatedSize in SourceRegisterTableList is the whole buffer size. Actually, only the table entries buffer needs to be copied, and the size is TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY). Take AllocatedSize=3D0x1000=3D4096, TableLength=3D100 and NumberOfCpus=3D= 1024 as example, about 1696K SMRAM consumption could be reduced. sizeof (CPU_REGISTER_TABLE_ENTRY) =3D 24 TableLength =3D 100 TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY) =3D 2400 AllocatedSize =3D 0x1000 =3D 4096 AllocatedSize - TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY) =3D 4096 = - 2400 =3D 1696 NumberOfCpus =3D 1024 =3D 1K NumberOfCpus * (AllocatedSize - TableLength * sizeof (CPU_REGISTER_TABLE_= ENTRY)) =3D 1696K This patch also corrects the CopyRegisterTable() function description. Signed-off-by: Star Zeng Cc: Ray Ni Cc: Eric Dong Cc: Laszlo Ersek --- UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c | 71 +++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/= CpuS3.c index 9592430636ec..d87c2efb87e7 100644 --- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c @@ -1,7 +1,7 @@ /** @file Code for Processor S3 restoration =20 -Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent =20 **/ @@ -487,6 +487,9 @@ SetRegister ( } else { RegisterTables =3D (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterT= able; } + if (RegisterTables =3D=3D NULL) { + return; + } =20 InitApicId =3D GetInitialApicId (); RegisterTable =3D NULL; @@ -948,7 +951,7 @@ InitSmmS3ResumeState ( } =20 /** - Copy register table from ACPI NVS memory into SMRAM. + Copy register table from non-SMRAM into SMRAM. =20 @param[in] DestinationRegisterTableList Points to destination register = table. @param[in] SourceRegisterTableList Points to source register table. @@ -967,7 +970,8 @@ CopyRegisterTable ( =20 CopyMem (DestinationRegisterTableList, SourceRegisterTableList, NumberOf= Cpus * sizeof (CPU_REGISTER_TABLE)); for (Index =3D 0; Index < NumberOfCpus; Index++) { - if (DestinationRegisterTableList[Index].AllocatedSize !=3D 0) { + if (DestinationRegisterTableList[Index].TableLength !=3D 0) { + DestinationRegisterTableList[Index].AllocatedSize =3D (UINT32) MultU= 64x32 (DestinationRegisterTableList[Index].TableLength, sizeof (CPU_REGISTE= R_TABLE_ENTRY)); RegisterTableEntry =3D AllocateCopyPool ( DestinationRegisterTableList[Index].AllocatedSize, (VOID *)(UINTN)SourceRegisterTableList[Index].RegisterTableEntry @@ -978,6 +982,31 @@ CopyRegisterTable ( } } =20 +/** + Check whether the register table is empty or not. + + @param[in] RegisterTable Point to the register table. + + @retval TRUE The register table is empty. + @retval FALSE The register table is not empty. +**/ +BOOLEAN +IsRegisterTableEmpty ( + IN CPU_REGISTER_TABLE *RegisterTable, + IN UINT32 NumberOfCpus + ) +{ + UINTN Index; + + for (Index =3D 0; Index < NumberOfCpus; Index++) { + if (RegisterTable[Index].TableLength !=3D 0) { + return FALSE; + } + } + + return TRUE; +} + /** Get ACPI CPU data. =20 @@ -1032,23 +1061,31 @@ GetAcpiCpuData ( =20 CopyMem ((VOID *)(UINTN)mAcpiCpuData.IdtrProfile, (VOID *)(UINTN)AcpiCpu= Data->IdtrProfile, sizeof (IA32_DESCRIPTOR)); =20 - mAcpiCpuData.PreSmmInitRegisterTable =3D (EFI_PHYSICAL_ADDRESS)(UINTN)Al= locatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE)); - ASSERT (mAcpiCpuData.PreSmmInitRegisterTable !=3D 0); + if (!IsRegisterTableEmpty ((CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->Pre= SmmInitRegisterTable, mAcpiCpuData.NumberOfCpus)) { + mAcpiCpuData.PreSmmInitRegisterTable =3D (EFI_PHYSICAL_ADDRESS)(UINTN)= AllocatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE)); + ASSERT (mAcpiCpuData.PreSmmInitRegisterTable !=3D 0); =20 - CopyRegisterTable ( - (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.PreSmmInitRegisterTable, - (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->PreSmmInitRegisterTable, - mAcpiCpuData.NumberOfCpus - ); + CopyRegisterTable ( + (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.PreSmmInitRegisterTable, + (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->PreSmmInitRegisterTable, + mAcpiCpuData.NumberOfCpus + ); + } else { + mAcpiCpuData.PreSmmInitRegisterTable =3D 0; + } =20 - mAcpiCpuData.RegisterTable =3D (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool= (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE)); - ASSERT (mAcpiCpuData.RegisterTable !=3D 0); + if (!IsRegisterTableEmpty ((CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->Reg= isterTable, mAcpiCpuData.NumberOfCpus)) { + mAcpiCpuData.RegisterTable =3D (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePo= ol (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE)); + ASSERT (mAcpiCpuData.RegisterTable !=3D 0); =20 - CopyRegisterTable ( - (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterTable, - (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->RegisterTable, - mAcpiCpuData.NumberOfCpus - ); + CopyRegisterTable ( + (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterTable, + (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->RegisterTable, + mAcpiCpuData.NumberOfCpus + ); + } else { + mAcpiCpuData.RegisterTable =3D 0; + } =20 // // Copy AP's GDT, IDT and Machine Check handler into SMRAM. --=20 2.21.0.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 (#69533): https://edk2.groups.io/g/devel/message/69533 Mute This Topic: https://groups.io/mt/79418569/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-