From: Jim Cromie <jim.cromie@gmail.com>
To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Cc: "Jim Cromie" <jim.cromie@gmail.com>,
"Jason Baron" <jbaron@akamai.com>,
"Łukasz Bartosik" <ukaszb@chromium.org>,
"Louis Chauvet" <louis.chauvet@bootlin.com>,
"Bagas Sanjaya" <bagasdotme@gmail.com>,
"Dave Airlie" <airlied@gmail.com>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
dri-devel@lists.freedesktop.org, "Petr Mladek" <pmladek@suse.com>,
"Shuah Khan" <skhan@linuxfoundation.org>,
linux-doc@vger.kernel.org, "Steven Rostedt" <rostedt@goodmis.org>,
"Liam R. Howlett" <Liam.Howlett@oracle.com>
Subject: [PATCH v8 01/31] dyndbg: factor ddebug_match_desc out from ddebug_change
Date: Tue, 13 Jan 2026 18:57:17 -0700 [thread overview]
Message-ID: <20260114015815.1565725-2-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260114015815.1565725-1-jim.cromie@gmail.com>
ddebug_change() is a big (~100 lines) function with a nested for loop.
The outer loop walks the per-module ddebug_tables list, and does
module stuff: it filters on a query's "module FOO*" and "class BAR",
failures here skip the entire inner loop.
The inner loop (60 lines) scans a module's descriptors. It starts
with a long block of filters on function, line, format, and the
validated "BAR" class (or the legacy/_DPRINTK_CLASS_DFLT).
These filters "continue" past pr_debugs that don't match the query
criteria, before it falls through the code below that counts matches,
then adjusts the flags and static-keys. This is unnecessarily hard to
think about.
So move the per-descriptor filter-block into a boolean function:
ddebug_match_desc(desc), and change each "continue" to "return false".
This puts a clear interface in place, so any future changes are either
inside, outside, or across this interface.
also fix checkpatch complaints about spaces and braces.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
lib/dynamic_debug.c | 83 +++++++++++++++++++++++++--------------------
1 file changed, 47 insertions(+), 36 deletions(-)
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index 5a007952f7f2..eb5146bcfaca 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -171,6 +171,52 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table cons
* callsites, normally the same as number of changes. If verbose,
* logs the changes. Takes ddebug_lock.
*/
+static bool ddebug_match_desc(const struct ddebug_query *query,
+ struct _ddebug *dp,
+ int valid_class)
+{
+ /* match site against query-class */
+ if (dp->class_id != valid_class)
+ return false;
+
+ /* match against the source filename */
+ if (query->filename &&
+ !match_wildcard(query->filename, dp->filename) &&
+ !match_wildcard(query->filename,
+ kbasename(dp->filename)) &&
+ !match_wildcard(query->filename,
+ trim_prefix(dp->filename)))
+ return false;
+
+ /* match against the function */
+ if (query->function &&
+ !match_wildcard(query->function, dp->function))
+ return false;
+
+ /* match against the format */
+ if (query->format) {
+ if (*query->format == '^') {
+ char *p;
+ /* anchored search. match must be at beginning */
+ p = strstr(dp->format, query->format + 1);
+ if (p != dp->format)
+ return false;
+ } else if (!strstr(dp->format, query->format)) {
+ return false;
+ }
+ }
+
+ /* match against the line number range */
+ if (query->first_lineno &&
+ dp->lineno < query->first_lineno)
+ return false;
+ if (query->last_lineno &&
+ dp->lineno > query->last_lineno)
+ return false;
+
+ return true;
+}
+
static int ddebug_change(const struct ddebug_query *query,
struct flag_settings *modifiers)
{
@@ -203,42 +249,7 @@ static int ddebug_change(const struct ddebug_query *query,
for (i = 0; i < dt->num_ddebugs; i++) {
struct _ddebug *dp = &dt->ddebugs[i];
- /* match site against query-class */
- if (dp->class_id != valid_class)
- continue;
-
- /* match against the source filename */
- if (query->filename &&
- !match_wildcard(query->filename, dp->filename) &&
- !match_wildcard(query->filename,
- kbasename(dp->filename)) &&
- !match_wildcard(query->filename,
- trim_prefix(dp->filename)))
- continue;
-
- /* match against the function */
- if (query->function &&
- !match_wildcard(query->function, dp->function))
- continue;
-
- /* match against the format */
- if (query->format) {
- if (*query->format == '^') {
- char *p;
- /* anchored search. match must be at beginning */
- p = strstr(dp->format, query->format+1);
- if (p != dp->format)
- continue;
- } else if (!strstr(dp->format, query->format))
- continue;
- }
-
- /* match against the line number range */
- if (query->first_lineno &&
- dp->lineno < query->first_lineno)
- continue;
- if (query->last_lineno &&
- dp->lineno > query->last_lineno)
+ if (!ddebug_match_desc(query, dp, valid_class))
continue;
nfound++;
--
2.52.0
next prev parent reply other threads:[~2026-01-14 1:58 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-14 1:57 [PATCH v8 00/31] dyndbg: fix dynamic-debug regression in DRM Jim Cromie
2026-01-14 1:57 ` Jim Cromie [this message]
2026-01-14 1:57 ` [PATCH v8 02/31] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-01-14 1:57 ` [PATCH v8 03/31] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-01-14 1:57 ` [PATCH v8 04/31] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-01-14 1:57 ` [PATCH v8 05/31] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-01-14 1:57 ` [PATCH v8 06/31] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-01-14 1:57 ` [PATCH v8 07/31] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-01-14 1:57 ` [PATCH v8 08/31] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-01-14 1:57 ` [PATCH v8 09/31] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-01-14 1:57 ` [PATCH v8 10/31] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-01-14 1:57 ` [PATCH v8 11/31] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-01-14 1:57 ` [PATCH v8 12/31] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-01-14 1:57 ` [PATCH v8 13/31] dyndbg: replace classmap list with a vector Jim Cromie
2026-01-14 1:57 ` [PATCH v8 14/31] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-01-14 1:57 ` [PATCH v8 15/31] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-01-14 1:57 ` [PATCH v8 16/31] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-01-14 1:57 ` [PATCH v8 17/31] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-01-14 1:57 ` [PATCH v8 18/31] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-01-14 1:57 ` [PATCH v8 19/31] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-01-14 1:57 ` [PATCH v8 20/31] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-01-14 1:57 ` [PATCH v8 21/31] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-01-14 1:57 ` [PATCH v8 22/31] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-01-14 1:57 ` [PATCH v8 23/31] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2026-01-14 1:57 ` [PATCH v8 24/31] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-01-14 1:57 ` [PATCH v8 25/31] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-01-14 1:57 ` [PATCH v8 26/31] dyndbg: treat comma as a token separator Jim Cromie
2026-01-14 1:57 ` [PATCH v8 27/31] dyndbg: split multi-query strings with % Jim Cromie
2026-01-14 1:57 ` [PATCH v8 28/31] selftests-dyndbg: add test_mod_submod Jim Cromie
2026-01-14 1:57 ` [PATCH v8 29/31] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-01-14 1:57 ` [PATCH v8 30/31] dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) Jim Cromie
2026-01-14 1:57 ` [PATCH v8 31/31] docs/dyndbg: add classmap info to howto 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=20260114015815.1565725-2-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=Liam.Howlett@oracle.com \
--cc=airlied@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=jbaron@akamai.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=skhan@linuxfoundation.org \
--cc=tzimmermann@suse.de \
--cc=ukaszb@chromium.org \
/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®