From: "Vitaly Cheptsov" <cheptsov@ispras.ru>
To: devel@edk2.groups.io
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
Liming Gao <liming.gao@intel.com>
Subject: [PATCH V5 26/27] MdePkg: Introduce assertion on constraint debug mask bit
Date: Tue, 12 May 2020 20:02:36 +0300 [thread overview]
Message-ID: <20200512170237.19796-27-cheptsov@ispras.ru> (raw)
In-Reply-To: <20200512170237.19796-1-cheptsov@ispras.ru>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2054
This bit allows to control assertion on constraint violation.
CC: Michael D Kinney <michael.d.kinney@intel.com>
CC: Liming Gao <liming.gao@intel.com>
Signed-off-by: Vitaly Cheptsov <vit9696@protonmail.com>
---
MdePkg/Include/Library/DebugCommonLib.h | 18 ++++++++++++++++++
MdePkg/Include/Library/DebugLib.h | 18 ++++++++++++++++++
MdePkg/Library/BaseDebugCommonLib/DebugCommonLib.c | 20 ++++++++++++++++++++
MdePkg/MdePkg.dec | 3 ++-
MdePkg/MdePkg.uni | 3 ++-
5 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/MdePkg/Include/Library/DebugCommonLib.h b/MdePkg/Include/Library/DebugCommonLib.h
index 31249f91fa..3dc906d02a 100644
--- a/MdePkg/Include/Library/DebugCommonLib.h
+++ b/MdePkg/Include/Library/DebugCommonLib.h
@@ -21,6 +21,7 @@
#define DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED 0x08
#define DEBUG_PROPERTY_ASSERT_BREAKPOINT_ENABLED 0x10
#define DEBUG_PROPERTY_ASSERT_DEADLOOP_ENABLED 0x20
+#define DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED 0x40
//
// Declare bits for PcdDebugPrintErrorLevel and the ErrorLevel parameter of DebugPrint()
@@ -135,6 +136,23 @@ DebugClearMemoryEnabled (
);
+/**
+ Returns TRUE if ASSERT_CONSTRAINT() macro is enabled.
+
+ This function returns TRUE if the DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of
+ PcdDebugProperyMask is set. Otherwise, FALSE is returned.
+
+ @retval TRUE The DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of PcdDebugProperyMask is set.
+ @retval FALSE The DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of PcdDebugProperyMask is clear.
+
+**/
+BOOLEAN
+EFIAPI
+DebugAssertConstraintEnabled (
+ VOID
+ );
+
+
/**
Returns TRUE if any one of the bit is set both in ErrorLevel and PcdFixedDebugPrintErrorLevel.
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index a38e0e2904..8f4b9964b0 100644
--- a/MdePkg/Include/Library/DebugLib.h
+++ b/MdePkg/Include/Library/DebugLib.h
@@ -212,6 +212,24 @@ DebugClearMemory (
#define ASSERT(Expression)
#endif
+
+/**
+ Macro that calls ASSERT when constraint assertions are enabled.
+
+ If DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of PcdDebugProperyMask is set,
+ then this macro evaluates to an ASSERT macro passing in the original Expression.
+
+ @param Expression Boolean expression.
+
+**/
+#define ASSERT_CONSTRAINT(Expression) \
+ do { \
+ if (DebugAssertConstraintEnabled ()) { \
+ ASSERT (Expression); \
+ } \
+ } while (FALSE)
+
+
/**
Macro that calls DebugPrint().
diff --git a/MdePkg/Library/BaseDebugCommonLib/DebugCommonLib.c b/MdePkg/Library/BaseDebugCommonLib/DebugCommonLib.c
index 2291fb5382..870f9ceec5 100644
--- a/MdePkg/Library/BaseDebugCommonLib/DebugCommonLib.c
+++ b/MdePkg/Library/BaseDebugCommonLib/DebugCommonLib.c
@@ -93,6 +93,26 @@ DebugClearMemoryEnabled (
}
+/**
+ Returns TRUE if ASSERT_CONSTRAINT() macro is enabled.
+
+ This function returns TRUE if the DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of
+ PcdDebugProperyMask is set. Otherwise, FALSE is returned.
+
+ @retval TRUE The DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of PcdDebugProperyMask is set.
+ @retval FALSE The DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED bit of PcdDebugProperyMask is clear.
+
+**/
+BOOLEAN
+EFIAPI
+DebugAssertConstraintEnabled (
+ VOID
+ )
+{
+ return (BOOLEAN) ((PcdGet8 (PcdDebugPropertyMask) & DEBUG_PROPERTY_ASSERT_CONSTRAINT_ENABLED) != 0);
+}
+
+
/**
Returns TRUE if any one of the bit is set both in ErrorLevel and PcdFixedDebugPrintErrorLevel.
diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index a121b9ecab..05a04b92ab 100644
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2136,9 +2136,10 @@ [PcdsFixedAtBuild,PcdsPatchableInModule]
# BIT3 - Enable Clear Memory.<BR>
# BIT4 - Enable BreakPoint as ASSERT.<BR>
# BIT5 - Enable DeadLoop as ASSERT.<BR>
+ # BIT6 - Treat constraint violations as ASSERT.<BR>
# @Prompt Debug Property.
# @Expression 0x80000002 | (gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask & 0xC0) == 0
- gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000005
+ gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000045
## This flag is used to control the print out Debug message.<BR><BR>
# BIT0 - Initialization message.<BR>
diff --git a/MdePkg/MdePkg.uni b/MdePkg/MdePkg.uni
index 5c1fa24065..89bcf31056 100644
--- a/MdePkg/MdePkg.uni
+++ b/MdePkg/MdePkg.uni
@@ -189,7 +189,8 @@
"BIT2 - Enable Debug Code.<BR>\n"
"BIT3 - Enable Clear Memory.<BR>\n"
"BIT4 - Enable BreakPoint as ASSERT.<BR>\n"
- "BIT5 - Enable DeadLoop as ASSERT.<BR>"
+ "BIT5 - Enable DeadLoop as ASSERT.<BR>\n"
+ "BIT6 - Treat constraint violations as ASSERT.<BR>"
#string STR_gEfiMdePkgTokenSpaceGuid_ERR_80000002 #language en-US "Reserved bits must be set to zero."
--
2.24.2 (Apple Git-127)
next prev parent reply other threads:[~2020-05-12 17:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 17:02 [PATCH V5 00/27] Disabling safe string constraint assertions Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 01/27] MdePkg: Introduce DebugCommonLib interface and BaseDebugCommonLib Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 02/27] UnitTestFrameworkPkg: Add support for DebugCommonLib Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 03/27] MdePkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 04/27] MdeModulePkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 05/27] ArmPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 06/27] ArmPlatformPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 07/27] ArmVirtPkg: " Vitaly Cheptsov
2020-05-13 11:05 ` [edk2-devel] " Laszlo Ersek
2020-05-12 17:02 ` [PATCH V5 08/27] CryptoPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 09/27] DynamicTablesPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 10/27] EmbeddedPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 11/27] EmulatorPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 12/27] FatPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 13/27] FmpDevicePkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 14/27] IntelFsp2Pkg: " Vitaly Cheptsov
2020-05-13 0:09 ` Chiu, Chasel
2020-05-12 17:02 ` [PATCH V5 15/27] IntelFsp2WrapperPkg: " Vitaly Cheptsov
2020-05-13 0:06 ` Chiu, Chasel
2020-05-12 17:02 ` [PATCH V5 16/27] OvmfPkg: " Vitaly Cheptsov
2020-05-13 11:11 ` [edk2-devel] " Laszlo Ersek
2020-05-12 17:02 ` [PATCH V5 17/27] NetworkPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 18/27] ShellPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 19/27] SecurityPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 20/27] PcAtChipsetPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 21/27] SignedCapsulePkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 22/27] SourceLevelDebugPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 23/27] StandaloneMmPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` [PATCH V5 24/27] UefiCpuPkg: " Vitaly Cheptsov
2020-05-13 11:07 ` [edk2-devel] " Laszlo Ersek
2020-05-13 14:43 ` [EXTERNAL] " Bret Barkelew
2020-05-13 15:37 ` Laszlo Ersek
2020-05-13 15:52 ` Laszlo Ersek
2020-05-13 16:06 ` Michael D Kinney
2020-05-12 17:02 ` [PATCH V5 25/27] UefiPayloadPkg: " Vitaly Cheptsov
2020-05-12 17:02 ` Vitaly Cheptsov [this message]
2020-05-12 17:02 ` [PATCH V5 27/27] MdePkg: Use assertion on constraint violation bit in SafeString Vitaly Cheptsov
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=20200512170237.19796-27-cheptsov@ispras.ru \
--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