From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: dandan.bi@intel.com) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Wed, 24 Apr 2019 20:37:39 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Apr 2019 20:37:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,392,1549958400"; d="scan'208";a="294349683" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga004.jf.intel.com with ESMTP; 24 Apr 2019 20:37:37 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Eric Dong Subject: [patch] MdeModulePkg/HiiDB: Minimize memory allocation times after ReadyToBoot Date: Thu, 25 Apr 2019 11:37:28 +0800 Message-Id: <20190425033728.32212-1-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1597 Currently RTData are allocated at/after ReadyToBoot to store the contents in HiiDatabase and the HII configurations for OS runtime utilization. Some platforms may meet S4 resume issue since the allocation after ReadyToBoot cause memory map change. Now this patch to do some overallocation to minimize the number of memory allocations after ReadyToBoot and also add warning message when do allocation after ReadyToBoot. Cc: Michael D Kinney Cc: Liming Gao Cc: Eric Dong Signed-off-by: Dandan Bi --- .../Universal/HiiDatabaseDxe/Database.c | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c index 6da0e30c98..d3791ca68b 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -1,9 +1,9 @@ /** @file Implementation for EFI_HII_DATABASE_PROTOCOL. -Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2019, Intel Corporation. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -3361,18 +3361,23 @@ HiiGetConfigRespInfo( Status = HiiConfigRoutingExportConfig(&Private->ConfigRouting,&ConfigAltResp); if (!EFI_ERROR (Status)){ ConfigSize = StrSize(ConfigAltResp); if (ConfigSize > gConfigRespSize){ - gConfigRespSize = ConfigSize; + // + // Do 25% overallocation to minimize the number of memory allocations after ReadyToBoot. + // Since lots of allocation after ReadyToBoot may change memory map and cause S4 resume issue. + // + gConfigRespSize = ConfigSize + (ConfigSize >> 2); if (gRTConfigRespBuffer != NULL){ FreePool(gRTConfigRespBuffer); + DEBUG ((DEBUG_WARN, "[HiiDatabase]: Memory allocation is required after ReadyToBoot, which may change memory map and cause S4 resume issue.\n")); } - gRTConfigRespBuffer = (EFI_STRING)AllocateRuntimeZeroPool(ConfigSize); + gRTConfigRespBuffer = (EFI_STRING) AllocateRuntimeZeroPool (gConfigRespSize); if (gRTConfigRespBuffer == NULL){ FreePool(ConfigAltResp); - DEBUG ((DEBUG_ERROR, "Not enough memory resource to get the ConfigResp string.\n")); + DEBUG ((DEBUG_ERROR, "[HiiDatabase]: No enough memory resource to store the ConfigResp string.\n")); return EFI_OUT_OF_RESOURCES; } } else { ZeroMem(gRTConfigRespBuffer,gConfigRespSize); } @@ -3412,17 +3417,22 @@ HiiGetDatabaseInfo( Status = HiiExportPackageLists(This, NULL, &DatabaseInfoSize, DatabaseInfo); ASSERT(Status == EFI_BUFFER_TOO_SMALL); if(DatabaseInfoSize > gDatabaseInfoSize ) { - gDatabaseInfoSize = DatabaseInfoSize; + // + // Do 25% overallocation to minimize the number of memory allocations after ReadyToBoot. + // Since lots of allocation after ReadyToBoot may change memory map and cause S4 resume issue. + // + gDatabaseInfoSize = DatabaseInfoSize + (DatabaseInfoSize >> 2); if (gRTDatabaseInfoBuffer != NULL){ FreePool(gRTDatabaseInfoBuffer); + DEBUG ((DEBUG_WARN, "[HiiDatabase]: Memory allocation is required after ReadyToBoot, which may change memory map and cause S4 resume issue.\n")); } - gRTDatabaseInfoBuffer = AllocateRuntimeZeroPool(DatabaseInfoSize); + gRTDatabaseInfoBuffer = AllocateRuntimeZeroPool (gDatabaseInfoSize); if (gRTDatabaseInfoBuffer == NULL){ - DEBUG ((DEBUG_ERROR, "Not enough memory resource to get the HiiDatabase info.\n")); + DEBUG ((DEBUG_ERROR, "[HiiDatabase]: No enough memory resource to store the HiiDatabase info.\n")); return EFI_OUT_OF_RESOURCES; } } else { ZeroMem(gRTDatabaseInfoBuffer,gDatabaseInfoSize); } -- 2.18.0.windows.1