* 回复: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
[not found] <20210609233845.1392-1-kenlautner3@gmail.com>
@ 2021-06-10 0:53 ` gaoliming
2021-06-10 21:34 ` [edk2-devel] " kenlautner3
0 siblings, 1 reply; 3+ messages in thread
From: gaoliming @ 2021-06-10 0:53 UTC (permalink / raw)
To: kenlautner3, devel
Cc: 'Jian J Wang', 'Hao A Wu', 'Zhichao Gao',
'Ray Ni'
Ken:
I add my comment below. Besides, some modules in MdeModulePkg still
consumes VariableLock, such as UefiBootManagerLib, PcdDxe. Have you plan to
fix them also?
> -----邮件原件-----
> 发件人: kenlautner3@gmail.com <kenlautner3@gmail.com>
> 发送时间: 2021年6月10日 7:39
> 收件人: devel@edk2.groups.io
> 抄送: Jian J Wang <jian.j.wang@intel.com>; Hao A Wu
> <hao.a.wu@intel.com>; Zhichao Gao <zhichao.gao@intel.com>; Ray Ni
> <ray.ni@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> 主题: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use
> Variable Policy
>
> From: Ken Lautner <klautner@microsoft.com>
Please add BZ link here. https://bugzilla.tianocore.org/show_bug.cgi?id=3421
>
> Changed BdsEntry.c to use Variable Policy instead of Variable Lock
> as Variable Lock will be Deprecated eventually
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
> ---
> MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 4 +++-
> MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 +++++++++++++++-----
> 2 files changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> index 9310b4dccb18..76ff6a0f5fc3 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> @@ -50,6 +50,8 @@
> BaseMemoryLib
>
> DebugLib
>
> UefiBootManagerLib
>
> + VariablePolicyLib
>
> + VariablePolicyHelperLib
>
> PlatformBootManagerLib
>
> PcdLib
>
> PrintLib
>
> @@ -77,7 +79,7 @@
> [Protocols]
>
> gEfiBdsArchProtocolGuid ## PRODUCES
>
> gEfiSimpleTextInputExProtocolGuid ## CONSUMES
>
> - gEdkiiVariableLockProtocolGuid ##
> SOMETIMES_CONSUMES
>
> + gEdkiiVariablePolicyProtocolGuid ##
> SOMETIMES_CONSUMES
>
> gEfiDeferredImageLoadProtocolGuid ## CONSUMES
>
>
>
> [FeaturePcd]
>
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> index 83b773a2fa5f..13723bee299b 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> @@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> #include "Bds.h"
>
> #include "Language.h"
>
> #include "HwErrRecSupport.h"
>
> +#include "library/VariablePolicyHelperLib.h"
>
Use the correct directory name to pass Windows VS tool chain and Linux GCC
tool chain.
With this change, Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
Thanks
Liming
>
>
> #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
>
> (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) <<
> LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) &
> EFI_BOOT_OPTION_SUPPORT_COUNT); \
>
> @@ -670,7 +671,7 @@ BdsEntry (
> EFI_STATUS Status;
>
> UINT32 BootOptionSupport;
>
> UINT16 BootTimeOut;
>
> - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;
>
> + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;
>
> UINTN Index;
>
> EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;
>
> UINT16 *BootNext;
>
> @@ -716,12 +717,21 @@ BdsEntry (
> //
>
> // Mark the read-only variables if the Variable Lock protocol exists
>
> //
>
> - Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL,
> (VOID **) &VariableLock);
>
> - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n",
> Status));
>
> + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL,
> (VOID**)&VariablePolicy);
>
> + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n",
> Status));
>
> if (!EFI_ERROR (Status)) {
>
> for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
>
> - Status = VariableLock->RequestToLock (VariableLock,
> mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
>
> - ASSERT_EFI_ERROR (Status);
>
> + Status = RegisterBasicVariablePolicy(
>
> + VariablePolicy,
>
> + &gEfiGlobalVariableGuid,
>
> + mReadOnlyVariables[Index],
>
> + VARIABLE_POLICY_NO_MIN_SIZE,
>
> + VARIABLE_POLICY_NO_MAX_SIZE,
>
> + VARIABLE_POLICY_NO_MUST_ATTR,
>
> + VARIABLE_POLICY_NO_CANT_ATTR,
>
> + VARIABLE_POLICY_TYPE_LOCK_NOW
>
> + );
>
> + ASSERT_EFI_ERROR(Status);
>
> }
>
> }
>
>
>
> --
> 2.25.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [edk2-devel] 回复: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
2021-06-10 0:53 ` 回复: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy gaoliming
@ 2021-06-10 21:34 ` kenlautner3
0 siblings, 0 replies; 3+ messages in thread
From: kenlautner3 @ 2021-06-10 21:34 UTC (permalink / raw)
To: devel, Liming Gao
[-- Attachment #1: Type: text/plain, Size: 5585 bytes --]
Liming,
I plan on fixing those modules as well. I created a new Bugzilla here: 3449
– VariablePolicy needs to replace VariableLock. (tianocore.org)
<https://bugzilla.tianocore.org/show_bug.cgi?id=3449>.
On Wed, Jun 9, 2021 at 5:53 PM gaoliming <gaoliming@byosoft.com.cn> wrote:
> Ken:
> I add my comment below. Besides, some modules in MdeModulePkg still
> consumes VariableLock, such as UefiBootManagerLib, PcdDxe. Have you plan to
> fix them also?
>
> > -----邮件原件-----
> > 发件人: kenlautner3@gmail.com <kenlautner3@gmail.com>
> > 发送时间: 2021年6月10日 7:39
> > 收件人: devel@edk2.groups.io
> > 抄送: Jian J Wang <jian.j.wang@intel.com>; Hao A Wu
> > <hao.a.wu@intel.com>; Zhichao Gao <zhichao.gao@intel.com>; Ray Ni
> > <ray.ni@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> > 主题: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use
> > Variable Policy
> >
> > From: Ken Lautner <klautner@microsoft.com>
>
> Please add BZ link here.
> https://bugzilla.tianocore.org/show_bug.cgi?id=3421
> >
> > Changed BdsEntry.c to use Variable Policy instead of Variable Lock
> > as Variable Lock will be Deprecated eventually
> >
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Hao A Wu <hao.a.wu@intel.com>
> > Cc: Zhichao Gao <zhichao.gao@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
> > ---
> > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 4 +++-
> > MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 +++++++++++++++-----
> > 2 files changed, 18 insertions(+), 6 deletions(-)
> >
> > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> > b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> > index 9310b4dccb18..76ff6a0f5fc3 100644
> > --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> > +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> > @@ -50,6 +50,8 @@
> > BaseMemoryLib
> >
> > DebugLib
> >
> > UefiBootManagerLib
> >
> > + VariablePolicyLib
> >
> > + VariablePolicyHelperLib
> >
> > PlatformBootManagerLib
> >
> > PcdLib
> >
> > PrintLib
> >
> > @@ -77,7 +79,7 @@
> > [Protocols]
> >
> > gEfiBdsArchProtocolGuid ## PRODUCES
> >
> > gEfiSimpleTextInputExProtocolGuid ## CONSUMES
> >
> > - gEdkiiVariableLockProtocolGuid ##
> > SOMETIMES_CONSUMES
> >
> > + gEdkiiVariablePolicyProtocolGuid ##
> > SOMETIMES_CONSUMES
> >
> > gEfiDeferredImageLoadProtocolGuid ## CONSUMES
> >
> >
> >
> > [FeaturePcd]
> >
> > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> > b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> > index 83b773a2fa5f..13723bee299b 100644
> > --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> > +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> > @@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> > #include "Bds.h"
> >
> > #include "Language.h"
> >
> > #include "HwErrRecSupport.h"
> >
> > +#include "library/VariablePolicyHelperLib.h"
> >
> Use the correct directory name to pass Windows VS tool chain and Linux GCC
> tool chain.
>
> With this change, Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>
> Thanks
> Liming
> >
> >
> > #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
> >
> > (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) <<
> > LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) &
> > EFI_BOOT_OPTION_SUPPORT_COUNT); \
> >
> > @@ -670,7 +671,7 @@ BdsEntry (
> > EFI_STATUS Status;
> >
> > UINT32 BootOptionSupport;
> >
> > UINT16 BootTimeOut;
> >
> > - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;
> >
> > + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;
> >
> > UINTN Index;
> >
> > EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;
> >
> > UINT16 *BootNext;
> >
> > @@ -716,12 +717,21 @@ BdsEntry (
> > //
> >
> > // Mark the read-only variables if the Variable Lock protocol exists
> >
> > //
> >
> > - Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL,
> > (VOID **) &VariableLock);
> >
> > - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n",
> > Status));
> >
> > + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL,
> > (VOID**)&VariablePolicy);
> >
> > + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n",
> > Status));
> >
> > if (!EFI_ERROR (Status)) {
> >
> > for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
> >
> > - Status = VariableLock->RequestToLock (VariableLock,
> > mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
> >
> > - ASSERT_EFI_ERROR (Status);
> >
> > + Status = RegisterBasicVariablePolicy(
> >
> > + VariablePolicy,
> >
> > + &gEfiGlobalVariableGuid,
> >
> > + mReadOnlyVariables[Index],
> >
> > + VARIABLE_POLICY_NO_MIN_SIZE,
> >
> > + VARIABLE_POLICY_NO_MAX_SIZE,
> >
> > + VARIABLE_POLICY_NO_MUST_ATTR,
> >
> > + VARIABLE_POLICY_NO_CANT_ATTR,
> >
> > + VARIABLE_POLICY_TYPE_LOCK_NOW
> >
> > + );
> >
> > + ASSERT_EFI_ERROR(Status);
> >
> > }
> >
> > }
> >
> >
> >
> > --
> > 2.25.1.windows.1
>
>
>
>
>
>
>
>
>
[-- Attachment #2: Type: text/html, Size: 8324 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* 回复: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy
2021-06-17 16:06 Kenneth Lautner
@ 2021-06-18 0:53 ` gaoliming
0 siblings, 0 replies; 3+ messages in thread
From: gaoliming @ 2021-06-18 0:53 UTC (permalink / raw)
To: kenlautner3, devel
Cc: 'Jian J Wang', 'Hao A Wu', 'Zhichao Gao',
'Ray Ni'
Ken:
This version looks good to me. If no other comment is got, I will merge
it.
Thanks
Liming
> -----邮件原件-----
> 发件人: kenlautner3@gmail.com <kenlautner3@gmail.com>
> 发送时间: 2021年6月18日 0:07
> 收件人: devel@edk2.groups.io
> 抄送: Jian J Wang <jian.j.wang@intel.com>; Hao A Wu
> <hao.a.wu@intel.com>; Zhichao Gao <zhichao.gao@intel.com>; Ray Ni
> <ray.ni@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> 主题: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use
> Variable Policy
>
> From: Ken Lautner <klautner@microsoft.com>
>
> Changed BdsEntry.c to use Variable Policy instead of Variable Lock
> as Variable Lock will be Deprecated eventually
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
>
> Signed-off-by: Kenneth Lautner <kenlautner3@gmail.com>
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
> ---
> MdeModulePkg/Universal/BdsDxe/Bds.h | 1 -
> MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 4 +++-
> MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 20 +++++++++++++++-----
> 3 files changed, 18 insertions(+), 7 deletions(-)
>
> diff --git a/MdeModulePkg/Universal/BdsDxe/Bds.h
> b/MdeModulePkg/Universal/BdsDxe/Bds.h
> index e7a9b5b4b7cb..84548041e861 100644
> --- a/MdeModulePkg/Universal/BdsDxe/Bds.h
> +++ b/MdeModulePkg/Universal/BdsDxe/Bds.h
> @@ -17,7 +17,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
>
> #include <Protocol/Bds.h>
>
> #include <Protocol/LoadedImage.h>
>
> -#include <Protocol/VariableLock.h>
>
> #include <Protocol/DeferredImageLoad.h>
>
>
>
> #include <Library/UefiDriverEntryPoint.h>
>
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> index 9310b4dccb18..76ff6a0f5fc3 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
> @@ -50,6 +50,8 @@
> BaseMemoryLib
>
> DebugLib
>
> UefiBootManagerLib
>
> + VariablePolicyLib
>
> + VariablePolicyHelperLib
>
> PlatformBootManagerLib
>
> PcdLib
>
> PrintLib
>
> @@ -77,7 +79,7 @@
> [Protocols]
>
> gEfiBdsArchProtocolGuid ## PRODUCES
>
> gEfiSimpleTextInputExProtocolGuid ## CONSUMES
>
> - gEdkiiVariableLockProtocolGuid ##
> SOMETIMES_CONSUMES
>
> + gEdkiiVariablePolicyProtocolGuid ##
> SOMETIMES_CONSUMES
>
> gEfiDeferredImageLoadProtocolGuid ## CONSUMES
>
>
>
> [FeaturePcd]
>
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> index 83b773a2fa5f..13c10bdc5bf8 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> @@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> #include "Bds.h"
>
> #include "Language.h"
>
> #include "HwErrRecSupport.h"
>
> +#include <Library/VariablePolicyHelperLib.h>
>
>
>
> #define SET_BOOT_OPTION_SUPPORT_KEY_COUNT(a, c) { \
>
> (a) = ((a) & ~EFI_BOOT_OPTION_SUPPORT_COUNT) | (((c) <<
> LowBitSet32 (EFI_BOOT_OPTION_SUPPORT_COUNT)) &
> EFI_BOOT_OPTION_SUPPORT_COUNT); \
>
> @@ -670,7 +671,7 @@ BdsEntry (
> EFI_STATUS Status;
>
> UINT32 BootOptionSupport;
>
> UINT16 BootTimeOut;
>
> - EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;
>
> + EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy;
>
> UINTN Index;
>
> EFI_BOOT_MANAGER_LOAD_OPTION LoadOption;
>
> UINT16 *BootNext;
>
> @@ -716,12 +717,21 @@ BdsEntry (
> //
>
> // Mark the read-only variables if the Variable Lock protocol exists
>
> //
>
> - Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL,
> (VOID **) &VariableLock);
>
> - DEBUG ((EFI_D_INFO, "[BdsDxe] Locate Variable Lock protocol - %r\n",
> Status));
>
> + Status = gBS->LocateProtocol(&gEdkiiVariablePolicyProtocolGuid, NULL,
> (VOID**)&VariablePolicy);
>
> + DEBUG((DEBUG_INFO, "[BdsDxe] Locate Variable Policy protocol - %r\n",
> Status));
>
> if (!EFI_ERROR (Status)) {
>
> for (Index = 0; Index < ARRAY_SIZE (mReadOnlyVariables); Index++) {
>
> - Status = VariableLock->RequestToLock (VariableLock,
> mReadOnlyVariables[Index], &gEfiGlobalVariableGuid);
>
> - ASSERT_EFI_ERROR (Status);
>
> + Status = RegisterBasicVariablePolicy(
>
> + VariablePolicy,
>
> + &gEfiGlobalVariableGuid,
>
> + mReadOnlyVariables[Index],
>
> + VARIABLE_POLICY_NO_MIN_SIZE,
>
> + VARIABLE_POLICY_NO_MAX_SIZE,
>
> + VARIABLE_POLICY_NO_MUST_ATTR,
>
> + VARIABLE_POLICY_NO_CANT_ATTR,
>
> + VARIABLE_POLICY_TYPE_LOCK_NOW
>
> + );
>
> + ASSERT_EFI_ERROR(Status);
>
> }
>
> }
>
>
>
> --
> 2.31.1.windows.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-18 0:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20210609233845.1392-1-kenlautner3@gmail.com>
2021-06-10 0:53 ` 回复: [PATCH v1 1/1] MdeModulePkg/BdsDxe: Update BdsEntry to use Variable Policy gaoliming
2021-06-10 21:34 ` [edk2-devel] " kenlautner3
2021-06-17 16:06 Kenneth Lautner
2021-06-18 0:53 ` 回复: " gaoliming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox