From: "Wu, Hao A" <hao.a.wu@intel.com>
To: "Zeng, Star" <star.zeng@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH V2 02/15] MdeModulePkg Variable: Abstract InitRealNonVolatileVariableStore
Date: Tue, 15 Jan 2019 06:37:40 +0000 [thread overview]
Message-ID: <B80AF82E9BFB8E4FBD8C89DA810C6A093C87E605@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <1547479196-40248-3-git-send-email-star.zeng@intel.com>
Reviewed-by: Hao Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, January 14, 2019 11:20 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star; Wang, Jian J; Wu, Hao A
> Subject: [PATCH V2 02/15] MdeModulePkg Variable: Abstract
> InitRealNonVolatileVariableStore
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323
> Merge EmuVariable and Real variable driver.
>
> Abstract InitRealNonVolatileVariableStore from
> InitNonVolatileVariableStore.
>
> This patch prepares for adding emulated variable NV mode
> support in VariableRuntimeDxe.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
> .../Universal/Variable/RuntimeDxe/Variable.c | 86 +++++++++++++++----
> ---
> 1 file changed, 58 insertions(+), 28 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> index 99d487adac9e..0b675c8f36df 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> @@ -3728,9 +3728,9 @@ GetMaxVariableSize (
> }
>
> /**
> - Init non-volatile variable store.
> + Init real non-volatile variable store.
>
> - @param[out] NvFvHeader Output pointer to non-volatile FV header
> address.
> + @param[out] VariableStoreBase Output pointer to real non-volatile
> variable store base.
>
> @retval EFI_SUCCESS Function successfully executed.
> @retval EFI_OUT_OF_RESOURCES Fail to allocate enough memory
> resource.
> @@ -3738,16 +3738,13 @@ GetMaxVariableSize (
>
> **/
> EFI_STATUS
> -InitNonVolatileVariableStore (
> - OUT EFI_FIRMWARE_VOLUME_HEADER **NvFvHeader
> +InitRealNonVolatileVariableStore (
> + OUT EFI_PHYSICAL_ADDRESS *VariableStoreBase
> )
> {
> EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
> - VARIABLE_HEADER *Variable;
> - VARIABLE_HEADER *NextVariable;
> - EFI_PHYSICAL_ADDRESS VariableStoreBase;
> - UINT64 VariableStoreLength;
> - UINTN VariableSize;
> + VARIABLE_STORE_HEADER *VariableStore;
> + UINT32 VariableStoreLength;
> EFI_HOB_GUID_TYPE *GuidHob;
> EFI_PHYSICAL_ADDRESS NvStorageBase;
> UINT8 *NvStorageData;
> @@ -3777,6 +3774,8 @@ InitNonVolatileVariableStore (
> if (NvStorageBase == 0) {
> NvStorageBase = (EFI_PHYSICAL_ADDRESS) PcdGet32
> (PcdFlashNvStorageVariableBase);
> }
> + ASSERT (NvStorageBase != 0);
> +
> //
> // Copy NV storage data to the memory buffer.
> //
> @@ -3826,24 +3825,23 @@ InitNonVolatileVariableStore (
> return EFI_VOLUME_CORRUPTED;
> }
>
> - VariableStoreBase = (UINTN) FvHeader + FvHeader->HeaderLength;
> + VariableStore = (VARIABLE_STORE_HEADER *) ((UINTN) FvHeader +
> FvHeader->HeaderLength);
> VariableStoreLength = NvStorageSize - FvHeader->HeaderLength;
> + ASSERT (sizeof (VARIABLE_STORE_HEADER) <= VariableStoreLength);
> + ASSERT (VariableStore->Size == VariableStoreLength);
>
> - mNvFvHeaderCache = FvHeader;
> - mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase =
> VariableStoreBase;
> - mNvVariableCache = (VARIABLE_STORE_HEADER *) (UINTN)
> VariableStoreBase;
> - if (GetVariableStoreStatus (mNvVariableCache) != EfiValid) {
> + //
> + // Check if the Variable Store header is not corrupted
> + //
> + if (GetVariableStoreStatus (VariableStore) != EfiValid) {
> FreePool (NvStorageData);
> - mNvFvHeaderCache = NULL;
> - mNvVariableCache = NULL;
> DEBUG((EFI_D_ERROR, "Variable Store header is corrupted\n"));
> return EFI_VOLUME_CORRUPTED;
> }
> - ASSERT(mNvVariableCache->Size == VariableStoreLength);
>
> - ASSERT (sizeof (VARIABLE_STORE_HEADER) <= VariableStoreLength);
> + mNvFvHeaderCache = FvHeader;
>
> - mVariableModuleGlobal->VariableGlobal.AuthFormat =
> (BOOLEAN)(CompareGuid (&mNvVariableCache->Signature,
> &gEfiAuthenticatedVariableGuid));
> + *VariableStoreBase = (EFI_PHYSICAL_ADDRESS) (UINTN) VariableStore;
>
> HwErrStorageSize = PcdGet32 (PcdHwErrStorageSize);
> MaxUserNvVariableSpaceSize = PcdGet32
> (PcdMaxUserNvVariableSpaceSize);
> @@ -3878,14 +3876,45 @@ InitNonVolatileVariableStore (
> //
> ASSERT (GetNonVolatileMaxVariableSize () < (VariableStoreLength - sizeof
> (VARIABLE_STORE_HEADER)));
>
> + return EFI_SUCCESS;
> +}
> +
> +/**
> + Init non-volatile variable store.
> +
> + @retval EFI_SUCCESS Function successfully executed.
> + @retval EFI_OUT_OF_RESOURCES Fail to allocate enough memory
> resource.
> + @retval EFI_VOLUME_CORRUPTED Variable Store or Firmware Volume for
> Variable Store is corrupted.
> +
> +**/
> +EFI_STATUS
> +InitNonVolatileVariableStore (
> + VOID
> + )
> +{
> + VARIABLE_HEADER *Variable;
> + VARIABLE_HEADER *NextVariable;
> + EFI_PHYSICAL_ADDRESS VariableStoreBase;
> + UINTN VariableSize;
> + EFI_STATUS Status;
> +
> + Status = InitRealNonVolatileVariableStore (&VariableStoreBase);
> + if (EFI_ERROR (Status)) {
> + return Status;
> + }
> +
> + mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase =
> VariableStoreBase;
> + mNvVariableCache = (VARIABLE_STORE_HEADER *) (UINTN)
> VariableStoreBase;
> + mVariableModuleGlobal->VariableGlobal.AuthFormat =
> (BOOLEAN)(CompareGuid (&mNvVariableCache->Signature,
> &gEfiAuthenticatedVariableGuid));
> +
> mVariableModuleGlobal->MaxVariableSize = PcdGet32
> (PcdMaxVariableSize);
> mVariableModuleGlobal->MaxAuthVariableSize = ((PcdGet32
> (PcdMaxAuthVariableSize) != 0) ? PcdGet32 (PcdMaxAuthVariableSize) :
> mVariableModuleGlobal->MaxVariableSize);
>
> //
> // Parse non-volatile variable data and get last variable offset.
> //
> - Variable = GetStartPointer ((VARIABLE_STORE_HEADER
> *)(UINTN)VariableStoreBase);
> - while (IsValidVariableHeader (Variable, GetEndPointer
> ((VARIABLE_STORE_HEADER *)(UINTN)VariableStoreBase))) {
> + Variable = GetStartPointer (mNvVariableCache);
> + while (IsValidVariableHeader (Variable, GetEndPointer
> (mNvVariableCache))) {
> NextVariable = GetNextVariablePtr (Variable);
> VariableSize = (UINTN) NextVariable - (UINTN) Variable;
> if ((Variable->Attributes & (EFI_VARIABLE_NON_VOLATILE |
> EFI_VARIABLE_HARDWARE_ERROR_RECORD)) ==
> (EFI_VARIABLE_NON_VOLATILE |
> EFI_VARIABLE_HARDWARE_ERROR_RECORD)) {
> @@ -3896,9 +3925,8 @@ InitNonVolatileVariableStore (
>
> Variable = NextVariable;
> }
> - mVariableModuleGlobal->NonVolatileLastVariableOffset = (UINTN)
> Variable - (UINTN) VariableStoreBase;
> + mVariableModuleGlobal->NonVolatileLastVariableOffset = (UINTN)
> Variable - (UINTN) mNvVariableCache;
>
> - *NvFvHeader = FvHeader;
> return EFI_SUCCESS;
> }
>
> @@ -4303,7 +4331,6 @@ VariableCommonInitialize (
> VARIABLE_STORE_HEADER *VolatileVariableStore;
> UINTN ScratchSize;
> EFI_GUID *VariableGuid;
> - EFI_FIRMWARE_VOLUME_HEADER *NvFvHeader;
>
> //
> // Allocate runtime memory for variable driver global structure.
> @@ -4318,8 +4345,7 @@ VariableCommonInitialize (
> //
> // Init non-volatile variable store.
> //
> - NvFvHeader = NULL;
> - Status = InitNonVolatileVariableStore (&NvFvHeader);
> + Status = InitNonVolatileVariableStore ();
> if (EFI_ERROR (Status)) {
> FreePool (mVariableModuleGlobal);
> return Status;
> @@ -4347,7 +4373,9 @@ VariableCommonInitialize (
> //
> Status = GetHobVariableStore (VariableGuid);
> if (EFI_ERROR (Status)) {
> - FreePool (NvFvHeader);
> + if (mNvFvHeaderCache != NULL) {
> + FreePool (mNvFvHeaderCache);
> + }
> FreePool (mVariableModuleGlobal);
> return Status;
> }
> @@ -4366,7 +4394,9 @@ VariableCommonInitialize (
> if (mVariableModuleGlobal->VariableGlobal.HobVariableBase != 0) {
> FreePool ((VOID *) (UINTN) mVariableModuleGlobal-
> >VariableGlobal.HobVariableBase);
> }
> - FreePool (NvFvHeader);
> + if (mNvFvHeaderCache != NULL) {
> + FreePool (mNvFvHeaderCache);
> + }
> FreePool (mVariableModuleGlobal);
> return EFI_OUT_OF_RESOURCES;
> }
> --
> 2.7.0.windows.1
next prev parent reply other threads:[~2019-01-15 6:37 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 15:19 [PATCH V2 00/15] Merge EmuVariable and Real variable driver Star Zeng
2019-01-14 15:19 ` [PATCH V2 01/15] MdeModulePkg Variable: Add some missing changes for 9b18845 Star Zeng
2019-01-15 6:36 ` Wu, Hao A
2019-01-15 8:06 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 02/15] MdeModulePkg Variable: Abstract InitRealNonVolatileVariableStore Star Zeng
2019-01-15 6:37 ` Wu, Hao A [this message]
2019-01-14 15:19 ` [PATCH V2 03/15] MdeModulePkg Variable: Not get NV PCD in VariableWriteServiceInitialize Star Zeng
2019-01-15 5:48 ` Wu, Hao A
2019-01-15 5:53 ` Zeng, Star
2019-01-15 6:37 ` Wang, Jian J
2019-01-15 10:13 ` Zeng, Star
2019-01-14 15:19 ` [PATCH V2 04/15] MdeModulePkg Variable: Abstract VariableWriteServiceInitializeDxe/Smm Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-15 8:05 ` Wang, Jian J
2019-01-14 15:19 ` [PATCH V2 05/15] MdeModulePkg: Add PcdEmuVariableNvModeEnable in dec Star Zeng
2019-01-15 5:05 ` Wang, Jian J
2019-01-15 5:55 ` Zeng, Star
2019-01-15 6:37 ` Wu, Hao A
2019-01-14 15:19 ` [PATCH V2 06/15] MdeModulePkg Variable: Remove CacheOffset in UpdateVariable() Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-15 8:04 ` Wang, Jian J
2019-01-15 9:58 ` Laszlo Ersek
2019-01-15 10:10 ` Zeng, Star
2019-01-15 8:15 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 07/15] MdeModulePkg Variable: type case VolatileBase to UINTN directly Star Zeng
2019-01-15 6:37 ` Wu, Hao A
2019-01-15 8:06 ` Wang, Jian J
2019-01-15 8:18 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 08/15] MdeModulePkg Variable: Add emulated variable NV mode support Star Zeng
2019-01-15 6:01 ` Wang, Jian J
2019-01-15 6:16 ` Zeng, Star
2019-01-15 9:53 ` Laszlo Ersek
2019-01-15 9:33 ` Laszlo Ersek
2019-01-15 9:52 ` Zeng, Star
2019-01-14 15:19 ` [PATCH V2 09/15] MdeModulePkg VariablePei: Don't check BOOT_IN_RECOVERY_MODE Star Zeng
2019-01-14 15:19 ` [PATCH V2 10/15] ArmVirtXen: Use merged variable driver for emulated NV mode Star Zeng
2019-01-15 9:37 ` Laszlo Ersek
2019-01-16 14:26 ` Julien Grall
2019-01-17 1:26 ` Zeng, Star
2019-01-17 18:59 ` Julien Grall
2019-01-21 10:46 ` Zeng, Star
2019-01-21 13:36 ` Julien Grall
2019-01-21 19:40 ` Ard Biesheuvel
2019-01-22 4:30 ` Zeng, Star
2019-01-23 1:41 ` Zeng, Star
2019-01-23 12:15 ` Julien Grall
2019-01-23 14:20 ` Zeng, Star
2019-01-21 21:15 ` Laszlo Ersek
2019-01-21 21:22 ` Ard Biesheuvel
2019-01-21 21:25 ` Ard Biesheuvel
2019-01-14 15:19 ` [PATCH V2 11/15] ArmVirtXen: Link VarCheckUefiLib NULL class library instance Star Zeng
2019-01-15 9:39 ` Laszlo Ersek
2019-01-14 15:19 ` [PATCH V2 12/15] BeagleBoardPkg: Use merged variable driver for emulated NV mode Star Zeng
2019-01-14 22:11 ` Leif Lindholm
2019-01-15 1:32 ` Zeng, Star
2019-01-15 9:48 ` Leif Lindholm
2019-01-14 15:19 ` [PATCH V2 13/15] QuarkMin: " Star Zeng
2019-01-14 15:19 ` [PATCH V2 14/15] CorebootPayloadPkg: " Star Zeng
2019-01-14 15:19 ` [PATCH V2 15/15] MdeModulePkg: Remove EmuVariableRuntimeDxe Star Zeng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=B80AF82E9BFB8E4FBD8C89DA810C6A093C87E605@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox