UefiCpuPkg PiSmmCpuDxeSmm: Reduce SMRAM consumption in CpuS3.c

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=1024.
  sizeof (CPU_REGISTER_TABLE) = 24
  mAcpiCpuData.NumberOfCpus = 1024 = 1K
  mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE) = 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=0x1000=4096, TableLength=100 and NumberOfCpus=1024 as example,
  about 1696K SMRAM consumption could be reduced.
  sizeof (CPU_REGISTER_TABLE_ENTRY) = 24
  TableLength = 100
  TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY) = 2400
  AllocatedSize = 0x1000 = 4096
  AllocatedSize - TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY) = 4096 - 2400 = 1696
  NumberOfCpus = 1024 = 1K
  NumberOfCpus * (AllocatedSize - TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY)) = 1696K

This patch also corrects the CopyRegisterTable() function description.

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210111015419.28368-1-star.zeng@intel.com>

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
index 9592430636ec86e188a2c1be1621eb9fb2f6262c..ab7f39aa2bd4b7770f45ff1cf93c715e1cbb70ed 100644 (file)
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/CpuS3.c
@@ -1,7 +1,7 @@
 /** @file\r
 Code for Processor S3 restoration\r
 \r
-Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -487,6 +487,9 @@ SetRegister (
   } else {\r
     RegisterTables = (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterTable;\r
   }\r
+  if (RegisterTables == NULL) {\r
+    return;\r
+  }\r
 \r
   InitApicId = GetInitialApicId ();\r
   RegisterTable = NULL;\r
@@ -948,7 +951,7 @@ InitSmmS3ResumeState (
 }\r
 \r
 /**\r
-  Copy register table from ACPI NVS memory into SMRAM.\r
+  Copy register table from non-SMRAM into SMRAM.\r
 \r
   @param[in] DestinationRegisterTableList  Points to destination register table.\r
   @param[in] SourceRegisterTableList       Points to source register table.\r
@@ -967,7 +970,8 @@ CopyRegisterTable (
 \r
   CopyMem (DestinationRegisterTableList, SourceRegisterTableList, NumberOfCpus * sizeof (CPU_REGISTER_TABLE));\r
   for (Index = 0; Index < NumberOfCpus; Index++) {\r
-    if (DestinationRegisterTableList[Index].AllocatedSize != 0) {\r
+    if (DestinationRegisterTableList[Index].TableLength != 0) {\r
+      DestinationRegisterTableList[Index].AllocatedSize = DestinationRegisterTableList[Index].TableLength * sizeof (CPU_REGISTER_TABLE_ENTRY);\r
       RegisterTableEntry = AllocateCopyPool (\r
         DestinationRegisterTableList[Index].AllocatedSize,\r
         (VOID *)(UINTN)SourceRegisterTableList[Index].RegisterTableEntry\r
@@ -978,6 +982,34 @@ CopyRegisterTable (
   }\r
 }\r
 \r
+/**\r
+  Check whether the register table is empty or not.\r
+\r
+  @param[in] RegisterTable  Point to the register table.\r
+  @param[in] NumberOfCpus   Number of CPUs.\r
+\r
+  @retval TRUE              The register table is empty.\r
+  @retval FALSE             The register table is not empty.\r
+**/\r
+BOOLEAN\r
+IsRegisterTableEmpty (\r
+  IN CPU_REGISTER_TABLE     *RegisterTable,\r
+  IN UINT32                 NumberOfCpus\r
+  )\r
+{\r
+  UINTN                     Index;\r
+\r
+  if (RegisterTable != NULL) {\r
+    for (Index = 0; Index < NumberOfCpus; Index++) {\r
+      if (RegisterTable[Index].TableLength != 0) {\r
+        return FALSE;\r
+      }\r
+    }\r
+  }\r
+\r
+  return TRUE;\r
+}\r
+\r
 /**\r
   Get ACPI CPU data.\r
 \r
@@ -1032,23 +1064,31 @@ GetAcpiCpuData (
 \r
   CopyMem ((VOID *)(UINTN)mAcpiCpuData.IdtrProfile, (VOID *)(UINTN)AcpiCpuData->IdtrProfile, sizeof (IA32_DESCRIPTOR));\r
 \r
-  mAcpiCpuData.PreSmmInitRegisterTable = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE));\r
-  ASSERT (mAcpiCpuData.PreSmmInitRegisterTable != 0);\r
+  if (!IsRegisterTableEmpty ((CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->PreSmmInitRegisterTable, mAcpiCpuData.NumberOfCpus)) {\r
+    mAcpiCpuData.PreSmmInitRegisterTable = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE));\r
+    ASSERT (mAcpiCpuData.PreSmmInitRegisterTable != 0);\r
 \r
-  CopyRegisterTable (\r
-    (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.PreSmmInitRegisterTable,\r
-    (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->PreSmmInitRegisterTable,\r
-    mAcpiCpuData.NumberOfCpus\r
-    );\r
+    CopyRegisterTable (\r
+      (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.PreSmmInitRegisterTable,\r
+      (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->PreSmmInitRegisterTable,\r
+      mAcpiCpuData.NumberOfCpus\r
+      );\r
+  } else {\r
+    mAcpiCpuData.PreSmmInitRegisterTable = 0;\r
+  }\r
 \r
-  mAcpiCpuData.RegisterTable = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE));\r
-  ASSERT (mAcpiCpuData.RegisterTable != 0);\r
+  if (!IsRegisterTableEmpty ((CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->RegisterTable, mAcpiCpuData.NumberOfCpus)) {\r
+    mAcpiCpuData.RegisterTable = (EFI_PHYSICAL_ADDRESS)(UINTN)AllocatePool (mAcpiCpuData.NumberOfCpus * sizeof (CPU_REGISTER_TABLE));\r
+    ASSERT (mAcpiCpuData.RegisterTable != 0);\r
 \r
-  CopyRegisterTable (\r
-    (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterTable,\r
-    (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->RegisterTable,\r
-    mAcpiCpuData.NumberOfCpus\r
-    );\r
+    CopyRegisterTable (\r
+      (CPU_REGISTER_TABLE *)(UINTN)mAcpiCpuData.RegisterTable,\r
+      (CPU_REGISTER_TABLE *)(UINTN)AcpiCpuData->RegisterTable,\r
+      mAcpiCpuData.NumberOfCpus\r
+      );\r
+  } else {\r
+    mAcpiCpuData.RegisterTable = 0;\r
+  }\r
 \r
   //\r
   // Copy AP's GDT, IDT and Machine Check handler into SMRAM.\r