From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web09.4588.1609914829038196298 for ; Tue, 05 Jan 2021 22:33:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=bRRyX9YH; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) IronPort-SDR: HQohpDV8FRIpCny8o9K932QCJ+m8a26mOt6PJtvCsbeJDCY5VoNZl/Goz9lCapvB09p+tirl2H BOX8HHO+qZ9A== X-IronPort-AV: E=McAfee;i="6000,8403,9855"; a="262002460" X-IronPort-AV: E=Sophos;i="5.78,479,1599548400"; d="scan'208";a="262002460" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2021 22:33:48 -0800 IronPort-SDR: vFSgzrpr80MCxM7EhdWSJVnaiK6kPo1JFFFFui769kI8ItnEIckVe4IREzgAnkKbgeXO/23pHc l69sOgGoBa2g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,479,1599548400"; d="scan'208";a="379171482" Received: from fmsmsx604.amr.corp.intel.com ([10.18.126.84]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2021 22:33:48 -0800 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Jan 2021 22:33:47 -0800 Received: from fmsmsx606.amr.corp.intel.com (10.18.126.86) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Tue, 5 Jan 2021 22:33:47 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Tue, 5 Jan 2021 22:33:47 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.100) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Tue, 5 Jan 2021 22:33:47 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G/lZ11ntnUWa59yDNEEvALWh3Bx/kDHRtd8aODr87AUyu7ZzpUiWWBh/x09O2wCk5lLL2BNd9GUNCw/JttUqv651b8YOk9bak1ba/3x1L8AMkfoCrj86ndFJX1C/zQ2I0NDZT7bTIG0ojtvjzN2c41ubDSjnFgEQhnY/tfl/5O341hRyxy65OQwmCQOBbNsCmwEBaVJt+EGIA1AyHBm8yh4R9ZvKxRpYYbLBK9XHSERD0SzUPaUQfhuBMryPPA3v80ECE9Cb8fualebohatIRFEOJd1+1MdYROTzxJiOjDHKagHqsCdHCVhCQXmhnL+UN3d1bZ9Vf3Gl6BZ1qXWstQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eUhn72GlMtGrbfwKY1hielJgg7KnIMHpNx1XSGSerFQ=; b=ebKqLsJqbGIG1weMz0Uskcw2X0dhOuERESM6iyfv5g9uK4y+4hIqq/RLmBIhf2QWwwrGSmXjVSdr2gAVDn5FXPm+u6qtGkWAByWg0R6jHyX3NZDjlvSWfHktm1gENMJdv/ATLBHg73CTQGOTofQU6MP9PSGtcGGuF6HpFRVHrd+a5VGhR2tNv6I0jlvBsi9egEl92nRS950LaLNmCdyTlj1OHpoipaLe2lmUGk9mkoja6RIeiMdBrWuVbxA3NbsmqVjXM58AaEvSgNvlAJAfIx7U9r38sXteUVe+SLQkSrriWaL5uH4qYTMXcyNT6mKVfCnm4nj3G/nfSbZFhHcMDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eUhn72GlMtGrbfwKY1hielJgg7KnIMHpNx1XSGSerFQ=; b=bRRyX9YHTrJTaIpebj7+6/+4RcmeR3kBm7ud3Rnl5C1A68HBbmXDMtQBKOPvr5S9+M/b0P/1YhQHISW5ekjllfAS7+ufCh+jXMCfEy0GX+vML2vXU9L3RrSaryECkfWNe2OKmpbh5vFHoWb9zI6Rzi394TnG5IBlKPlrfcmxKzY= Received: from CO1PR11MB4930.namprd11.prod.outlook.com (2603:10b6:303:9b::11) by MWHPR11MB1550.namprd11.prod.outlook.com (2603:10b6:301:b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Wed, 6 Jan 2021 06:33:45 +0000 Received: from CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::d18:1234:c1d6:5936]) by CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::d18:1234:c1d6:5936%7]) with mapi id 15.20.3742.006; Wed, 6 Jan 2021 06:33:45 +0000 From: "Ni, Ray" To: "Zeng, Star" , "devel@edk2.groups.io" CC: "Dong, Eric" , Laszlo Ersek Subject: Re: [PATCH] UefiCpuPkg PiSmmCpuDxeSmm: Reduce SMRAM consumption in CpuS3.c Thread-Topic: [PATCH] UefiCpuPkg PiSmmCpuDxeSmm: Reduce SMRAM consumption in CpuS3.c Thread-Index: AQHW4lh6scQU7ejg/USG8K29jrJbraoaJllA Date: Wed, 6 Jan 2021 06:33:45 +0000 Message-ID: References: <20210104051418.18140-1-star.zeng@intel.com> In-Reply-To: <20210104051418.18140-1-star.zeng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b8903019-4ec3-447e-0fae-08d8b20d04dc x-ms-traffictypediagnostic: MWHPR11MB1550: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5797; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: veDqyjI4Nv9mqnxmn605U/CFVBSG1pXtsa5qipLuNkdoiBwzVVsFhdwIqwngwAUbUMip0hHe0CLB4gtMW4kiwyYDs0xgm1CtBibGM5LmeduTaGm2JZq0yxwBoMQ7Mmaill7fKT33znKc8LxKk+qhG7bkrEMDZsZJHTH7UNyphWJGcNSLNY2c3OScivQc7KZUWx1keIEUTfvBRv+EqYY1BDw9pdoMzPilglw8cLUnYSg/uCyhMOV1lXFujWz+tjK27OItf3pz4jbiLi6NFRlrUz5c4xUquNUG7ej1n6I3vcqbgSFPu/DcipupPBthBMEY6OT/eh7vp2fGp6PlTxuGNaxYGiXXdJkxpCx6hVPVrOYlOHvX2UOWF6TDvzBCSOsk/wSFcSx5PCtcq4TDR3Evog== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4930.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(6029001)(4636009)(346002)(396003)(366004)(136003)(39860400002)(376002)(2906002)(83380400001)(26005)(186003)(19627235002)(52536014)(5660300002)(8676002)(71200400001)(316002)(33656002)(478600001)(66476007)(7696005)(66946007)(76116006)(4326008)(66556008)(66446008)(54906003)(64756008)(6506007)(53546011)(55016002)(86362001)(9686003)(8936002)(110136005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?zveo/EZESzCxHdueuZPxU5AxU2q3cZGYvDcTQgUVfdiDq/dMIMvDsXbQvhOF?= =?us-ascii?Q?lc40YYqc5XxCCHW+KEV5V137JyV3iFROHby8G8j3+2/aSO/330QeeCrlutiS?= =?us-ascii?Q?nbJVUMVxn3Ny9h/SD6TuNtyi/v7rofsgaFFwdxuUx+CcU6gQW3EqdrdPkCdN?= =?us-ascii?Q?+D7TutaI7PumRSmLTfCTk4bHhwrqb50NsnEtD52Y40OK8OAsXRdJQgPiSljt?= =?us-ascii?Q?2rPkrGVIbBuQdZKUOqrHZW1cB+KnaSH5NbeP823tPtBy9Fyddv8jidsiZ90/?= =?us-ascii?Q?n+LF9nRqpW2LY6dOBPg8mAR5/2g1ZOI94/GmmB1UgHZKCod/jvi3QJfKsZDW?= =?us-ascii?Q?lMXHX+pSkgbvUlUw1WEiIM8ouOt2vfZrQU+F0vuTn0lEueQNumj8aIUWnRoT?= =?us-ascii?Q?NbvPIGJLpiAsXMt2h6CVfJKcmiS6e9y2iWGGsvFYzGYR/JpIVH41zqCl0sqN?= =?us-ascii?Q?B2Zi+tfHsDVbX1RHwpwCZOBZWNtn04M1wZu33orWQCF6mQci8jUx/x6AUrBe?= =?us-ascii?Q?LxmkYiCtgcmU15ZU1nLPntrzlcyJz34iY60vjMFGJjvjabAHMDXPjapJrvnz?= =?us-ascii?Q?EdjjqjtFnXg5WTlt7aSsq/wE7BvfRaqZyYG3MtUFTR1FQHL2Y1TTbIccWnAA?= =?us-ascii?Q?Z45e4O3bZg7qmY78wYUaCihmScjOZ/unJQ1CxamfyFJyrXQxuP+KPUi4mQe9?= =?us-ascii?Q?1JHtdbr/wK9H34oN9xw3/Gl2hDf0mur+VUELfii04nBG2fXc5oeP50DXiLlZ?= =?us-ascii?Q?wsO9JcNaT2LMqb7AWJ9eCwur2+s+INbu1bniz+MhqU4Uiklpnd3M5Lr4zaay?= =?us-ascii?Q?qMnjJa2Ivh5bXjRLt94rxI9Nz2j9SCVaDpZ7b0lnW4t1JBj21OyEmdOvUUOv?= =?us-ascii?Q?8yhdf+XM3qOpsOm81J9GUFYNgZEZVx+ezgY7/5yIGrZlcW72ogi/8I2q1Ljg?= =?us-ascii?Q?Vwo1eZ85hnxG9i2tm1OEP1cYnSGJmGbFjsCCRH147LFN5Sp2gxdtdbHISrTf?= =?us-ascii?Q?gA1H?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4930.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8903019-4ec3-447e-0fae-08d8b20d04dc X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2021 06:33:45.7699 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4WSnZYs55tUWFezoOS/xVUR6tUmUJo/T+JntZPyH04Kvm5ywIWLXxr+pRuTnSE6AdRO/OtnxeCcq1bKY1uNkbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB1550 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star, Just one minor comments: DestinationRegisterTableList[Index].AllocatedSize =3D (UINT32) MultU6= 4x32 (DestinationRegisterTableList[Index].TableLength, sizeof (CPU_REGISTER= _TABLE_ENTRY)); Please directly use " DestinationRegisterTableList[Index].TableLength * siz= eof (CPU_REGISTER_TABLE_ENTRY)". Thanks, Ray > -----Original Message----- > From: Zeng, Star > Sent: Monday, January 4, 2021 1:14 PM > To: devel@edk2.groups.io > Cc: Zeng, Star ; Ni, Ray ; Dong, E= ric > ; Laszlo Ersek > Subject: [PATCH] UefiCpuPkg PiSmmCpuDxeSmm: Reduce SMRAM > consumption in CpuS3.c >=20 > 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. >=20 > 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 >=20 > 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 siz= e > is TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY). >=20 > Take AllocatedSize=3D0x1000=3D4096, TableLength=3D100 and NumberOfCpus= =3D1024 > 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 409= 6 - > 2400 =3D 1696 > NumberOfCpus =3D 1024 =3D 1K > NumberOfCpus * (AllocatedSize - TableLength * sizeof > (CPU_REGISTER_TABLE_ENTRY)) =3D 1696K >=20 > This patch also corrects the CopyRegisterTable() function description. >=20 > 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(-) >=20 > 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.RegisterTable; > } > + 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 registe= r table. > @param[in] SourceRegisterTableList Points to source register tab= le. > @@ -967,7 +970,8 @@ CopyRegisterTable ( >=20 > CopyMem (DestinationRegisterTableList, SourceRegisterTableList, > NumberOfCpus * 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) Mul= tU64x32 > (DestinationRegisterTableList[Index].TableLength, sizeof > (CPU_REGISTER_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)AcpiCpuData->IdtrProfile, sizeof (IA32_DESCRIPTOR)); >=20 > - mAcpiCpuData.PreSmmInitRegisterTable =3D > (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (mAcpiCpuData.NumberOfCpus > * sizeof (CPU_REGISTER_TABLE)); > - ASSERT (mAcpiCpuData.PreSmmInitRegisterTable !=3D 0); > + if (!IsRegisterTableEmpty ((CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData- > >PreSmmInitRegisterTable, 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- > >RegisterTable, mAcpiCpuData.NumberOfCpus)) { > + mAcpiCpuData.RegisterTable =3D > (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (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. > -- > 2.21.0.windows.1