Historically dynamic-debug gets its module names from KBUILD_MODNAME. This works well for loadable modules, as the module loader has always required them to have unique names, but for builtins it is basically kbasename(srcfile), which sadly gives us many modules named "main".
IOW, it makes this ambiguous: bash-5.3# echo module main +m > /proc/dynamic_debug/control since it would affect all 4 independent modules named main: bash-5.3# ddgrep =m init/main.c:1265 [main]initcall_blacklist =m "blacklisting initcall %s\n" kernel/power/main.c:49 [main]pm_restore_gfp_mask =m "GFP mask restored\n" kernel/module/main.c:2862 [main]move_module =m "\t0x%lx 0x%.8lx %s\n" drivers/base/power/main.c:149 [main]device_pm_add =m "Adding info for %s:%s\n" We can improve this by adding DDEBUG_MODNAME, which is KBUILD_MODFILE for dyndbg's builtins (which is unique), and KBUILD_MODNAME for loadables (which is already required/guaranteed to be unique by module-loader): The above control-file entries then become: init/main.c:1265 [init/main]initcall_blacklist ... kernel/power/main.c:49 [kernel/power/main]pm_restore_gfp_mask ... kernel/module/main.c:2862 [kernel/module/main]move_module ... drivers/base/power/main.c:149 [drivers/base/power/main]device_pm_add ... While this is a user visible change; [params] becomes [kernel/params] etc, it is not a behavior change; we now match the query-module against the subsystem/module name or its kbasename (the simple-modname), which as before, matches all 4 modules. This allows queries to be specific when desired: "module init/main", while preserving the existing meaning of "module main" The deeper reason for this change is not obvious. If any builtin "main" module were to add a classmap, it would attach to all "main" modules. If 2 "main" modules defined separate classmaps, both modules would inadvertently share both classmaps. Since classmaps map classnames to 0..62, and independently defined classmaps are most likely to start at 0 (unless author is planning to share the 0..62 range with other classmaps), we have a setup for later reserved range conflicts. Having unique names prevents future conflicts. This solution isn't perfect: 1. it changes displayed [params] to [kernel/params] etc 2. its mostly redundant with "filename */main.*" 3. Ideally, queries like "module power", "module module", "module base/power" might be better but would break old queries. Adding classmaps to any of the builtins named "[main]" is unlikely, so this change isn't absolutely necessary, but it seemed proper to at least address the latent problem. Summary: 1. DDEBUG_MODNAME is either KBUILD_MODFILE or KBUILD_MODNAME. 2. Update basic-tests working against init/main.c pr_debugs to validate changes to "[init/main]" as the state-of-interest (where the relevant state is in the control file). 3. update GOLDEN_RECORDS to for changed state-of-interest in dynamic_debug/control, where [main] became [*/main] 4. Adjust Documentation with "simple modname" and "subsystem modname". Signed-off-by: Jim Cromie <[email protected]> --- v7: checksum updates - needed due to [module] display changes v5: move ahead of array-slice patch to silence sashiko complaint about it v4: call match_wildcard_hyphen() to allow dash vs underscore modname equivalence v3: use KBUILD_MODFILE to give unique modnames for builtins Note: Updated expected FT_basic_queries hashes to reflect the new unique 'kernel/params' module name format introduced by KBUILD_MODFILE. --- Documentation/admin-guide/dynamic-debug-howto.rst | 42 ++++++++++++---------- include/linux/dynamic_debug.h | 15 ++++++-- lib/dynamic_debug.c | 3 +- .../selftests/dynamic_debug/dyndbg_selftest.sh | 26 ++++++-------- 4 files changed, 48 insertions(+), 38 deletions(-) diff --git a/Documentation/admin-guide/dynamic-debug-howto.rst b/Documentation/admin-guide/dynamic-debug-howto.rst index 9c2f096ed1d8..99bbae37d34e 100644 --- a/Documentation/admin-guide/dynamic-debug-howto.rst +++ b/Documentation/admin-guide/dynamic-debug-howto.rst @@ -38,12 +38,12 @@ You can view the currently configured behaviour in the *prdbg* catalog:: :#> head -n7 /proc/dynamic_debug/control # filename:lineno [module]function flags format - init/main.c:1179 [main]initcall_blacklist =_ "blacklisting initcall %s\n" - init/main.c:1218 [main]initcall_blacklisted =_ "initcall %s blacklisted\n" - init/main.c:1424 [main]run_init_process =_ " with arguments:\n" - init/main.c:1426 [main]run_init_process =_ " %s\n" - init/main.c:1427 [main]run_init_process =_ " with environment:\n" - init/main.c:1429 [main]run_init_process =_ " %s\n" + init/main.c:1179 [init/main]initcall_blacklist =_ "blacklisting initcall %s\n" + init/main.c:1218 [init/main]initcall_blacklisted =_ "initcall %s blacklisted\n" + init/main.c:1424 [init/main]run_init_process =_ " with arguments:\n" + init/main.c:1426 [init/main]run_init_process =_ " %s\n" + init/main.c:1427 [init/main]run_init_process =_ " with environment:\n" + init/main.c:1429 [init/main]run_init_process =_ " %s\n" The 3rd space-delimited column shows the current flags, preceded by a ``=`` for easy use with grep/cut. ``=p`` shows enabled callsites. @@ -59,10 +59,10 @@ query/commands to the control file. Example:: :#> ddcmd '-p; module main func run* +p' :#> grep =p /proc/dynamic_debug/control - init/main.c:1424 [main]run_init_process =p " with arguments:\n" - init/main.c:1426 [main]run_init_process =p " %s\n" - init/main.c:1427 [main]run_init_process =p " with environment:\n" - init/main.c:1429 [main]run_init_process =p " %s\n" + init/main.c:1424 [init/main]run_init_process =p " with arguments:\n" + init/main.c:1426 [init/main]run_init_process =p " %s\n" + init/main.c:1427 [init/main]run_init_process =p " with environment:\n" + init/main.c:1429 [init/main]run_init_process =p " %s\n" Error messages go to console/syslog:: @@ -161,17 +161,21 @@ file file kernel/freezer.c # ie column 1 of control file file drivers/usb/* # all callsites under it file inode.c:start_* # parse :tail as a func (above) - file inode.c:1-100 # parse :tail as a line-range (above) + file inode.c:1-100 # parse :tail as a line-range (below) module - The given string is compared against the module name - of each callsite. The module name is the string as - seen in ``lsmod``, i.e. without the directory or the ``.ko`` - suffix and with ``-`` changed to ``_``. Examples:: - - module sunrpc - module nfsd - module drm* # both drm, drm_kms_helper + The query string is compared against the subsystem module name of + each callsite, as shown in the control file, or its simple name. + The simple module name is the string as seen in ``lsmod``, + i.e. without the directory or the ``.ko`` suffix and with ``-`` + changed to ``_``. + Examples:: + + module nfsd # simple modname (as from lsmod) + module init/main # subsystem modname (as in control file) + module */main # any subsystem ending in main + module main # simple modname, selects same as above + module drm* # both drm, drm_kms_helper format The given string is searched for in the dynamic debug format diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index baf5c0853f45..17cc1ae7baef 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h @@ -10,6 +10,17 @@ #define __DDEBUG_ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +/* + * Pick the best name for the module: + * KBUILD_MODFILE includes the path (e.g., drivers/usb/core/usbcore) for built-ins. + * Fall back to KBUILD_MODNAME for modules (loader requires unique names). + */ +#ifdef KBUILD_MODFILE +# define DDEBUG_MODNAME KBUILD_MODFILE +#else +# define DDEBUG_MODNAME KBUILD_MODNAME +#endif + /* * An instance of this structure is created in a special * ELF section at every dynamic debug callsite. At runtime, @@ -121,7 +132,7 @@ struct ddebug_class_param { static struct ddebug_class_map __aligned(8) __used \ __section("__dyndbg_classes") _var = { \ .mod = THIS_MODULE, \ - .mod_name = KBUILD_MODNAME, \ + .mod_name = DDEBUG_MODNAME, \ .base = _base, \ .map_type = _maptype, \ .class_names = _var##_classnames, \ @@ -160,7 +171,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, #define DEFINE_DYNAMIC_DEBUG_METADATA_CLS(name, cls, fmt) \ static struct _ddebug __aligned(8) \ __section("__dyndbg") name = { \ - .modname = KBUILD_MODNAME, \ + .modname = DDEBUG_MODNAME, \ .function = __func__, \ .filename = __FILE__, \ .format = (fmt), \ diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 251df88cb04e..f66e5373e61e 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -239,7 +239,8 @@ static int ddebug_change(const struct ddebug_query *query, /* match against the module name */ if (query->module && - !match_wildcard(query->module, dt->mod_name)) + !match_wildcard_hyphen(query->module, dt->mod_name) && + !match_wildcard_hyphen(query->module, kbasename(dt->mod_name))) continue; if (query->class_string) { diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index 6e977486ea90..947f23dcb4ce 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -461,7 +461,8 @@ function FT_hyphen_underscore { ddcmd =_ } -# test parsing on spaces, commas. testing agains builtin [kernel/params] +# test parsing on spaces, commas. testing against builtin [kernel/params] +# disabled pending feature patch function FT_comma_terminators { v_echo "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}" if [ $LACK_DD_BUILTIN -eq 1 ]; then @@ -470,15 +471,9 @@ function FT_comma_terminators { fi ddcmd "module params =_" - # 1. Verify transition after commas-as-spaces query and splitting on @ - # Use non-printing decorator flags (+mf) to avoid print-enabling (+p) and - # prevent syslog pollution - #ddcmd "module,params,=_ @ module,params,+mf" 'kernel/params.c' - - # 2. Verify transition after ignored-commas query + ddcmd "module,params,=_ @ module,params,+mf" 'kernel/params.c' + # ignore empty tokens ddcmd ",module ,, , params, -p" 'kernel/params.c' - - # 3. Verify transition after quoted-commas query ddcmd " , module ,,, , params, -m" 'kernel/params.c' ddcmd =_ @@ -688,13 +683,12 @@ function GOLDEN_RECORDS { #K= 781995971d28f732a792522f3c56cdd3 FT_grammar_errs.40 dmesg #K= 6614a677d9f9ac09d9825b4e989d2c42 FT_grammar_errs.41 dmesg #K= 70de9afed457a6be9f9c3c81cbd6d4d5 FT_grammar_errs.42 dmesg -#K= 9a7aaed40738f1c5203af2e421a20bc2 FT_basic_queries.1 "kernel/params.c" -#K= 2a57a9e283a3912de3fa5e006fb330cc FT_basic_queries.2 "kernel/params.c" -#K= fed3186684428b2f05bcf5df960c639c FT_basic_queries.3 "kernel/params.c" -#K= 551f9801b6008553661453021ae6dfd3 FT_basic_queries.4 "kernel/params.c" -#K= 33f7162ac85020894fab9752ef07b89c FT_basic_queries.5 "kernel/params.c" -#K= 544d955c3bb9d3c78704f780d91396e0 FT_basic_queries.6 "kernel/params.c" -# ------------------------------ +#K= 24d85e3b86f3d5f7640995922d91e08c FT_basic_queries.1 "kernel/params.c" +#K= 958898bcd9736a94e1f8b293b230a96a FT_basic_queries.2 "kernel/params.c" +#K= 130118da5a296e4039865d167e06cacd FT_basic_queries.3 "kernel/params.c" +#K= da6bd1c6a299290150668186f8263b82 FT_basic_queries.4 "kernel/params.c" +#K= 82572e8d20c4b567afac783006d1a935 FT_basic_queries.5 "kernel/params.c" +#K= baea1247680e8151c121539f4b90a6d8 FT_basic_queries.6 "kernel/params.c" EOF # Read the K-recs and skip those for tests that can't run while read -r line; do -- 2.55.0
