[edk2-devel] [PATCH V4 00/27] Disabling safe string constraint assertions
Liming Gao
liming.gao at intel.com
Wed May 13 17:59:03 UTC 2020
Vitaly:
I would like to propose one solution to update DebugLib.h only. This solution directly declares PcdDebugPropertyMask global variable in DebugLib.h. Then, DebugLib macro can use it. Because most of DebugLib library instances describe PcdDebugPropertyMask in their INF, this PCD can be generated without the additional change. I also evaluate PcdDebugPropertyMask usage in existing platform. This PCD is always used as FixedAtBuild. So, I change PcdDebugPropertyMask type in DEC to FixedAtBuild. This change impact should be smaller than current patch set. Below patch passes the build on OvmfPkg. It should work.
Besides, new PcdDebugPropertyMask BIT6 for Treat constraint violations as ASSERT. This BIT should be enabled by default to be compatible with current platform. Now, most platforms set this PCD PcdDebugPropertyMask in their platform DSC file. PCD value is also required to be updated. Another compatible way is to define BIT6 for Treat constraint violations as empty. When BIT6 is 1, it means constraint violation as empty. When BIT6 is 0, it means constraint violation as ASSERT. If so, this PCD value is not required to be changed in platform DSC.
Thanks
Liming
---
MdePkg/Include/Library/DebugLib.h | 7 ++++++-
.../Library/BaseDebugLibNull/BaseDebugLibNull.inf | 4 ++++
MdePkg/MdePkg.dec | 22 +++++++++++-----------
3 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index baab34bf05..68604de869 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -321,6 +321,11 @@ DebugPrintLevelEnabled (
#define _DEBUG(Expression) DebugPrint Expression
#endif
+//
+// FixedAtBuild PCD value PcdDebugPropertyMask
+//
+extern const UINT8 _gPcd_FixedAtBuild_PcdDebugPropertyMask;
+
/**
Macro that calls DebugAssert() if an expression evaluates to FALSE.
@@ -336,7 +341,7 @@ DebugPrintLevelEnabled (
#if !defined(MDEPKG_NDEBUG)
#define ASSERT(Expression) \
do { \
- if (DebugAssertEnabled ()) { \
+ if ((DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED & _gPcd_FixedAtBuild_PcdDebugPropertyMask) != 0) { \
if (!(Expression)) { \
_ASSERT (Expression); \
ANALYZER_UNREACHABLE (); \
diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
index 81a63a5074..1e95a2f077 100644
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf
@@ -29,3 +29,7 @@
[Packages]
MdePkg/MdePkg.dec
+[Pcd]
+ # This PCD is consumed in DebugLib.h
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask ## CONSUMES
+
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 0ab09195c1..f8aacdf428 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2105,6 +2105,17 @@
# @Prompt Speculation Barrier Type.
gEfiMdePkgTokenSpaceGuid.PcdSpeculationBarrierType|0x01|UINT8|0x30001018
+ ## The mask is used to control DebugLib behavior.<BR><BR>
+ # BIT0 - Enable Debug Assert.<BR>
+ # BIT1 - Enable Debug Print.<BR>
+ # BIT2 - Enable Debug Code.<BR>
+ # BIT3 - Enable Clear Memory.<BR>
+ # BIT4 - Enable BreakPoint as ASSERT.<BR>
+ # BIT5 - Enable DeadLoop as ASSERT.<BR>
+ # @Prompt Debug Property.
+ # @Expression 0x80000002 | (gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask & 0xC0) == 0
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000005
+
[PcdsFixedAtBuild,PcdsPatchableInModule]
## Indicates the maximum length of unicode string used in the following
# BaseLib functions: StrLen(), StrSize(), StrCmp(), StrnCmp(), StrCpy(), StrnCpy()<BR><BR>
@@ -2139,17 +2150,6 @@
# @Prompt Spin Lock Timeout (us).
gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000|UINT32|0x00000004
- ## The mask is used to control DebugLib behavior.<BR><BR>
- # BIT0 - Enable Debug Assert.<BR>
- # BIT1 - Enable Debug Print.<BR>
- # BIT2 - Enable Debug Code.<BR>
- # BIT3 - Enable Clear Memory.<BR>
- # BIT4 - Enable BreakPoint as ASSERT.<BR>
- # BIT5 - Enable DeadLoop as ASSERT.<BR>
- # @Prompt Debug Property.
- # @Expression 0x80000002 | (gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask & 0xC0) == 0
- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000005
-
## This flag is used to control the print out Debug message.<BR><BR>
# BIT0 - Initialization message.<BR>
# BIT1 - Warning message.<BR>
--
Thanks
Liming
> -----Original Message-----
> From: Vitaly Cheptsov <cheptsov at ispras.ru>
> Sent: Wednesday, May 13, 2020 2:58 AM
> To: Kinney, Michael D <michael.d.kinney at intel.com>; lersek at redhat.com
> Cc: devel at edk2.groups.io; Andrew Fish <afish at apple.com>; Marvin Häuser <mhaeuser at outlook.de>; Gao, Liming
> <liming.gao at intel.com>; Gao, Zhichao <zhichao.gao at intel.com>
> Subject: Re: [edk2-devel] [PATCH V4 00/27] Disabling safe string constraint assertions
>
> Mike,
>
> I see what you mean here, but I believe it is absolutely fine to implement DebugCommonLib.h interface within DebugLib without
> depending on DebugCommonLib if one absolutely desires it (thought I do not think it is a good idea).
> In this case, perhaps we can avoid adding DebugCommonLib.h header at all and leave it all in DebugLib.h?
> So that DebugCommonLib library is entirely private thing to DebugLib, which can either use it or not.
>
> Best wishes,
> Vitaly
>
> > 12 мая 2020 г., в 21:18, Kinney, Michael D <michael.d.kinney at intel.com> написал(а):
> >
> > Laszlo,
> >
> > A library implementation that uses another library class
> > lists those library classes in the library INF. This is
> > a way a module can inherit the use of a second lib without
> > listing the second lib in the module INF. This is the
> > type of inheritance that is supported by the EDK II build
> > system and the EDK II meta data files.
> >
> > What is not supported today is indirect inheritance from
> > the libclass .h file itself. There is no mechanism for
> > the libclass .h file to declare it is using another library
> > class. This would require extensions to the meta data
> > files to declare this type dependency.
> >
> > How does the build system know to add DebugCommonLib to
> > the link command for a module that only lists DebugLib
> > in its library classes section? What if there is a
> > DebugLib implementation of the DebugLib class that
> > does not depend on DebugCommonLib. The module link
> > will then fail when the module writer followed all the
> > rules. This is why including a libclass from another
> > libclass is bad idea.
> >
> > Mike
> >
> >> -----Original Message-----
> >> From: devel at edk2.groups.io <devel at edk2.groups.io> On
> >> Behalf Of Laszlo Ersek
> >> Sent: Tuesday, May 12, 2020 2:51 AM
> >> To: Kinney, Michael D <michael.d.kinney at intel.com>;
> >> Vitaly Cheptsov <cheptsov at ispras.ru>;
> >> devel at edk2.groups.io
> >> Cc: Andrew Fish <afish at apple.com>; Marvin Häuser
> >> <mhaeuser at outlook.de>; Gao, Liming
> >> <liming.gao at intel.com>; Gao, Zhichao
> >> <zhichao.gao at intel.com>
> >> Subject: Re: [edk2-devel] [PATCH V4 00/27] Disabling
> >> safe string constraint assertions
> >>
> >> On 05/12/20 00:40, Kinney, Michael D wrote:
> >>> Vitaly,
> >>>
> >>> Thank you for the contribution.
> >>>
> >>> There are a couple points about this approach that
> >> need to be discussed.
> >>>
> >>> You have included the <Library/DebugCommonLib.h> from
> >>> MdePkg/Include/Library/DebugLib.h.
> >>
> >> Right, I've noticed it. I agree it's unusual. I didn't
> >> think it was wrong.
> >>
> >>> It is very rare for a
> >>> lib class to include another lib class. This means
> >> that a module
> >>> that has a dependency on the DebugLib class inherits
> >> a hidden
> >>> dependency on the DebugCommonLib class.
> >>
> >> I agree.
> >>
> >> I think it should be fine. Any header H1 should include
> >> such further
> >> headers H2, H3, ... Hn that are required for making the
> >> interfaces
> >> declared in H1 usable in client modules.
> >>
> >>> For module INF files,
> >>> we require the INF file to list all the lib classes
> >> that the
> >>> module sources directly use.
> >>
> >> Yes, keyword being "directly".
> >>
> >>> Since a module that uses the
> >>> DebugLib uses the ASSERT() and DEBUG() macros, all
> >> the APIs
> >>> that the ASSERT() and DEBUG() macros use are also
> >> directly
> >>> used by the module.
> >>
> >> I believe this is where I disagree. The replacement
> >> texts of the
> >> ASSERT() and DEBUG() function-like macros are internals
> >> of the
> >> DebugLib.h lib class header, in my opinion. Those
> >> internals place
> >> requirements on specific DebugLib instances, not on
> >> DebugLib class
> >> consumers.
> >>
> >> In other words, when writing a new DebugLib instance,
> >> the implementor
> >> has to ensure that the ASSERT() and DEBUG() macros, as
> >> defined in the
> >> DebugLib class header, will continue working in
> >> DebugLib consumer
> >> modules. The implementor may then choose to make the
> >> new DebugLib
> >> instance dependent on the (singleton) DebugCommonLib
> >> instance, for
> >> example. (This is being done in patches #3, #4, #16,
> >> maybe more.) The
> >> DebugLib consumer module will inherit that dependency,
> >> and everything
> >> will work.
> >>
> >> Just because ASSERT() and DEBUG() are function-like
> >> macros and not
> >> actual functions, I don't think the INF file
> >> requirements in
> >> DebugLib-consumer modules should change.
> >>
> >>> With this patch series, these macros
> >>> now use the DebugCommonLib class APIs, which means
> >> any module
> >>> that uses the DebugLib also directly uses the
> >> DebugCommonLib.
> >>
> >> In my opinion: indirectly.
> >>
> >> Thanks,
> >> Laszlo
> >>
> >>
> >>
> >
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#59448): https://edk2.groups.io/g/devel/message/59448
Mute This Topic: https://groups.io/mt/74138532/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list