From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 107A374003A for ; Mon, 11 Sep 2023 09:52:04 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=IIBg7IrSDVzahK9Z6heV01adCDB95mExClfBevzr9eo=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: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=1694425923; v=1; b=EzDX1PGVwVtLu+VIctC+f+nVXEb1if5X8l+tns+IIEf8d12KDiS9Hat2fj9Fp59UHT9NAs36 U+MJw8dUtrkXmw/QaZ5WwHxJHhrvcJ5ZFnRk6KY00zxAfY7gujxVYWSbhwEJpgVo0pbrRU90kau KXoFntSaz+CFkK1cz8PcCBac= X-Received: by 127.0.0.2 with SMTP id l0csYY7687511xAZHfICQdg1; Mon, 11 Sep 2023 02:52:03 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web10.54816.1694425922968432521 for ; Mon, 11 Sep 2023 02:52:03 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="357481261" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="357481261" X-Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2023 02:52:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10829"; a="1074077212" X-IronPort-AV: E=Sophos;i="6.02,243,1688454000"; d="scan'208";a="1074077212" X-Received: from sh1gapp1015.ccr.corp.intel.com ([10.239.189.85]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2023 02:51:59 -0700 From: "Wang Fan" To: devel@edk2.groups.io Cc: "Wang,Fan" , Michael D Kinney , Liming Gao , Guomin Jiang , Dandan Bi Subject: [edk2-devel] [PATCH V2 1/1] MdeModulePkg: Support customized FV Migration Information Date: Mon, 11 Sep 2023 17:51:52 +0800 Message-Id: <76cde14616a559c6939f8814d0e79afa7f1a7fcf.1694425833.git.fan.wang@intel.com> In-Reply-To: References: 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,fan.wang@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: ENhH5zJQ3rKcbxT3zrwOIvyHx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=EzDX1PGV; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4533 There are use cases which not all FVs need be migrated from TempRam to permanent memory before TempRam tears down. This new guid is introduced to avoid unnecessary FV migration to improve boot performance. Platform can publish ToMigrateFvInfo hob with this guid to customize FV migration info, and PeiCore will only migrate FVs indicated by this Hob info. This is a backwards compatible change, PeiCore will check ToMigrateFvInfo hob before migration. If ToMigrateFvInfo hobs exists, only migrate FVs recorded by hobs. If ToMigrateFvInfo hobs not exists, migrate all FVs to permanent memory. Cc: Michael D Kinney Cc: Liming Gao Cc: Guomin Jiang Cc: Dandan Bi Signed-off-by: Wang Fan --- MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 82 +++++++++++++------ MdeModulePkg/Core/Pei/PeiMain.inf | 1 + MdeModulePkg/Include/Guid/MigratedFvInfo.h | 19 +++++ MdeModulePkg/MdeModulePkg.dec | 3 +- 4 files changed, 79 insertions(+), 26 deletions(-) diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c index 5f32ebb560ae..e84849ec6db1 100644 --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c @@ -1184,7 +1184,11 @@ EvacuateTempRam ( PEI_CORE_FV_HANDLE PeiCoreFvHandle; EFI_PEI_CORE_FV_LOCATION_PPI *PeiCoreFvLocationPpi; + EDKII_TO_MIGRATE_FV_INFO *ToMigrateFvInfo; EDKII_MIGRATED_FV_INFO MigratedFvInfo; + EFI_PEI_HOB_POINTERS Hob; + BOOLEAN MigrateAllFvs; + UINT32 MigrationFlags; ASSERT (Private->PeiMemoryInstalled); @@ -1211,6 +1215,17 @@ EvacuateTempRam ( ConvertPeiCorePpiPointers (Private, &PeiCoreFvHandle); + // + // Check if platform defined hobs to indicate which FVs are expected to migrate or keep raw data. + // If ToMigrateFvInfo hobs exists, only migrate FVs recorded by hobs. + // If ToMigrateFvInfo hobs not exists, migrate all FVs to permanent memory. + // + MigrateAllFvs = TRUE; + Hob.Raw = GetFirstGuidHob (&gEdkiiToMigrateFvInfoGuid); + if (Hob.Raw != NULL) { + MigrateAllFvs = FALSE; + } + for (FvIndex = 0; FvIndex < Private->FvCount; FvIndex++) { FvHeader = Private->Fv[FvIndex].FvHeader; ASSERT (FvHeader != NULL); @@ -1224,6 +1239,25 @@ EvacuateTempRam ( ) ) { + if (MigrateAllFvs) { + MigrationFlags = 0; + } else { + MigrationFlags = FLAGS_SKIP_FV_MIGRATION | FLAGS_SKIP_FV_RAW_DATA_COPY; + Hob.Raw = GetFirstGuidHob (&gEdkiiToMigrateFvInfoGuid); + while (Hob.Raw != NULL) { + ToMigrateFvInfo = GET_GUID_HOB_DATA (Hob); + if (ToMigrateFvInfo->FvOrgBase == (UINT32)(UINTN)FvHeader) { + MigrationFlags = ToMigrateFvInfo->MigrationFlags; + break; + } + Hob.Raw = GET_NEXT_HOB (Hob); + Hob.Raw = GetNextGuidHob (&gEdkiiToMigrateFvInfoGuid, Hob.Raw); + } + } + if (MigrationFlags & FLAGS_SKIP_FV_MIGRATION) { + continue; + } + // // Allocate page to save the rebased PEIMs, the PEIMs will get dispatched later. // @@ -1234,18 +1268,7 @@ EvacuateTempRam ( ); ASSERT_EFI_ERROR (Status); MigratedFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FvHeaderAddress; - - // - // Allocate pool to save the raw PEIMs, which is used to keep consistent context across - // multiple boot and PCR0 will keep the same no matter if the address of allocated page is changed. - // - Status = PeiServicesAllocatePages ( - EfiBootServicesCode, - EFI_SIZE_TO_PAGES ((UINTN)FvHeader->FvLength), - &FvHeaderAddress - ); - ASSERT_EFI_ERROR (Status); - RawDataFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FvHeaderAddress; + CopyMem (MigratedFvHeader, FvHeader, (UINTN)FvHeader->FvLength); DEBUG (( DEBUG_VERBOSE, @@ -1256,18 +1279,29 @@ EvacuateTempRam ( )); // - // Copy the context to the rebased pages and raw pages, and create hob to save the - // information. The MigratedFvInfo HOB will never be produced when - // PcdMigrateTemporaryRamFirmwareVolumes is FALSE, because the PCD control the - // feature. + // Copy the context to the raw pages, and create hob to save the information. The MigratedFvInfo + // HOB will never be produced when PcdMigrateTemporaryRamFirmwareVolumes is FALSE, because the PCD + // controls the feature. // - CopyMem (MigratedFvHeader, FvHeader, (UINTN)FvHeader->FvLength); - CopyMem (RawDataFvHeader, MigratedFvHeader, (UINTN)FvHeader->FvLength); - MigratedFvInfo.FvOrgBase = (UINT32)(UINTN)FvHeader; - MigratedFvInfo.FvNewBase = (UINT32)(UINTN)MigratedFvHeader; - MigratedFvInfo.FvDataBase = (UINT32)(UINTN)RawDataFvHeader; - MigratedFvInfo.FvLength = (UINT32)(UINTN)FvHeader->FvLength; - BuildGuidDataHob (&gEdkiiMigratedFvInfoGuid, &MigratedFvInfo, sizeof (MigratedFvInfo)); + if ((MigrationFlags & FLAGS_SKIP_FV_RAW_DATA_COPY) != FLAGS_SKIP_FV_RAW_DATA_COPY) { + // + // Allocate pool to save the raw PEIMs, which is used to keep consistent context across + // multiple boot and PCR0 will keep the same no matter if the address of allocated page is changed. + // + Status = PeiServicesAllocatePages ( + EfiBootServicesCode, + EFI_SIZE_TO_PAGES ((UINTN)FvHeader->FvLength), + &FvHeaderAddress + ); + ASSERT_EFI_ERROR (Status); + RawDataFvHeader = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)FvHeaderAddress; + CopyMem (RawDataFvHeader, MigratedFvHeader, (UINTN)FvHeader->FvLength); + MigratedFvInfo.FvOrgBase = (UINT32)(UINTN)FvHeader; + MigratedFvInfo.FvNewBase = (UINT32)(UINTN)MigratedFvHeader; + MigratedFvInfo.FvDataBase = (UINT32)(UINTN)RawDataFvHeader; + MigratedFvInfo.FvLength = (UINT32)(UINTN)FvHeader->FvLength; + BuildGuidDataHob (&gEdkiiMigratedFvInfoGuid, &MigratedFvInfo, sizeof (MigratedFvInfo)); + } // // Migrate any children for this FV now @@ -1330,8 +1364,6 @@ EvacuateTempRam ( } } - RemoveFvHobsInTemporaryMemory (Private); - return Status; } diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf index 0cf357371a16..944b230b0e19 100644 --- a/MdeModulePkg/Core/Pei/PeiMain.inf +++ b/MdeModulePkg/Core/Pei/PeiMain.inf @@ -78,6 +78,7 @@ gEfiFirmwareFileSystem3Guid gStatusCodeCallbackGuid gEdkiiMigratedFvInfoGuid ## SOMETIMES_PRODUCES ## HOB + gEdkiiToMigrateFvInfoGuid ## SOMETIMES_CONSUMES ## HOB [Ppis] gEfiPeiStatusCodePpiGuid ## SOMETIMES_CONSUMES # PeiReportStatusService is not ready if this PPI doesn't exist diff --git a/MdeModulePkg/Include/Guid/MigratedFvInfo.h b/MdeModulePkg/Include/Guid/MigratedFvInfo.h index aca2332a0ec6..543cd9ba7ddd 100644 --- a/MdeModulePkg/Include/Guid/MigratedFvInfo.h +++ b/MdeModulePkg/Include/Guid/MigratedFvInfo.h @@ -9,6 +9,24 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #ifndef __EDKII_MIGRATED_FV_INFO_GUID_H__ #define __EDKII_MIGRATED_FV_INFO_GUID_H__ +#define FLAGS_SKIP_FV_MIGRATION BIT0 +#define FLAGS_SKIP_FV_RAW_DATA_COPY BIT1 + +/// +/// EDKII_TO_MIGRATE_FV_INFO Hob information should be published by platform to indicate +/// one FV is expected to migrate to permarnant memory or not before TempRam tears down. +/// +typedef struct { + UINT32 FvOrgBase; // original FV address + // + // Migration Flags: + // Bit0: Indicate to skip FV migration or not + // Bit1: Indicate to skip FV raw data copy or not + // Others: Reserved bits + // + UINT32 MigrationFlags; +} EDKII_TO_MIGRATE_FV_INFO; + typedef struct { UINT32 FvOrgBase; // original FV address UINT32 FvNewBase; // new FV address @@ -16,6 +34,7 @@ typedef struct { UINT32 FvLength; // Fv Length } EDKII_MIGRATED_FV_INFO; +extern EFI_GUID gEdkiiToMigrateFvInfoGuid; extern EFI_GUID gEdkiiMigratedFvInfoGuid; #endif // #ifndef __EDKII_MIGRATED_FV_INFO_GUID_H__ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index dd182c02fdf6..d6cbcc721a5e 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -416,7 +416,8 @@ gEdkiiCapsuleOnDiskNameGuid = { 0x98c80a4f, 0xe16b, 0x4d11, { 0x93, 0x9a, 0xab, 0xe5, 0x61, 0x26, 0x3, 0x30 } } ## Include/Guid/MigratedFvInfo.h - gEdkiiMigratedFvInfoGuid = { 0xc1ab12f7, 0x74aa, 0x408d, { 0xa2, 0xf4, 0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } } + gEdkiiToMigrateFvInfoGuid = { 0xb4b140a5, 0x72f6, 0x4c21, { 0x93, 0xe4, 0xac, 0xc4, 0xec, 0xcb, 0x23, 0x23 } } + gEdkiiMigratedFvInfoGuid = { 0xc1ab12f7, 0x74aa, 0x408d, { 0xa2, 0xf4, 0xc6, 0xce, 0xfd, 0x17, 0x98, 0x71 } } ## Include/Guid/RngAlgorithm.h gEdkiiRngAlgorithmUnSafe = { 0x869f728c, 0x409d, 0x4ab4, {0xac, 0x03, 0x71, 0xd3, 0x09, 0xc1, 0xb3, 0xf4 }} -- 2.29.2.windows.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108482): https://edk2.groups.io/g/devel/message/108482 Mute This Topic: https://groups.io/mt/101289546/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-