From: Jim Cromie <jim.cromie@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: gregkh@linuxfoundation.org, jbaron@akamai.com,
louis.chauvet@bootlin.com, Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH v13 27/36] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_{DEFINE,USE_} args at compile-time
Date: Wed, 8 Apr 2026 14:02:02 -0600 [thread overview]
Message-ID: <20260408200211.43821-28-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260408200211.43821-1-jim.cromie@gmail.com>
Add __DYNAMIC_DEBUG_CLASSMAP_CHECK to implement the following
arg-checks at compile-time:
0 <= _base < 63
class_names is not empty
class_names[0] is a string
(class_names.length + _base) < 63
dd-map-type is known value
These compile-time checks will prevent several simple misuses, and
will issue obvious errors if violated.
4 such examples are added to test_dynamic_debug_submod.ko, and will
fail compilation if -DDD_MACRO_ARGCHECK is added to cflags. This
wouldn't be a useful CONFIG_ item, since it breaks the build.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
-v13
reword 2 failing tests (active only when -DDD_MACRO_ARGCHECK is
passed to cc) to better identify what error is being tested against
-v12
check map-type at compile-time
make base+len(classnames) check more explicit
dyndbg-test: add more tests of compile-time CHECKs
add 3 tests of static-asserts added to 2 macros:
DYNAMIC_DEBUG_CLASSMAP_{DEFINE,USE_}
_DEFINE():
1- validates maptype,
2- validate classmap.length + base-offset < 63
_USE_():
3- validate user-offset < 63
As before, these tests fail when activated:
make KCPPFLAGS="-DDD_MACRO_ARGCHECK" lib/test_dynamic_debug_submod.o
NOTE: _USE_() cannot test classmap.length, since its a property of
the referent, not the macro itself.
dyndbg-test: verify DYNAMIC_DEBUG_CLASSMAP_USE_() compile-time CHECK
Add another failing use-case, this time to verify that _USE properly
rejects an offset > 62. This is an incomplete test; the proper test
is: classes.length + base + offset < 63, but the macro cannot test
classes.length at compile-time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
include/linux/dynamic_debug.h | 12 ++++++++++++
lib/test_dynamic_debug.c | 15 +++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 71c91bc8d3a6..a1c75237abaa 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -181,6 +181,17 @@ struct _ddebug_class_param {
* __pr_debug_cls(22, "no such class"); compiles but is not reachable
*/
+#define __DYNAMIC_DEBUG_CLASSMAP_CHECK(_clnames, _base, _mapty) \
+ static_assert(((_base) >= 0 && (_base) < _DPRINTK_CLASS_DFLT), \
+ "_base must be in 0..62"); \
+ static_assert(ARRAY_SIZE(_clnames) > 0, \
+ "classnames array size must be > 0"); \
+ static_assert((ARRAY_SIZE(_clnames) + (_base)) < _DPRINTK_CLASS_DFLT, \
+ "_base + classnames.length must be <= 62"); \
+ static_assert(((_mapty) >= DD_CLASS_TYPE_DISJOINT_BITS) && \
+ ((_mapty) <= DD_CLASS_TYPE_LEVEL_NUM), \
+ "unknown class_map_type")
+
/**
* DYNAMIC_DEBUG_CLASSMAP_DEFINE - define debug classes used by a module.
* @_var: name of the classmap, exported for other modules coordinated use.
@@ -194,6 +205,7 @@ struct _ddebug_class_param {
*/
#define DYNAMIC_DEBUG_CLASSMAP_DEFINE(_var, _mapty, _base, ...) \
static const char *_var##_classnames[] = { __VA_ARGS__ }; \
+ __DYNAMIC_DEBUG_CLASSMAP_CHECK(_var##_classnames, (_base), (_mapty)); \
extern struct _ddebug_class_map _var; \
struct _ddebug_class_map __aligned(8) __used \
__section("__dyndbg_class_maps") _var = { \
diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c
index fc599bbe605e..2107d4821019 100644
--- a/lib/test_dynamic_debug.c
+++ b/lib/test_dynamic_debug.c
@@ -146,8 +146,23 @@ DYNAMIC_DEBUG_CLASSMAP_DEFINE(classid_range_conflict, 0, D2_CORE + 1, "D3_CORE")
DYNAMIC_DEBUG_CLASSMAP_USE(map_disjoint_bits);
DYNAMIC_DEBUG_CLASSMAP_USE(map_level_num);
+#if defined(DD_MACRO_ARGCHECK)
+/*
+ * Exersize compile-time arg-checks in DYNAMIC_DEBUG_CLASSMAP_DEFINE.
+ * These will break compilation.
+ */
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_neg, 0, -1, "NEGATIVE_BASE_ARG");
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_big, 0, 100, "TOOBIG_BASE_ARG");
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_str_type, 0, 0, 1 /* not a string */);
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_emptyclass, 0, 0 /* ,empty */);
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_maptype, 3, 10, "no such type");
+DYNAMIC_DEBUG_CLASSMAP_DEFINE(fail_base_len, 0, 60,
+ "base", "plus", "classes", "length", "too-big");
+DYNAMIC_DEBUG_CLASSMAP_USE_(fail_offset_big, 100);
#endif
+#endif /* TEST_DYNAMIC_DEBUG_SUBMOD */
+
/* stand-in for all pr_debug etc */
#define prdbg(SYM) __pr_debug_cls(SYM, #SYM " msg\n")
--
2.53.0
next prev parent reply other threads:[~2026-04-08 20:02 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-08 20:01 [PATCH v13 00/36] fix dynamic-debug classmaps regression for DRM Jim Cromie
2026-04-08 20:01 ` [PATCH v13 01/36] dyndbg: fix NULL ptr on i386 due to section mis-alignment Jim Cromie
2026-04-08 20:01 ` [PATCH v13 02/36] vmlinux.lds.h: move BOUNDED_SECTION_* macros to reuse later Jim Cromie
2026-04-08 20:01 ` [PATCH v13 03/36] dyndbg.lds.S: fix lost dyndbg sections in modules Jim Cromie
2026-04-08 20:01 ` [PATCH v13 04/36] vmlinux.lds.h: drop unused HEADERED_SECTION* macros Jim Cromie
2026-04-08 20:01 ` [PATCH v13 05/36] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-04-08 20:01 ` [PATCH v13 06/36] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-04-08 20:01 ` [PATCH v13 07/36] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-04-08 20:01 ` [PATCH v13 08/36] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-04-08 20:01 ` [PATCH v13 09/36] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-04-08 20:01 ` [PATCH v13 10/36] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-04-08 20:01 ` [PATCH v13 11/36] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-04-08 20:01 ` [PATCH v13 12/36] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-04-08 20:01 ` [PATCH v13 13/36] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-04-08 20:01 ` [PATCH v13 14/36] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-04-08 20:01 ` [PATCH v13 15/36] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-04-08 20:01 ` [PATCH v13 16/36] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-04-08 20:01 ` [PATCH v13 17/36] dyndbg: replace classmap list with a vector Jim Cromie
2026-04-08 20:01 ` [PATCH v13 18/36] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-04-08 20:01 ` [PATCH v13 19/36] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-04-08 20:01 ` [PATCH v13 20/36] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-04-08 20:01 ` [PATCH v13 21/36] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-04-08 20:01 ` [PATCH v13 22/36] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-04-08 20:01 ` [PATCH v13 23/36] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-04-08 20:01 ` [PATCH v13 24/36] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-04-08 20:02 ` [PATCH v13 25/36] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-04-08 20:02 ` [PATCH v13 26/36] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-04-08 20:02 ` Jim Cromie [this message]
2026-04-08 20:02 ` [PATCH v13 28/36] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-04-08 20:02 ` [PATCH v13 29/36] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-04-08 20:02 ` [PATCH v13 30/36] dyndbg: treat comma as a token separator Jim Cromie
2026-04-08 20:02 ` [PATCH v13 31/36] dyndbg: split multi-query strings with % Jim Cromie
2026-04-08 20:02 ` [PATCH v13 32/36] selftests-dyndbg: add test_mod_submod Jim Cromie
2026-04-08 20:02 ` [PATCH v13 33/36] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-04-08 20:02 ` [PATCH v13 34/36] dyndbg: harden classmap and descriptor validation Jim Cromie
2026-04-08 20:02 ` [PATCH v13 35/36] docs/dyndbg: add classmap info to howto Jim Cromie
2026-04-08 20:02 ` [PATCH v13 36/36] dyndbg: Ignore additional arguments from pr_fmt Jim Cromie
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-all 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=20260408200211.43821-28-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
/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