From: Jim Cromie <jim.cromie@gmail.com>
To: Jason Baron <jbaron@akamai.com>, Shuah Khan <shuah@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>, Arnd Bergmann <arnd@arndb.de>,
Luis Chamberlain <mcgrof@kernel.org>,
Petr Pavlu <petr.pavlu@suse.com>,
Daniel Gomez <da.gomez@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
Aaron Tomlin <atomlin@atomlin.com>,
Jonathan Corbet <corbet@net.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Nathan Chancellor <nathan@kernel.org>,
Nicolas Schier <nsc@kernel.org>,
Shuah Khan <skhan@linuxfoundation.org>,
Randy Dunlap <rdunlap@infradead.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Pavel Machek <pavel@kernel.org>, Len Brown <lenb@kernel.org>,
Jonathan Corbet <corbet@lwn.net>, Petr Mladek <pmladek@suse.com>,
Steven Rostedt <rostedt@goodmis.org>,
John Ogness <john.ogness@linutronix.de>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org,
dri-devel@lists.freedesktop.org, linux-arch@vger.kernel.org,
linux-modules@vger.kernel.org, linux-doc@vger.kernel.org,
linux-kbuild@vger.kernel.org, linux-pm@vger.kernel.org,
Jim Cromie <jim.cromie@gmail.com>,
Philipp Hahn <phahn-oss@avm.de>
Subject: [PATCH v11 35/38] dyndbg: Ignore additional arguments from pr_fmt
Date: Wed, 23 Sep 2026 16:34:59 -0600 [thread overview]
Message-ID: <20260923-dd-cmap-part2-clean-v11-35-9b6c217fdf2f@gmail.com> (raw)
In-Reply-To: <20260923-dd-cmap-part2-clean-v11-0-9b6c217fdf2f@gmail.com>
From: Philipp Hahn <phahn-oss@avm.de>
pr_fmt can be used to add a common prefix to any output from a module:
#define pr_fmt(fmt) KBUILD_MODNAME ".%s " fmt, __func__
But adding additional arguments breaks dynamic debug:
> error: macro "DEFINE_DYNAMIC_DEBUG_METADATA_CLS" passed 4 arguments, but takes just 3
> | pr_debug_ratelimited("%s", "Hello world!");
> | ^
> note: macro "DEFINE_DYNAMIC_DEBUG_METADATA_CLS" defined here
> | #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \
> |
> error: ‘DEFINE_DYNAMIC_DEBUG_METADATA_CLS’ undeclared (first use in this function)
> | DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, _DPRINTK_CLASS_DFLT, fmt)
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
> | DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, pr_fmt(fmt)); \
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> note: in expansion of macro ‘pr_debug_ratelimited’
> | pr_debug_ratelimited("%s", "Hello world!");
> | ^~~~~~~~~~~~~~~~~~~~
Add an additional ', ...' to DEFINE_DYNAMIC_DEBUG_METADATA_CLS to slurp
any additional argument, which `pr_fmt` might add.
Signed-off-by: Philipp Hahn <phahn-oss@avm.de>
[pr_fmt change on test_dynamic_debug_submod instead of parent]
Reviewed-by: Jim Cromie <jim.cromie@gmail.com>
---
v11:
. update golden record hashes for FT_modprobe_w_param tests after
comma-token and native classmap attachment fixes.
v10:
. pass raw fmt to DEFINE_DYNAMIC_DEBUG_METADATA in pr_debug_ratelimited().
---
include/linux/dynamic_debug.h | 2 +-
include/linux/printk.h | 2 +-
lib/test_dynamic_debug.c | 4 ++--
.../selftests/dynamic_debug/dyndbg_selftest.sh | 26 +++++++++++-----------
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 5b5f5bb31c48..f411a7636cf1 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -359,7 +359,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
dump_stack(); \
}
-#define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \
+#define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt, ...) \
static struct _ddebug __aligned(8) \
__section("__dyndbg_descs") name = { \
.modname = DDEBUG_MODNAME, \
diff --git a/include/linux/printk.h b/include/linux/printk.h
index f594c1266bfd..5d701952e739 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -742,7 +742,7 @@ do { \
static DEFINE_RATELIMIT_STATE(_rs, \
DEFAULT_RATELIMIT_INTERVAL, \
DEFAULT_RATELIMIT_BURST); \
- DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, pr_fmt(fmt)); \
+ DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
if (DYNAMIC_DEBUG_BRANCH(descriptor) && \
__ratelimit(&_rs)) \
__dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \
diff --git a/lib/test_dynamic_debug.c b/lib/test_dynamic_debug.c
index 666b447b3740..aaf8aad481a0 100644
--- a/lib/test_dynamic_debug.c
+++ b/lib/test_dynamic_debug.c
@@ -23,7 +23,7 @@
* the usage clearer.
*/
#if defined(TEST_DYNAMIC_DEBUG_SUBMOD)
- #define pr_fmt(fmt) "test_dd_submod: " fmt
+ #define pr_fmt(fmt) "test_dd_submod: %s " fmt, __func__
#else
#define pr_fmt(fmt) "test_dd: " fmt
#endif
@@ -323,7 +323,7 @@ static int __init test_dynamic_debug_init(void)
static void __exit test_dynamic_debug_exit(void)
{
- pr_debug("exited\n");
+ pr_debug_ratelimited("exited\n");
}
module_init(test_dynamic_debug_init);
diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
index 5de726254d91..c06c16cacb70 100755
--- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
+++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
@@ -581,40 +581,40 @@ function GOLDEN_RECORDS {
#K= e11c22649735cedb6c30321378100e11 FT_classmap_inheritance.2
#K= 5d0f3701517aa3a461c8887c332bdb42 FT_classmap_inheritance.3
#K= d39188ded831453d90d77390546b314d FT_classmap_inheritance.4
-#K= f43e0aff8a4b38435b73d90ed8100d1b FT_classmap_inheritance.5
+#K= 62b6803edf43519186d6185bebf34352 FT_classmap_inheritance.5
#K= d2e8b8c5a5b4e7b9bbe1a29460a3c07d FT_modprobe_w_param.1
#K= d2e8b8c5a5b4e7b9bbe1a29460a3c07d FT_modprobe_w_param.2
-#K= 11032ef17569bd151c3806527a2428be FT_modprobe_w_param.3
+#K= 20d8a1fac0330f1b5cc582ce93792d58 FT_modprobe_w_param.3
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.4
-#K= 942e62ca24809cad666c5725aeb14376 FT_modprobe_w_param.5
+#K= 3c19dd83b330a9d59901281aaa3bacf8 FT_modprobe_w_param.5
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.6
-#K= fe1aadca4b2b4165d8d5c98e973f9e4b FT_modprobe_w_param.7
+#K= 86b7a18d7a692187aa0b7cc0b6886e77 FT_modprobe_w_param.7
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.8
#K= 535ab526b24a7214de41d92e94bbd52c FT_modprobe_w_param.9
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.10
-#K= 7c02282dcfb73eb5ffb9629ce63360e5 FT_modprobe_w_param.11
+#K= 64f91218760ca86d28a4b9b2d23849fb FT_modprobe_w_param.11
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.12
-#K= b0942decc84dae237019bc2877ff02e7 FT_modprobe_w_param.13
+#K= 03bad8f76b3587c2e8bdb9df43110a5e FT_modprobe_w_param.13
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.14
-#K= efe8e3b8080c3310708b7505d60f7703 FT_modprobe_w_param.15
+#K= 04b59fe2db45bc6bb314e9102b92dd64 FT_modprobe_w_param.15
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.16
#K= d682c98ced7d31f1555ab474a9ebe253 FT_modprobe_w_param.17
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.18
#K= 362ab2e7e5f5e3ede8b69645c64fb987 FT_modprobe_w_param.19
#K= 362ab2e7e5f5e3ede8b69645c64fb987 FT_modprobe_w_param.20
-#K= 4f539816f9cc9fb9dd4a032138e3abde FT_modprobe_w_param.21
+#K= 3377abfe07b0cdfbd4610a8f76f7efc3 FT_modprobe_w_param.21
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.22
-#K= 20659d16ffb5b18475e83602223216d1 FT_modprobe_w_param.23
+#K= 453ce2741d6e7343a272c71ed392f14c FT_modprobe_w_param.23
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.24
-#K= 0b24971fb1018c38353141f8fcb9cbdc FT_modprobe_w_param.25
+#K= 82d34927171a53fbef691cc84ff9e09f FT_modprobe_w_param.25
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.26
#K= 66eb387a95512f679eb5cad4168b0992 FT_modprobe_w_param.27
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.28
-#K= 7df05523f4d61917fd7659357eeec1bc FT_modprobe_w_param.29
+#K= abbd3c12a631089b3df7b18f43c50b05 FT_modprobe_w_param.29
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.30
-#K= a75600ac4e129f4315c5a50ad3a3103c FT_modprobe_w_param.31
+#K= f099c58f5109edb80f53550664ba5bfc FT_modprobe_w_param.31
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.32
-#K= f43ccce73ac2b0e1529312af66a4ddfe FT_modprobe_w_param.33
+#K= 756aacc01af3b95f86404e7bc06ba9b6 FT_modprobe_w_param.33
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.34
#K= 4819f715ba485c493afb455542f7ab8c FT_modprobe_w_param.35
#K= 0239d8c0808eef396782362613f675b0 FT_modprobe_w_param.36
--
2.55.0
next prev parent reply other threads:[~2026-09-23 22:36 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-23 22:34 [PATCH v11 00/38] dyndbg: Fix classmaps API for subsystems, query extensions, selftests Jim Cromie
2026-09-23 22:34 ` [PATCH v11 01/38] selftests/dyndbg: Add kselftest script to verify dynamic-debug Jim Cromie
2026-09-23 22:34 ` [PATCH v11 02/38] vmlinux.lds.h: refactor BOUNDED_SECTION_* macros into bounded_sections.lds.h Jim Cromie
2026-09-23 22:34 ` [PATCH v11 03/38] vmlinux.lds.h: drop unused HEADERED_SECTION* macros Jim Cromie
2026-09-23 22:34 ` [PATCH v11 04/38] vmlinux.lds.h: Fix ALIGN(8) omission causing NULL ptr on i386 Jim Cromie
2026-09-23 22:34 ` [PATCH v11 05/38] vmlinux.lds.h: remove redundant ALIGN(8) directives Jim Cromie
2026-09-23 22:34 ` [PATCH v11 06/38] dyndbg.lds.S: fix lost dyndbg sections in modules Jim Cromie
2026-09-23 22:34 ` [PATCH v11 07/38] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-09-23 22:34 ` [PATCH v11 08/38] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-09-23 22:34 ` [PATCH v11 09/38] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-09-23 22:34 ` [PATCH v11 10/38] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-09-23 22:34 ` [PATCH v11 11/38] dyndbg: drop NUM_TYPE_ARGS Jim Cromie
2026-09-23 22:34 ` [PATCH v11 12/38] dyndbg: bump num-tokens in a query-cmd from 9 to 15 Jim Cromie
2026-09-23 22:34 ` [PATCH v11 13/38] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-09-23 22:34 ` [PATCH v11 14/38] dyndbg: Bind callsites and classmaps to DDEBUG_MODNAME Jim Cromie
2026-09-23 22:34 ` [PATCH v11 15/38] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-09-23 22:34 ` [PATCH v11 16/38] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-09-23 22:34 ` [PATCH v11 17/38] dyndbg: replace classmap list with an array-slice Jim Cromie
2026-09-23 22:34 ` [PATCH v11 18/38] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-09-23 22:34 ` [PATCH v11 19/38] dyndbg: reduce class param storage to u32 Jim Cromie
2026-09-23 22:34 ` [PATCH v11 20/38] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-09-23 22:34 ` [PATCH v11 21/38] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-09-23 22:34 ` [PATCH v11 22/38] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-09-23 22:34 ` [PATCH v11 23/38] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-09-23 22:34 ` [PATCH v11 24/38] selftests/dyndbg: Enable FT_classmap_inheritance Jim Cromie
2026-09-23 22:34 ` [PATCH v11 25/38] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-09-23 22:34 ` [PATCH v11 26/38] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_{DEFINE,USE_} args at compile-time Jim Cromie
2026-09-23 22:34 ` [PATCH v11 27/38] dyndbg-test: add do_bulk testpoint, rename do_prints to do_classes Jim Cromie
2026-09-23 22:34 ` [PATCH v11 28/38] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-09-23 22:34 ` [PATCH v11 29/38] dyndbg: control-parser: treat comma as a token separator Jim Cromie
2026-09-23 22:34 ` [PATCH v11 30/38] selftests: enable comma-terminator tests Jim Cromie
2026-09-23 22:34 ` [PATCH v11 31/38] dyndbg: split multi-query strings with @ Jim Cromie
2026-09-23 22:34 ` [PATCH v11 32/38] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-09-23 22:34 ` [PATCH v11 33/38] dyndbg: harden classmap and descriptor validation Jim Cromie
2026-09-23 22:34 ` [PATCH v11 34/38] docs/dyndbg: add classmap info to howto Jim Cromie
2026-09-23 22:34 ` Jim Cromie [this message]
2026-09-23 22:35 ` [PATCH v11 36/38] dyndbg: add epilogue to dynamic_debug/control file Jim Cromie
2026-09-23 22:35 ` [PATCH v11 37/38] dyndbg: add +c flag to count pr_debug calls without printing Jim Cromie
2026-09-23 22:35 ` [PATCH v11 38/38] dyndbg: add DEBUG-biased fallback stubs for _dynamic_func_call_cls Jim Cromie
2026-09-23 22:53 ` [PATCH v11 00/38] dyndbg: Fix classmaps API for subsystems, query extensions, selftests Andrew Morton
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=20260923-dd-cmap-part2-clean-v11-35-9b6c217fdf2f@gmail.com \
--to=jim.cromie@gmail.com \
--cc=airlied@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=atomlin@atomlin.com \
--cc=corbet@lwn.net \
--cc=corbet@net.net \
--cc=da.gomez@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=john.ogness@linutronix.de \
--cc=lenb@kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mcgrof@kernel.org \
--cc=mripard@kernel.org \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
--cc=pavel@kernel.org \
--cc=petr.pavlu@suse.com \
--cc=phahn-oss@avm.de \
--cc=pmladek@suse.com \
--cc=rafael@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=samitolvanen@google.com \
--cc=senozhatsky@chromium.org \
--cc=shuah@kernel.org \
--cc=simona@ffwll.ch \
--cc=skhan@linuxfoundation.org \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®