From: "Wu, Hao A" <hao.a.wu@intel.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Gao, Liming" <liming.gao@intel.com>
Subject: Re: [Patch] MdeModulePkg/Variable/RuntimeDxe: Fix return status from Reclaim()
Date: Tue, 14 Jul 2020 02:19:10 +0000 [thread overview]
Message-ID: <BN8PR11MB366686CF96E8E183C492EA10CA610@BN8PR11MB3666.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20200710030455.6036-1-michael.d.kinney@intel.com>
> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Friday, July 10, 2020 11:05 AM
> To: devel@edk2.groups.io
> Cc: Wu, Hao A <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] MdeModulePkg/Variable/RuntimeDxe: Fix return status from
> Reclaim()
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2844
>
> Update Reclaim() to return the error status from the reclaim operation and
> not the status of SynchronizeRuntimeVariableCache() that can be
> EFI_SUCCESS even through the status from reclaim is an error. Without this
> change, the return status from
> SetVariable() can be EFI_SUCCESS even though the variable was not actually
> set. This occurs if the variable store is full and a Reclaim() is invoked to free
> up space and even after all possible space is freed, there is still not enough
> room for the variable being set. This condition should return
> EFI_OUT_OF_RESOURCES.
>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
> .../Universal/Variable/RuntimeDxe/Variable.c | 30 +++++++++++--------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> index 1e71fc642c..41f8ff4ceb 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
> @@ -531,6 +531,7 @@ Reclaim (
> VOID *Point1;
> BOOLEAN FoundAdded;
> EFI_STATUS Status;
> + EFI_STATUS DoneStatus;
> UINTN CommonVariableTotalSize;
> UINTN CommonUserVariableTotalSize;
> UINTN HwErrVariableTotalSize;
> @@ -774,25 +775,30 @@ Reclaim (
> }
>
> Done:
> + DoneStatus = EFI_SUCCESS;
> if (IsVolatile || mVariableModuleGlobal->VariableGlobal.EmuNvMode) {
> - Status = SynchronizeRuntimeVariableCache (
> - &mVariableModuleGlobal-
> >VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeVolatileCach
> e,
> - 0,
> - VariableStoreHeader->Size
> - );
> - ASSERT_EFI_ERROR (Status);
> + DoneStatus = SynchronizeRuntimeVariableCache (
> + &mVariableModuleGlobal-
> >VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeVolatileCach
> e,
> + 0,
> + VariableStoreHeader->Size
> + );
> + ASSERT_EFI_ERROR (DoneStatus);
> FreePool (ValidBuffer);
> } else {
> //
> // For NV variable reclaim, we use mNvVariableCache as the buffer, so
> copy the data back.
> //
> CopyMem (mNvVariableCache, (UINT8 *) (UINTN) VariableBase,
> VariableStoreHeader->Size);
> - Status = SynchronizeRuntimeVariableCache (
> - &mVariableModuleGlobal-
> >VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeNvCache,
> - 0,
> - VariableStoreHeader->Size
> - );
> - ASSERT_EFI_ERROR (Status);
> + DoneStatus = SynchronizeRuntimeVariableCache (
> + &mVariableModuleGlobal-
> >VariableGlobal.VariableRuntimeCacheContext.VariableRuntimeNvCache,
> + 0,
> + VariableStoreHeader->Size
> + );
> + ASSERT_EFI_ERROR (DoneStatus);
> + }
> +
> + if (!EFI_ERROR (Status) && EFI_ERROR (DoneStatus)) {
> + Status = DoneStatus;
> }
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Best Regards,
Hao Wu
>
> return Status;
> --
> 2.21.0.windows.1
next prev parent reply other threads:[~2020-07-14 2:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 3:04 [Patch] MdeModulePkg/Variable/RuntimeDxe: Fix return status from Reclaim() Michael D Kinney
2020-07-14 2:19 ` Wu, Hao A [this message]
2020-07-14 2:28 ` [edk2-devel] " Wang, Jian J
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=BN8PR11MB366686CF96E8E183C492EA10CA610@BN8PR11MB3666.namprd11.prod.outlook.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