Commit e75ef56f authored by Jim Cromie's avatar Jim Cromie Committed by Greg Kroah-Hartman

dyndbg: let query-modname override actual module name

dyndbg's control-parser: ddebug_parse_query(), requires that search
terms: module, func, file, lineno, are used only once in a query; a
thing cannot be named both foo and bar.

The cited commit added an overriding module modname, taken from the
module loader, which is authoritative.  So it set query.module 1st,
which disallowed its use in the query-string.

But now, its useful to allow a module-load to enable classes across a
whole (or part of) a subsystem at once.

  # enable (dynamic-debug in) drm only
  modprobe drm dyndbg="class DRM_UT_CORE +p"

  # get drm_helper too
  modprobe drm dyndbg="class DRM_UT_CORE module drm* +p"

  # get everything that knows DRM_UT_CORE
  modprobe drm dyndbg="class DRM_UT_CORE module * +p"

  # also for boot-args:
  drm.dyndbg="class DRM_UT_CORE module * +p"

So convert the override into a default, by filling it only when/after
the query-string omitted the module.

NB: the query class FOO handling is forthcoming.

Fixes: 8e59b5cf dynamic_debug: add modname arg to exec_query callchain
Acked-by: default avatarJason Baron <jbaron@akamai.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Link: https://lore.kernel.org/r/20220904214134.408619-8-jim.cromie@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 47ea6f99
...@@ -385,10 +385,6 @@ static int ddebug_parse_query(char *words[], int nwords, ...@@ -385,10 +385,6 @@ static int ddebug_parse_query(char *words[], int nwords,
return -EINVAL; return -EINVAL;
} }
if (modname)
/* support $modname.dyndbg=<multiple queries> */
query->module = modname;
for (i = 0; i < nwords; i += 2) { for (i = 0; i < nwords; i += 2) {
char *keyword = words[i]; char *keyword = words[i];
char *arg = words[i+1]; char *arg = words[i+1];
...@@ -429,6 +425,13 @@ static int ddebug_parse_query(char *words[], int nwords, ...@@ -429,6 +425,13 @@ static int ddebug_parse_query(char *words[], int nwords,
if (rc) if (rc)
return rc; return rc;
} }
if (!query->module && modname)
/*
* support $modname.dyndbg=<multiple queries>, when
* not given in the query itself
*/
query->module = modname;
vpr_info_dq(query, "parsed"); vpr_info_dq(query, "parsed");
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment