fix DRM_USE_DYNAMIC_DEBUG regression
Subsystems (16)
Jim Cromie
maintainerv6 cover fix DRM_USE_DYNAMIC_DEBUG regression
This series fixes the regression in DRM_USE_DYNAMIC_DEBUG=y
blame analysis: (all mine)
1. my early test scripts did a lot of 'modprobe $m $*', with dyndbg=.. and debug=.. args
this obscured the lack of drm.debug -> drivers propagation
2. I broke K&R rule: "define once, refer many times". the classmaps DECLAREd by the drivers would run on args in 1
The thinko beneath that was imitating the "static struct" in the definition of DEFINE_DYNAMIC_DEBUG_METADATA. Imitating __drm_debug export instead broke the mental logjam.
So the patchset splits DECLARE_DYNDBG_CLASSMAP duty in 2: with DYNDBG_CLASSMAP_DEFINE/_USE, where _DEFINE exports the classmap, so _USE can reference it. The _USEs are added into a new section:__dyndbg_class_users.
ddebug_add_module() now also scans class_users at modprobe time, whence it finds the kernel-param that refs the classmap, and applies its initialized state to the user/driver.
test-dynamic-debug is extended with a _submod, allowing it to recapitulate the drm.ddebug -/-> drivers failure scenario.
NOTE: patch-14 does the DECLARE -> _DEFINE/_USE, so it also changes DRM to follow the API change. That makes it buildable, but crosses 2 trees, which isn't so great. But since the feature is marked BROKEN at this point, perhaps I should have split them.
Finally 3 DRM patches: drops BROKEN on DRM_USE_DYNAMIC_DEBUG, fixes drm/Makefile, and wires a bunch more drivers to _USE DRM's drm_debug_classmap.
You can bang at the test module with:
#!/bin/bash
ddcmd () {
echo $* > /proc/dynamic_debug/control
}
vx () {
echo $1 > /sys/module/dynamic_debug/parameters/verbose
}
ddgrep () {
grep $1 /proc/dynamic_debug/control
}
doprints () {
cat /sys/module/test_dynamic_debug/parameters/do_prints
}
note () {
echo NOTE: $* >&2
$*
}ddparms () {
note ls -l /sys/module/test_dynamic_debug/parameters/
note cat /sys/module/test_dynamic_debug/parameters/*
}
up () {
modprobe drm debug=0x03 debug_trace=0x1ff
}dn () {
rmmod drm
}
ddtraceon () {
echo 1 > /sys/kernel/tracing/tracing_on echo 1 > /sys/kernel/tracing/events/dyndbg/enable
}
# replay drm.debug dependent-module scenario
submod () {
echo MP test_dynamic_debug $1 $2 dyndbg=+pm $3 $4 # extra complexity to avoid passing param=s since theyre explicit inits
if [[ -z $1 ]] ; then
modprobe test_dynamic_debug dyndbg=+pm
elif [[ -z $2 ]] ; then
modprobe test_dynamic_debug dyndbg=+pm \
p_disjoint_bits=${1:-0}
elif [[ -z $3 ]] ; then
# force 3,4 off, undoing DEBUG - declutter
modprobe test_dynamic_debug dyndbg=+pm \
p_disjoint_bits=${1:-0} p_level_num=${2:-0}
# p_disjoint_names=${3:-MID,-LOW,-HI} p_level_names=${4:-L3}
elif [[ -z $4 ]] ; then
modprobe test_dynamic_debug dyndbg=+pm \
p_disjoint_bits=${1:-0} p_level_num=${2:-0}
# p_disjoint_names=${3:-MID}
else
modprobe test_dynamic_debug dyndbg=+pm \
p_disjoint_bits=${1:-0} p_level_num=${2:-0}
# p_disjoint_names=${3:-MID} p_level_names=${4:-L3}
fi # _submod should pick up kparams
echo MP test_dynamic_debug_submod dyndbg=+pmf modprobe test_dynamic_debug_submod dyndbg=+pmf
}
unmod () {
rmmod test_dynamic_debug_submod
rmmod test_dynamic_debug
}
# The test:submod_test () {
unmod
submod $*
sleep 1
note "above submod.s D2_* prdbgs should have printed" note "because they are enabled here:"
ddgrep _submod
echo 1 > /sys/module/test_dynamic_debug/parameters/do_prints
note submod prdbgs should print here
echo 1 > /sys/module/test_dynamic_debug_submod/parameters/do_prints
}
# old-code: triggered jump-label init panic, fixed by doing
# dyndbg-init in notifier, after jump-label
submod_force () {
unmod
submod $*
sleep 1
# force all classes off, then on
note trigger toggled warning by turning off the supposed enabled prdbgs in submod echo 0 > /sys/module/test_dynamic_debug/parameters/disjoint_bits
echo 0x2ff > /sys/module/test_dynamic_debug/parameters/disjoint_bits
note now theyre on
doprints
}
setup () {
echo dynbg-verbose-0, clearing kmsg, and running submod_test vx 0
dmesg -W &
submod_test 7 7
ddcmd class V +mfl
ddcmd class V2 +tmfsl
ddcmd class V3 +mfsl
ddcmd class V4 +mfs
ddcmd class V5 +mf
ddcmd class V6 +m
doprints
}
Jim Cromie (22):
test-dyndbg: fixup CLASSMAP usage error
dyndbg: make ddebug_class_param union members same size
dyndbg: replace classmap list with a vector
dyndbg: ddebug_apply_class_bitmap - add module arg, select on it
dyndbg: split param_set_dyndbg_classes to module/wrapper fns
dyndbg: drop NUM_TYPE_ARRAY
dyndbg: reduce verbose/debug clutter
dyndbg: silence debugs with no-change updates
dyndbg: tighten ddebug_class_name() 1st arg type
dyndbg: tighten fn-sig of ddebug_apply_class_bitmap
dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code
dyndbg-API: fix CONFIG_DRM_USE_DYNAMIC_DEBUG regression
dyndbg: add for_each_boxed_vector
dyndbg: refactor ddebug_classparam_clamp_input
dyndbg-API: promote DYNDBG_CLASSMAP_PARAM to API
dyndbg-test: build it with just CONFIG_DYNAMIC_DEBUG_CORE
dyndbg-doc: add classmap info to howto
dyndbg: reserve flag bit _DPRINTK_FLAGS_PREFIX_CACHED
dyndbg: add _DPRINTK_FLAGS_INCL_LOOKUP
drm: use correct ccflags-y spelling
drm-drivers: DRM_CLASSMAP_USE in 2nd batch of drivers, helpers
drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN
.../admin-guide/dynamic-debug-howto.rst | 60 ++- MAINTAINERS | 2 +- drivers/gpu/drm/Kconfig | 3 +- drivers/gpu/drm/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +- drivers/gpu/drm/display/drm_dp_helper.c | 12 +- drivers/gpu/drm/drm_crtc_helper.c | 12 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 + drivers/gpu/drm/drm_print.c | 35 +- drivers/gpu/drm/gud/gud_drv.c | 2 + drivers/gpu/drm/i915/i915_params.c | 12 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 + drivers/gpu/drm/radeon/radeon_drv.c | 2 + drivers/gpu/drm/udl/udl_main.c | 2 + drivers/gpu/drm/vkms/vkms_drv.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 + include/asm-generic/vmlinux.lds.h | 1 + include/drm/drm_print.h | 12 +- include/linux/dynamic_debug.h | 122 ++++-- kernel/module/main.c | 3 + lib/Kconfig.debug | 10 +- lib/Makefile | 4 +- lib/dynamic_debug.c | 407 +++++++++++------- lib/test_dynamic_debug.c | 137 +++--- lib/test_dynamic_debug_submod.c | 17 + 27 files changed, 546 insertions(+), 346 deletions(-) create mode 100644 lib/test_dynamic_debug_submod.c
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 1/22 test-dyndbg: fixup CLASSMAP usage error
more careful reading of test output reveals:
lib/test_dynamic_debug.c:103 [test_dynamic_debug]do_cats =pmf "doing categories\n" lib/test_dynamic_debug.c:105 [test_dynamic_debug]do_cats =p "LOW msg\n" class:MID lib/test_dynamic_debug.c:106 [test_dynamic_debug]do_cats =p "MID msg\n" class:HI lib/test_dynamic_debug.c:107 [test_dynamic_debug]do_cats =_ "HI msg\n" class unknown, _id:13
That last line is wrong, the HI class is declared.
But the enum's 1st val (explicitly initialized) was wrong; it must be _base, not _base+1 (a DECLARE_DYNDBG_CLASSMAP[1] param). So the last enumeration exceeded the range of mapped class-id's, which triggered the "class unknown" report. I intentionally coded in an error, but forgot to verify its detection and remove it.
RFC:
This patch fixes a bad usage of DECLARE_DYNDBG_CLASSMAP(), showing that it is too error-prone. As noted in test-mod comments:
* Using the CLASSMAP api:
* - classmaps must have corresponding enum
* - enum symbols must match/correlate with class-name strings in the map.
* - base must equal enum's 1st value
* - multiple maps must set their base to share the 0-62 class_id space !!
* (build-bug-on tips welcome)
Those shortcomings could largely be fixed with a __stringify_list (which doesn't exist,) used in DECLARE_DYNDBG_CLASSMAP to stringify __VA_ARGS__. Then, API would accept DRM_UT_* values literally; all the categories, in order, and not their stringifications, which created all the usage complications above.
[1] name changes later to DYNDBG_CLASSMAP_DEFINE
--- lib/test_dynamic_debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/test_dynamic_debug.c +1 -1
@@ -75,7 +75,7 @@ DD_SYS_WRAP(disjoint_bits, p);DD_SYS_WRAP (disjoint_bits,T );/* symbolic input, independent bits */ -enum cat_disjoint_names {LOW =11 ,MID ,HI }; +enum cat_disjoint_names {LOW =10 ,MID ,HI };DECLARE_DYNDBG_CLASSMAP (map_disjoint_names,DD_CLASS_TYPE_DISJOINT_NAMES ,10 ,"LOW" ,"MID" ,"HI" );DD_SYS_WRAP (disjoint_names, p);
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 2/22 dyndbg: make ddebug_class_param union members same size
In reply to Jim Cromiestruct ddebug_class_param keeps a ref to the state-storage of the param, make both flavors use the same unsigned long under-type. ISTM this is simpler and safer.
--- include/linux/dynamic_debug.h | 2 +- lib/dynamic_debug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/dynamic_debug.h +1 -1
@@ -124,7 +124,7 @@ struct _ddebug_info {struct ddebug_class_param {union {unsigned long *bits; -unsigned int *lvl; +unsigned long *lvl; };char flags[8 ];const struct ddebug_class_map *map;
lib/dynamic_debug.c +1 -1
@@ -796,7 +796,7 @@ int param_get_dyndbg_classes(char *buffer, const struct kernel_param *kp)case DD_CLASS_TYPE_LEVEL_NAMES :case DD_CLASS_TYPE_LEVEL_NUM : -return scnprintf (buffer,PAGE_SIZE ,"%d\n" , *dcp->lvl); +return scnprintf (buffer,PAGE_SIZE ,"%ld\n" , *dcp->lvl);default :return -1 ; }
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 3/22 dyndbg: replace classmap list with a vector
In reply to Jim CromieClassmaps are stored/linked in a section/array, but are each added to the module's ddebug_table.maps list-head.
This is unnecessary; even when ddebug_attach_classmap() is handling the builtin section (with classmaps for multiple builtin modules), its contents are ordered, so a module's possibly multiple classmaps will be consecutive in the section, and could be treated as a vector/block, since both start-addy and subrange length are in the ddebug_info arg.
So this changes:
struct ddebug_class_map drops list-head link.
struct ddebug_table drops the list-head maps, and gets: classes & num_classes for the start-addy and num_classes, placed to improve struct packing.
The loading: in ddebug_attach_module_classes(), replace the for-the-modname list-add loop, with a forloop that finds the module's subrange (start,length) of matching classmaps within the possibly builtin classmaps vector, and saves those to the ddebug_table.
The reading/using: change list-foreach loops in ddebug_class_name() & ddebug_find_valid_class() to walk the array from start to length.
Also:
Move #define __outvar up, above an added use in a fn-prototype. Simplify ddebug_attach_module_classes args, ref has both addy,len.
no functional changes
--- include/linux/dynamic_debug.h | 1 - lib/dynamic_debug.c | 61 ++++++++++++++++++----------------- 2 files changed, 32 insertions(+), 30 deletions(-)
include/linux/dynamic_debug.h +0 -1
@@ -83,7 +83,6 @@ enum class_map_type { };struct ddebug_class_map { -struct list_head link;struct module *mod;const char *mod_name;/* needed for builtins */ const char **class_names;
lib/dynamic_debug.c +32 -29
119 lines not on this page · raw message
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 4/22 dyndbg: ddebug_apply_class_bitmap - add module arg, select on it
In reply to Jim CromieAdd query_module param to ddebug_apply_class_bitmap(). This allows its caller to update just one module, or all (as currently). We'll use this later to propagate drm.debug to each USEr as they're modprobed.
No functional change.
---
after modprobe i915, heres the module dependencies, though not all on drm.debug.
bash-5.2# lsmod
Module Size Used by i915 3133440 0 drm_buddy 20480 1 i915 ttm 90112 1 i915 i2c_algo_bit 16384 1 i915 video 61440 1 i915 wmi 32768 1 video drm_display_helper 200704 1 i915 drm_kms_helper 208896 2 drm_display_helper,i915 drm 606208 5 drm_kms_helper,drm_display_helper,drm_buddy,i915,ttm cec 57344 2 drm_display_helper,i915 --- lib/dynamic_debug.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
lib/dynamic_debug.c +12 -7
@@ -601,7 +601,8 @@ static int ddebug_exec_queries(char *query, const char *modname)/* apply a new bitmap to the sys-knob's current bit-state */ static int ddebug_apply_class_bitmap (const struct ddebug_class_param *dcp, -unsigned long *new_bits,unsigned long *old_bits) +unsigned long *new_bits,unsigned long *old_bits, +const char *query_modname) {#define QUERY_SIZE 128char query[QUERY_SIZE ];
@@ -609,7 +610,8 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,int matches =0 ;int bi, ct; -v2pr_info ("apply: 0x%lx to: 0x%lx\n" , *new_bits, *old_bits); +v2pr_info ("apply bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, *old_bits, + query_modname ?:"" );for (bi =0 ; bi < map->length; bi++) {if (test_bit (bi, new_bits) ==test_bit (bi, old_bits))
@@ -618,12 +620,15 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,snprintf (query,QUERY_SIZE ,"class %s %c%s" , map->class_names[bi],test_bit (bi, new_bits) ?'+' :'-' , dcp->flags); - ct =ddebug_exec_queries (query,NULL ); + ct =ddebug_exec_queries (query, query_modname); matches += ct;v2pr_info ("bit_%d: %d matches on class: %s -> 0x%lx\n" , bi, ct, map->class_names[bi], *new_bits); } +v2pr_info ("applied bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, *old_bits, + query_modname ?:"" ); +return matches; }
@@ -679,7 +684,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pacontinue ; } curr_bits ^=BIT (cls_id); - totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, dcp->bits); + totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, dcp->bits,NULL ); *dcp->bits = curr_bits;v2pr_info ("%s: changed bit %d:%s\n" ,KP_NAME (kp), cls_id, map->class_names[cls_id]);
@@ -689,7 +694,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa old_bits =CLASSMAP_BITMASK (*dcp->lvl); curr_bits =CLASSMAP_BITMASK (cls_id + (wanted ?1 :0 )); - totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, &old_bits); + totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, &old_bits,NULL ); *dcp->lvl = (cls_id + (wanted ?1 :0 ));v2pr_info ("%s: changed bit-%d: \"%s\" %lx->%lx\n" ,KP_NAME (kp), cls_id, map->class_names[cls_id], old_bits, curr_bits);
@@ -752,7 +757,7 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) inrep &=CLASSMAP_BITMASK (map->length); }v2pr_info ("bits:%lx > %s\n" , inrep,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &inrep, dcp->bits); + totct +=ddebug_apply_class_bitmap (dcp, &inrep, dcp->bits,NULL ); *dcp->bits = inrep;break ;case DD_CLASS_TYPE_LEVEL_NUM :
@@ -765,7 +770,7 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) old_bits =CLASSMAP_BITMASK (*dcp->lvl); new_bits =CLASSMAP_BITMASK (inrep);v2pr_info ("lvl:%ld bits:0x%lx > %s\n" , inrep, new_bits,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &new_bits, &old_bits); + totct +=ddebug_apply_class_bitmap (dcp, &new_bits, &old_bits,NULL ); *dcp->lvl = inrep;break ;default :
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 5/22 dyndbg: split param_set_dyndbg_classes to module/wrapper fns
In reply to Jim Cromierename param_set_dyndbg_classes: add _module_ name & arg, old name is wrapper to new. New arg allows caller to specify that only one module is affected by a prdbgs update.
Outer fn preserves kernel_param interface, passing NULL to inner fn. This selectivity will be used later to narrow the scope of changes made.
no functional change.
--- lib/dynamic_debug.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-)
lib/dynamic_debug.c +22 -15
@@ -708,18 +708,9 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pareturn 0 ; } -/** -* param_set_dyndbg_classes - class FOO >control -* @instr: string echo>d to sysfs, input depends on map_type -* @kp: kp->arg has state: bits/lvl, map, map_type -* -* Enable/disable prdbgs by their class, as given in the arguments to -* DECLARE_DYNDBG_CLASSMAP. For LEVEL map-types, enforce relative -* levels by bitpos. -* -* Returns: 0 or <0 if error. -*/ -int param_set_dyndbg_classes (const char *instr,const struct kernel_param *kp) +static int param_set_dyndbg_module_classes (const char *instr, +const struct kernel_param *kp, +const char *modnm) {const struct ddebug_class_param *dcp = kp->arg;const struct ddebug_class_map *map = dcp->map;
@@ -756,8 +747,8 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) KP_NAME(kp), inrep, CLASSMAP_BITMASK(map->length)); inrep &=CLASSMAP_BITMASK (map->length); } -v2pr_info ("bits:%lx > %s\n" , inrep,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &inrep, dcp->bits,NULL ); +v2pr_info ("bits:0x%lx > %s.%s\n" , inrep, modnm ?:"*" ,KP_NAME (kp)); + totct +=ddebug_apply_class_bitmap (dcp, &inrep, dcp->bits, modnm); *dcp->bits = inrep;break ;case DD_CLASS_TYPE_LEVEL_NUM :
@@ -770,7 +761,7 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp) old_bits =CLASSMAP_BITMASK (*dcp->lvl); new_bits =CLASSMAP_BITMASK (inrep);v2pr_info ("lvl:%ld bits:0x%lx > %s\n" , inrep, new_bits,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &new_bits, &old_bits,NULL ); + totct +=ddebug_apply_class_bitmap (dcp, &new_bits, &old_bits, modnm); *dcp->lvl = inrep;break ;default :
@@ -779,6 +770,22 @@ int param_set_dyndbg_classes(const char *instr, const struct kernel_param *kp)vpr_info ("%s: total matches: %d\n" ,KP_NAME (kp), totct);return 0 ; } + +/** +* param_set_dyndbg_classes - class FOO >control +* @instr: string echo>d to sysfs, input depends on map_type +* @kp: kp->arg has state: bits/lvl, map, map_type +* +* Enable/disable prdbgs by their class, as given in the arguments to +* DECLARE_DYNDBG_CLASSMAP. For LEVEL map-types, enforce relative +* levels by bitpos. +* +* Returns: 0 or <0 if error. +*/ +int param_set_dyndbg_classes (const char *instr,const struct kernel_param *kp) +{ +return param_set_dyndbg_module_classes (instr, kp,NULL ); +}EXPORT_SYMBOL (param_set_dyndbg_classes);/**
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 6/22 dyndbg: drop NUM_TYPE_ARRAY
In reply to Jim CromieARRAY_SIZE works here, since array decl is complete.
no functional change
--- include/linux/dynamic_debug.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
include/linux/dynamic_debug.h +1 -3
@@ -106,11 +106,9 @@ struct ddebug_class_map { .mod_name = KBUILD_MODNAME, \ .base = _base, \ .map_type = _maptype, \ - .length = NUM_TYPE_ARGS(char*, __VA_ARGS__), \ + .length = ARRAY_SIZE(_var##_classnames), \ .class_names = _var##_classnames, \ } -#define NUM_TYPE_ARGS (eltype, ...) \ - (sizeof((eltype[]){__VA_ARGS__}) / sizeof(eltype))/* encapsulate linker provided built-in (or module) dyndbg data */ struct _ddebug_info {
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 7/22 dyndbg: reduce verbose/debug clutter
In reply to Jim Cromiecurrently, for verbose=3, these are logged (blank lines for clarity):
dyndbg: query 0: "class DRM_UT_CORE +p" mod:*
dyndbg: split into words: "class" "DRM_UT_CORE" "+p"
dyndbg: op='+'
dyndbg: flags=0x1
dyndbg: *flagsp=0x1 *maskp=0xffffffff
dyndbg: parsed: func="" file="" module="" format="" lineno=0-0 class=...
dyndbg: no matches for query
dyndbg: no-match: func="" file="" module="" format="" lineno=0-0 class=...
dyndbg: processed 1 queries, with 0 matches, 0 errs
That is excessive, so this patch:
- shrinks 3 lines of 2nd stanza to single line
- drops 1st 2 lines of 3rd stanza
3rd is like 1st, with result, not procedure. 2nd is just status, retold in 4th, with more info.
--- lib/dynamic_debug.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
lib/dynamic_debug.c +3 -11
@@ -266,9 +266,6 @@ static int ddebug_change(const struct ddebug_query *query, }mutex_unlock (&ddebug_lock); -if (!nfound && verbose) -pr_info ("no matches for query\n" ); -return nfound; }
@@ -497,7 +494,6 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers)pr_err ("bad flag-op %c, at start of %s\n" , *str, str);return -EINVAL ; } -v3pr_info ("op='%c'\n" , op);for (; *str ; ++str) {for (i =ARRAY_SIZE (opt_array) -1 ; i >=0 ; i--) {
@@ -511,7 +507,6 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers)return -EINVAL ; } } -v3pr_info ("flags=0x%x\n" , modifiers->flags);/* calculate final flags, mask based upon op */ switch (op) {
@@ -527,7 +522,7 @@ static int ddebug_parse_flags(const char *str, struct flag_settings *modifiers) modifiers->flags =0 ;break ; } -v3pr_info ("*flagsp=0x%x *maskp=0x%x\n" , modifiers->flags, modifiers->mask); +v3pr_info ("op='%c' flags=0x%x maskp=0x%x\n" , op, modifiers->flags, modifiers->mask);return 0 ; }
@@ -537,7 +532,7 @@ static int ddebug_exec_query(char *query_string, const char *modname)struct flag_settings modifiers = {};struct ddebug_query query = {};#define MAXWORDS 9 -int nwords, nfound; +int nwords;char *words[MAXWORDS ]; nwords =ddebug_tokenize (query_string, words,MAXWORDS );
@@ -555,10 +550,7 @@ static int ddebug_exec_query(char *query_string, const char *modname)return -EINVAL ; }/* actually go and implement the change */ - nfound =ddebug_change (&query, &modifiers); -vpr_info_dq (&query, nfound ?"applied" :"no-match" ); - -return nfound; +return ddebug_change (&query, &modifiers); }/* handle multiple queries in query string, continue on error, return
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 8/22 dyndbg: silence debugs with no-change updates
In reply to Jim Cromiecheck for actual changes before announcing them, declutter logs.
--- lib/dynamic_debug.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
lib/dynamic_debug.c +7 -5
@@ -591,7 +591,7 @@ static int ddebug_exec_queries(char *query, const char *modname)return nfound; } -/* apply a new bitmap to the sys-knob's current bit-state */ +/* apply a new class-param setting */ static int ddebug_apply_class_bitmap (const struct ddebug_class_param *dcp,unsigned long *new_bits,unsigned long *old_bits,const char *query_modname)
@@ -602,8 +602,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,int matches =0 ;int bi, ct; -v2pr_info ("apply bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, *old_bits, - query_modname ?:"" ); +if (*new_bits != *old_bits) +v2pr_info ("apply bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, + *old_bits, query_modname ?:"'*'" );for (bi =0 ; bi < map->length; bi++) {if (test_bit (bi, new_bits) ==test_bit (bi, old_bits))
@@ -618,8 +619,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,v2pr_info ("bit_%d: %d matches on class: %s -> 0x%lx\n" , bi, ct, map->class_names[bi], *new_bits); } -v2pr_info ("applied bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, *old_bits, - query_modname ?:"" ); +if (*new_bits != *old_bits) +v2pr_info ("applied bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, + *old_bits, query_modname ?:"'*'" );return matches; }
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 9/22 dyndbg: tighten ddebug_class_name() 1st arg type
In reply to Jim CromieChange function's 1st arg-type, and deref in the caller. The fn doesn't need any other fields in the struct.
no functional change.
--- lib/dynamic_debug.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
lib/dynamic_debug.c +5 -5
@@ -1117,12 +1117,12 @@ static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos)#define class_in_range (class_id, map) \ (class_id >= map->base && class_id < map->base + map->length) -static const char *ddebug_class_name (struct ddebug_iter *iter,struct _ddebug *dp) +static const char *ddebug_class_name (struct ddebug_table *dt,struct _ddebug *dp) { -struct ddebug_class_map *map = iter->table->classes; -int i, nc = iter->table->num_classes; +struct ddebug_class_map *map = dt->classes; +int i; -for (i =0 ; i < nc; i++, map++) +for (i =0 ; i < dt->num_classes; i++, map++)if (class_in_range (dp->class_id, map))return map->class_names[dp->class_id - map->base];
@@ -1156,7 +1156,7 @@ static int ddebug_proc_show(struct seq_file *m, void *p)seq_puts (m,"\"" );if (dp->class_id != _DPRINTK_CLASS_DFLT) { - class =ddebug_class_name (iter, dp); + class =ddebug_class_name (iter->table, dp);if (class)seq_printf (m," class:%s" , class);else
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 10/22 dyndbg: tighten fn-sig of ddebug_apply_class_bitmap
In reply to Jim Cromieold_bits arg is currently a pointer to the input bits, but this could allow inadvertent changes to the input by the fn. Disallow this. And constify new_bits while here.
--- lib/dynamic_debug.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
lib/dynamic_debug.c +11 -10
@@ -593,7 +593,8 @@ static int ddebug_exec_queries(char *query, const char *modname)/* apply a new class-param setting */ static int ddebug_apply_class_bitmap (const struct ddebug_class_param *dcp, -unsigned long *new_bits,unsigned long *old_bits, +const unsigned long *new_bits, +const unsigned long old_bits,const char *query_modname) {#define QUERY_SIZE 128
@@ -602,12 +603,12 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,int matches =0 ;int bi, ct; -if (*new_bits != *old_bits) +if (*new_bits != old_bits)v2pr_info ("apply bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, - *old_bits, query_modname ?:"'*'" ); + old_bits, query_modname ?:"'*'" );for (bi =0 ; bi < map->length; bi++) { -if (test_bit (bi, new_bits) ==test_bit (bi, old_bits)) +if (test_bit (bi, new_bits) ==test_bit (bi, &old_bits))continue ; snprintf(query, QUERY_SIZE, "class %s %c%s", map->class_names[bi],
@@ -619,9 +620,9 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,v2pr_info ("bit_%d: %d matches on class: %s -> 0x%lx\n" , bi, ct, map->class_names[bi], *new_bits); } -if (*new_bits != *old_bits) +if (*new_bits != old_bits)v2pr_info ("applied bitmap: 0x%lx to: 0x%lx for %s\n" , *new_bits, - *old_bits, query_modname ?:"'*'" ); + old_bits, query_modname ?:"'*'" );return matches; }
@@ -678,7 +679,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pacontinue ; } curr_bits ^=BIT (cls_id); - totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, dcp->bits,NULL ); + totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, *dcp->bits,NULL ); *dcp->bits = curr_bits;v2pr_info ("%s: changed bit %d:%s\n" ,KP_NAME (kp), cls_id, map->class_names[cls_id]);
@@ -688,7 +689,7 @@ static int param_set_dyndbg_classnames(const char *instr, const struct kernel_pa old_bits =CLASSMAP_BITMASK (*dcp->lvl); curr_bits =CLASSMAP_BITMASK (cls_id + (wanted ?1 :0 )); - totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, &old_bits,NULL ); + totct +=ddebug_apply_class_bitmap (dcp, &curr_bits, old_bits,NULL ); *dcp->lvl = (cls_id + (wanted ?1 :0 ));v2pr_info ("%s: changed bit-%d: \"%s\" %lx->%lx\n" ,KP_NAME (kp), cls_id, map->class_names[cls_id], old_bits, curr_bits);
@@ -742,7 +743,7 @@ static int param_set_dyndbg_module_classes(const char *instr, inrep &=CLASSMAP_BITMASK (map->length); }v2pr_info ("bits:0x%lx > %s.%s\n" , inrep, modnm ?:"*" ,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &inrep, dcp->bits, modnm); + totct +=ddebug_apply_class_bitmap (dcp, &inrep, *dcp->bits, modnm); *dcp->bits = inrep;break ;case DD_CLASS_TYPE_LEVEL_NUM :
@@ -755,7 +756,7 @@ static int param_set_dyndbg_module_classes(const char *instr, old_bits =CLASSMAP_BITMASK (*dcp->lvl); new_bits =CLASSMAP_BITMASK (inrep);v2pr_info ("lvl:%ld bits:0x%lx > %s\n" , inrep, new_bits,KP_NAME (kp)); - totct +=ddebug_apply_class_bitmap (dcp, &new_bits, &old_bits, modnm); + totct +=ddebug_apply_class_bitmap (dcp, &new_bits, old_bits, modnm); *dcp->lvl = inrep;break ;default :
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 11/22 dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code
In reply to Jim CromieRemove the NAMED class types; these 2 classmap types accept class names at the PARAM interface, for example:
echo +DRM_UT_CORE,-DRM_UT_KMS > /sys/module/drm/parameters/debug_names
The code works, but its only used by test-dynamic-debug, and wasn't asked for by anyone else, so simplify things for now.
--- include/linux/dynamic_debug.h | 19 ++----- lib/dynamic_debug.c | 103 +++------------------------------- lib/test_dynamic_debug.c | 12 ---- 3 files changed, 12 insertions(+), 122 deletions(-)
include/linux/dynamic_debug.h +4 -15
@@ -61,24 +61,13 @@ struct _ddebug {enum class_map_type {DD_CLASS_TYPE_DISJOINT_BITS ,/** -* DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, one per bit. -* expecting hex input. Built for drm.debug, basis for other types. +* DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, mapped to bits[0..N]. +* Expects hex input. Built for drm.debug, basis for other types. */ DD_CLASS_TYPE_LEVEL_NUM ,/** -* DD_CLASS_TYPE_LEVEL_NUM: input is numeric level, 0-N. -* N turns on just bits N-1 .. 0, so N=0 turns all bits off. -*/ -DD_CLASS_TYPE_DISJOINT_NAMES , -/** -* DD_CLASS_TYPE_DISJOINT_NAMES: input is a CSV of [+-]CLASS_NAMES, -* classes are independent, like _DISJOINT_BITS. -*/ -DD_CLASS_TYPE_LEVEL_NAMES , -/** -* DD_CLASS_TYPE_LEVEL_NAMES: input is a CSV of [+-]CLASS_NAMES, -* intended for names like: INFO,DEBUG,TRACE, with a module prefix -* avoid EMERG,ALERT,CRIT,ERR,WARNING: they're not debug +* DD_CLASS_TYPE_LEVEL_NUM: input is numeric level, 0..N. +* Input N turns on bits 0..N-1 */ };
lib/dynamic_debug.c +8 -95
126 lines not on this page · raw message
lib/test_dynamic_debug.c +0 -12
@@ -102,10 +102,6 @@ static void do_cats(void) {pr_debug ("doing categories\n" ); -prdbg (LOW ); -prdbg (MID ); -prdbg (HI ); -prdbg (D2_CORE );prdbg (D2_DRIVER );prdbg (D2_KMS );
@@ -129,14 +125,6 @@ static void do_levels(void)prdbg (V5 );prdbg (V6 );prdbg (V7 ); - -prdbg (L1 ); -prdbg (L2 ); -prdbg (L3 ); -prdbg (L4 ); -prdbg (L5 ); -prdbg (L6 ); -prdbg (L7 ); }static void do_prints (void )
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 12/22 dyndbg-API: fix CONFIG_DRM_USE_DYNAMIC_DEBUG regression
In reply to Jim CromieDECLARE_DYNDBG_CLASSMAP() has a design error; it fails a basic K&R
rule: "define once, refer many times".
When DRM_USE_DYNAMIC_DEBUG=y, DECLARE_DYNDBG_CLASSMAP() is used across DRM core & drivers; they all repeat the same classmap-defn args, which must match for the modules to respond together when DRM.debug categories are enabled.
Worse, it causes the CONFIG_DRM_USE_DYNAMIC_DEBUG=Y regression; 1st drm.ko loads, and dyndbg initializes its DRM.debug callsites, then a drm-driver loads, but too late - it missed the DRM.debug enablement.
So replace it with 2 macros:
DYNDBG_CLASSMAP_DEFINE - invoked once from core - drm.ko
DYNDBG_CLASSMAP_USE - from all drm drivers and helpers.
DYNDBG_CLASSMAP_DEFINE: based on DECLARE_DYNDBG_CLASSMAP, but now it drops the static on the constructed classmap variable, and exports it instead.
DYNDBG_CLASSMAP_USE: then refers to the exported var by name:
* used from drivers, helper-mods
* lets us drop the repetitive "classname" args
* fixes 2nd-defn problem
* creates a ddebug_class_user record in new __dyndbg_class_users section this allows ddebug_add_module(etal) to handle them per-module.
The distinction, and the usage record, allows dyndbg to initialize the driver's DRM.debug callsites separately after it is modprobed.
Since DRM now needs updates to use the new macros, it also gets 2
wrappers: DRM_CLASSMAP_DEFINE, DRM_CLASSMAP_USE which declutter the users by hiding the ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG.
To review, dyndbg's existing __dyndbg_classes[] section does:
. catalogs the classmaps defined by the module (or builtin modules) . authorizes dyndbg to >control those class'd prdbgs for the module. . DYNDBG_CLASSMAP_DEFINE(and old one) creates classmaps in this section.
This patch adds __dyndbg_class_users[] section:
. catalogs uses/references to the classmap definitions.
. authorizes dyndbg to >control those class'd prdbgs in ref'g module. . DYNDBG_CLASSMAP_USE() creates classmap-user records in this section.
Now ddebug_add_module(etal) can handle classmap-uses like (and after) classmaps; when a dependent module is loaded, its parent's kernel params are scanned to find the param wired to dyndbg-param-ops, whose classmap matches the one ref'd by the client.
To support this, a few data/header changes:
. new struct ddebug_class_user
contains: user-module-name, &classmap-defn
it records drm-driver's use of a classmap in the section, allowing lookup
struct ddebug_info gets 2 new fields to encapsulate the new section:
class_users, num_class_users.
set by dynamic_debug_init() for builtins.
or by kernel/module/main:load_info() for loadable modules.
vmlinux.lds.h: new BOUNDED_SECTION for __dyndbg_class_users
dynamic_debug.c has 2 changes in ddebug_add_module(), ddebug_change():
ddebug_add_module() previously called ddebug_attach_module_classes() to handle classmap DEFINEd by a module, now it also calls ddebug_attach_user_module_classes() to handle USEd classmaps.
ddebug_attach_user_module_classes() scans the module's class_users section, follows the refs to the parent's classmap, and calls ddebug_apply_params() on each.
ddebug_apply_params(new fn):
It scans module's/builtin kernel-params, calls ddebug_match_attach_kparam for each to find the params/sysfs-nodes which may be wired to a classmap.
ddebug_match_apply_kparam(new fn):
1st, it tests the kernel-param.ops is dyndbg's; this guarantees that the attached arg is a struct ddebug_class_param, which has a ref to the param's state, and to the classmap defining the param's handling.
2nd, it requires that the classmap ref'd by the kparam is the one we're called for; modules can use many separate classmaps (as test_dynamic_debug does).
Then apply the "parent" kparam's setting to the dependent module, using ddebug_apply_class_bitmap().
ddebug_change(and callees) also gets adjustments:
ddebug_find_valid_class(): This does a search over the module's classmaps, looking for the class FOO echo'd to >control. So now it searches over __dyndbg_class_users[] after __dyndbg_classes[].
ddebug_class_name(): return class-names for defined AND used classes.
test_dynamic_debug.c, test_dynamic_debug_submod.c:
This (already) demonstrates the 2 types of classmaps & sysfs-params, following the 4-part recipe:
1. define an enum for the classmap: DRM.debug has DRM_UT_{CORE,KMS,...} multiple classes must share 0-62 classid space.
2. DYNDBG_CLASSMAP_DEFINE(.. DRM_UT_{CORE,KMS,...})
3. DYNDBG_CLASSMAP_PARAM* (classmap)
4. DYNDBG_CLASSMAP_USE()
by _submod only, skipping 2,3
Move all the enum declarations together, to better explain how they share the 0..62 class-id space available to a module (non-overlapping subranges).
reorg macros 2,3 by name. This gives a tabular format, making it easy to see the pattern of repetition, and the points of change.
And extend the test to replicate the 2-module (parent & dependent) scenario which caused the CONFIG_DRM_USE_DYNAMIC_DEBUG=y regression seen in drm & drivers.
The _submod.c is a 2-line file: #define _SUBMOD, #include parent.
This gives identical complements of prdbgs in parent & _submod, and thus identical print behavior when all of: >control, >params, and parent->_submod propagation are working correctly.
It also puts all the parent/_submod declarations together in the same source, with the new ifdef _SUBMOD block invoking DYNDBG_CLASSMAP_USE for the 2 test-interfaces. I think this is clearer.
DEBUG details:
``#define DEBUG`` in src enables all pr_debugs after it, including any class'd pr_debugs; its not necessarily all-or-nothing, unless its a one-file-module with DEBUG at the top.
If a CLASSMAP_PARAM is defined on a classmap, its readback value cannot describe the set of enablements. The param is basically write-only; it cannot know if echo $cmd >control was done since.
To know the exact pr-debug state with certainty, toggle to both:
echo 0x3ff > /sys/module/drm/parameters/debug
echo 0 > /sys/module/drm/parameters/debug
Ref: commit bb2ff6c27bc9 ("drm: Disable dynamic debug as broken")
--- MAINTAINERS | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 +- drivers/gpu/drm/display/drm_dp_helper.c | 12 +- drivers/gpu/drm/drm_crtc_helper.c | 12 +- drivers/gpu/drm/drm_print.c | 25 ++-- drivers/gpu/drm/i915/i915_params.c | 12 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- include/asm-generic/vmlinux.lds.h | 1 + include/drm/drm_print.h | 10 +- include/linux/dynamic_debug.h | 54 +++++-- kernel/module/main.c | 3 + lib/Makefile | 2 +- lib/dynamic_debug.c | 178 ++++++++++++++++++++---- lib/test_dynamic_debug.c | 127 +++++++++++------ lib/test_dynamic_debug_submod.c | 10 ++ 15 files changed, 321 insertions(+), 151 deletions(-) create mode 100644 lib/test_dynamic_debug_submod.c
MAINTAINERS +1 -1
@@ -7253,7 +7253,7 @@ M: Jim Cromie <[email protected]> S: Maintained F: include/linux/dynamic_debug.h F: lib/dynamic_debug.c -F: lib/test_dynamic_debug.c +F: lib/test_dynamic_debug*.c DYNAMIC INTERRUPT MODERATION M: Tal Gilboa <[email protected]>
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -11
@@ -198,17 +198,7 @@ int amdgpu_user_partt_mode = AMDGPU_AUTO_COMPUTE_PARTITION_MODE;static void amdgpu_drv_delayed_reset_work_handler (struct work_struct *work); -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +DRM_CLASSMAP_USE (drm_debug_classes);struct amdgpu_mgpu_info mgpu_info = { .mutex =__MUTEX_INITIALIZER (mgpu_info.mutex),
drivers/gpu/drm/display/drm_dp_helper.c +1 -11
@@ -41,17 +41,7 @@#include "drm_dp_helper_internal.h" -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +DRM_CLASSMAP_USE (drm_debug_classes);struct dp_aux_backlight {struct backlight_device *base;
drivers/gpu/drm/drm_crtc_helper.c +1 -11
@@ -50,17 +50,7 @@#include "drm_crtc_helper_internal.h" -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +DRM_CLASSMAP_USE (drm_debug_classes);/** * DOC: overview
drivers/gpu/drm/drm_print.c +13 -12
@@ -55,18 +55,19 @@ MODULE_PARM_DESC(debug, "Enable debug output, where each bit enables a debug cat#if !defined(CONFIG_DRM_USE_DYNAMIC_DEBUG )module_param_named (debug, __drm_debug, ulong,0600 );#else -/* classnames must match vals of enum drm_debug_category */ -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +/* classnames must match value-symbols of enum drm_debug_category */ +DRM_CLASSMAP_DEFINE (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS , +DRM_UT_CORE , +"DRM_UT_CORE" , +"DRM_UT_DRIVER" , +"DRM_UT_KMS" , +"DRM_UT_PRIME" , +"DRM_UT_ATOMIC" , +"DRM_UT_VBL" , +"DRM_UT_STATE" , +"DRM_UT_LEASE" , +"DRM_UT_DP" , +"DRM_UT_DRMRES" );static struct ddebug_class_param drm_debug_bitmap = { .bits = &__drm_debug,
drivers/gpu/drm/i915/i915_params.c +1 -11
@@ -29,17 +29,7 @@#include "i915_params.h" #include "i915_drv.h" -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +DRM_CLASSMAP_USE (drm_debug_classes);#define i915_param_named (name,T , perm, desc) \ module_param_named(name, i915_modparams.name, T, perm); \
drivers/gpu/drm/nouveau/nouveau_drm.c +1 -11
@@ -69,17 +69,7 @@#include "nouveau_svm.h" #include "nouveau_dmem.h" -DECLARE_DYNDBG_CLASSMAP (drm_debug_classes,DD_CLASS_TYPE_DISJOINT_BITS ,0 , -"DRM_UT_CORE" , -"DRM_UT_DRIVER" , -"DRM_UT_KMS" , -"DRM_UT_PRIME" , -"DRM_UT_ATOMIC" , -"DRM_UT_VBL" , -"DRM_UT_STATE" , -"DRM_UT_LEASE" , -"DRM_UT_DP" , -"DRM_UT_DRMRES" ); +DRM_CLASSMAP_USE (drm_debug_classes);MODULE_PARM_DESC (config,"option string to pass to driver core" );static char *nouveau_config;
include/asm-generic/vmlinux.lds.h +1 -0
@@ -373,6 +373,7 @@/* implement dynamic printk debug */ \ . = ALIGN(8); \ BOUNDED_SECTION_BY(__dyndbg_classes, ___dyndbg_classes) \ + BOUNDED_SECTION_BY(__dyndbg_class_users, ___dyndbg_class_users) \ BOUNDED_SECTION_BY(__dyndbg, ___dyndbg) \ LIKELY_PROFILE() \BRANCH_PROFILE () \
include/drm/drm_print.h +9 -1
@@ -276,7 +276,7 @@ static inline struct drm_printer drm_err_printer(const char *prefix)* */ enum drm_debug_category { -/* These names must match those in DYNAMIC_DEBUG_CLASSBITS */ +/* Keep DRM_CLASSMAP_DEFINE args in sync with any changes here */ /** * @DRM_UT_CORE: Used in the generic drm code: drm_ioctl.c, drm_mm.c, * drm_memory.c, ...
@@ -321,6 +321,14 @@ enum drm_debug_category { DRM_UT_DRMRES }; +#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG +#define DRM_CLASSMAP_DEFINE (...) DYNDBG_CLASSMAP_DEFINE(__VA_ARGS__) +#define DRM_CLASSMAP_USE (name) DYNDBG_CLASSMAP_USE(name) +#else +#define DRM_CLASSMAP_DEFINE (...) +#define DRM_CLASSMAP_USE (name) +#endif +static inline bool drm_debug_enabled_raw (enum drm_debug_category category) {return unlikely (__drm_debug &BIT (category));
include/linux/dynamic_debug.h +42 -12
87 lines not on this page · raw message
kernel/module/main.c +3 -0
@@ -2206,6 +2206,9 @@ static int find_module_sections(struct module *mod, struct load_info *info) mod->dyndbg_info.classes =section_objs (info,"__dyndbg_classes" ,sizeof (*mod->dyndbg_info.classes), &mod->dyndbg_info.num_classes); + mod->dyndbg_info.class_users =section_objs (info,"__dyndbg_class_users" , +sizeof (*mod->dyndbg_info.class_users), + &mod->dyndbg_info.num_class_users);#endif return 0 ;
lib/Makefile +1 -1
@@ -79,7 +79,7 @@ obj-$(CONFIG_TEST_SORT) += test_sort.o obj-$(CONFIG_TEST_USER_COPY) += test_user_copy.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_keys.o obj-$(CONFIG_TEST_STATIC_KEYS) += test_static_key_base.o -obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o +obj-$(CONFIG_TEST_DYNAMIC_DEBUG) += test_dynamic_debug.o test_dynamic_debug_submod.o obj-$(CONFIG_TEST_PRINTF) += test_printf.o obj-$(CONFIG_TEST_SCANF) += test_scanf.o
lib/dynamic_debug.c +154 -24
278 lines not on this page · raw message
lib/test_dynamic_debug.c +82 -45
163 lines not on this page · raw message
lib/test_dynamic_debug_submod.c new file +10 -0
@@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Kernel module for testing dynamic_debug +* +* Authors: +* Jim Cromie <[email protected]> +*/ + +#define TEST_DYNAMIC_DEBUG_SUBMOD +#include "test_dynamic_debug.c"
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 13/22 dyndbg: add for_each_boxed_vector
In reply to Jim CromieAdd a for_each iterator to walk a counted vector member in a struct (ie the box), and use it to replace 8 open-coded loops.
---
v5- parens-on-box-force-precedence
--- lib/dynamic_debug.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
lib/dynamic_debug.c +11 -9
@@ -158,6 +158,9 @@ static void vpr_info_dq(const struct ddebug_query *query, const char *msg) _dt->num_class_users); \ }) +#define for_each_boxed_vector (_box, _vec, _len, _ct, _curs) \ + for (_ct = 0, _curs = (_box)->_vec; _ct < (_box)->_len; _ct++, _curs++) +#define __outvar/* filled by callee */ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table const *dt, const char *class_string,
@@ -167,7 +170,7 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table consstruct ddebug_class_user *cli;int i, idx; -for (i =0 , map = dt->classes; i < dt->num_classes; i++, map++) { +for_each_boxed_vector (dt, classes, num_classes, i, map) { idx =match_string (map->class_names, map->length, class_string);if (idx >=0 ) { *class_id = idx + map->base;
@@ -175,7 +178,7 @@ static struct ddebug_class_map *ddebug_find_valid_class(struct ddebug_table consreturn map; } } -for (i =0 , cli = dt->class_users; i < dt->num_class_users; i++, cli++) { +for_each_boxed_vector (dt, class_users, num_class_users, i, cli) { idx =match_string (cli->map->class_names, cli->map->length, class_string);if (idx >=0 ) { *class_id = idx + cli->map->base;
@@ -1058,11 +1061,11 @@ static const char *ddebug_class_name(struct ddebug_table *dt, struct _ddebug *dpstruct ddebug_class_user *cli = dt->class_users;int i; -for (i =0 ; i < dt->num_classes; i++, map++) +for_each_boxed_vector (dt, classes, num_classes, i, map)if (class_in_range (dp->class_id, map))return map->class_names[dp->class_id - map->base]; -for (i =0 ; i < dt->num_class_users; i++, cli++) +for_each_boxed_vector (dt, class_users, num_class_users, i, cli)if (class_in_range (dp->class_id, cli->map))return cli->map->class_names[dp->class_id - cli->map->base];
@@ -1216,7 +1219,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebugstruct ddebug_class_map *cm;int i, nc =0 ; -for (i =0 , cm = di->classes; i < di->num_classes; i++, cm++) { +for_each_boxed_vector (di, classes, num_classes, i, cm) {if (!strcmp (cm->mod_name, dt->mod_name)) {vpr_cm_info (cm,"classes[%d]:" , i);
@@ -1229,7 +1232,7 @@ static void ddebug_attach_module_classes(struct ddebug_table *dt, struct _ddebugvpr_info ("module:%s attached %d classes\n" , dt->mod_name, nc);/* now iterate dt */ -for (i =0 , cm = dt->classes; i < dt->num_classes; i++, cm++) +for_each_boxed_vector (di, classes, num_classes, i, cm)ddebug_apply_params (cm, cm->mod_name); }
@@ -1249,7 +1252,7 @@ static void ddebug_attach_user_module_classes(struct ddebug_table *dt,* module's refs, save to dt. For loadables, this is the * whole array. */ -for (i =0 , cli = di->class_users; i < di->num_class_users; i++, cli++) { +for_each_boxed_vector (di, class_users, num_class_users, i, cli) {if (WARN_ON (!cli || !cli->map || !cli->user_mod_name))continue ;
@@ -1264,8 +1267,7 @@ static void ddebug_attach_user_module_classes(struct ddebug_table *dt, } dt->num_class_users = nc; -/* now iterate dt */ -for (i =0 , cli = dt->class_users; i < dt->num_class_users; i++, cli++) +for_each_boxed_vector (di, class_users, num_class_users, i, cli)ddebug_apply_params (cli->map, cli->user_mod_name);vpr_dt_info (dt,"attach-client-module: " );
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 14/22 dyndbg: refactor ddebug_classparam_clamp_input
In reply to Jim CromieExtract input validation code, from param_set_dyndbg_module_classes() (the sys-node >handler) to new: ddebug_classparam_clamp_input(kp), call it from former. It takes kernel-param arg, so it can complain about "foo: bad input".
Reuse ddparam_clamp_input(kp) in ddebug_sync_classbits(), to validate inputs from parent's params, just like our own. To support that reuse, alter ddebug_sync_classbits() and caller to pass kp instead of kp->arg.
--- lib/dynamic_debug.c | 66 ++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 21 deletions(-)
lib/dynamic_debug.c +45 -21
@@ -656,6 +656,30 @@ static int ddebug_apply_class_bitmap(const struct ddebug_class_param *dcp,#define CLASSMAP_BITMASK (width) ((1UL << (width)) - 1) +static void ddebug_class_param_clamp_input (unsigned long *inrep,const struct kernel_param *kp) +{ +const struct ddebug_class_param *dcp = kp->arg; +const struct ddebug_class_map *map = dcp->map; + +switch (map->map_type) { +case DD_CLASS_TYPE_DISJOINT_BITS : +/* expect bits. mask and warn if too many */ +if (*inrep & ~CLASSMAP_BITMASK (map->length)) { +pr_warn ("%s: input: 0x%lx exceeds mask: 0x%lx, masking\n" , +KP_NAME (kp), *inrep,CLASSMAP_BITMASK (map->length)); + *inrep &=CLASSMAP_BITMASK (map->length); + } +break ; +case DD_CLASS_TYPE_LEVEL_NUM : +/* input is bitpos, of highest verbosity to be enabled */ +if (*inrep > map->length) { +pr_warn ("%s: level:%ld exceeds max:%d, clamping\n" , +KP_NAME (kp), *inrep, map->length); + *inrep = map->length; + } +break ; + } +}static int param_set_dyndbg_module_classes (const char *instr,const struct kernel_param *kp,const char *modnm)
@@ -674,26 +698,15 @@ static int param_set_dyndbg_module_classes(const char *instr,pr_err ("expecting numeric input, not: %s > %s\n" , instr,KP_NAME (kp));return -EINVAL ; } +ddebug_class_param_clamp_input (&inrep, kp);switch (map->map_type) {case DD_CLASS_TYPE_DISJOINT_BITS : -/* expect bits. mask and warn if too many */ -if (inrep & ~CLASSMAP_BITMASK (map->length)) { -pr_warn ("%s: input: 0x%lx exceeds mask: 0x%lx, masking\n" , -KP_NAME (kp), inrep,CLASSMAP_BITMASK (map->length)); - inrep &=CLASSMAP_BITMASK (map->length); - }v2pr_info ("bits:0x%lx > %s.%s\n" , inrep, modnm ?:"*" ,KP_NAME (kp)); totct +=ddebug_apply_class_bitmap (dcp, &inrep, *dcp->bits, modnm); *dcp->bits = inrep;break ;case DD_CLASS_TYPE_LEVEL_NUM : -/* input is bitpos, of highest verbosity to be enabled */ -if (inrep > map->length) { -pr_warn ("%s: level:%ld exceeds max:%d, clamping\n" , -KP_NAME (kp), inrep, map->length); - inrep = map->length; - } old_bits =CLASSMAP_BITMASK (*dcp->lvl); new_bits =CLASSMAP_BITMASK (inrep);v2pr_info ("lvl:%ld bits:0x%lx > %s\n" , inrep, new_bits,KP_NAME (kp));
@@ -1160,16 +1173,27 @@ static const char * const ddebug_classmap_typenames[] = { ddebug_classmap_typenames[_cm->map_type]); \ }) -static void ddebug_sync_classbits (const struct ddebug_class_param *dcp,const char *modname) +static void ddebug_sync_classbits (const struct kernel_param *kp,const char *modname) { -/* clamp initial bitvec, mask off hi-bits */ -if (*dcp->bits & ~CLASSMAP_BITMASK (dcp->map->length)) { - *dcp->bits &=CLASSMAP_BITMASK (dcp->map->length); -v2pr_info ("preset classbits: %lx\n" , *dcp->bits); +struct ddebug_class_param *dcp = kp->arg; +unsigned long new_bits; + +ddebug_class_param_clamp_input (dcp->bits, kp); + +switch (dcp->map->map_type) { +case DD_CLASS_TYPE_DISJOINT_BITS : +v2pr_info ("%s: classbits: 0x%lx\n" ,KP_NAME (kp), *dcp->bits); +ddebug_apply_class_bitmap (dcp, dcp->bits,0UL , modname); +break ; +case DD_CLASS_TYPE_LEVEL_NUM : + new_bits =CLASSMAP_BITMASK (*dcp->lvl); +v2pr_info ("%s: lvl:%ld bits:0x%lx\n" ,KP_NAME (kp), *dcp->lvl, new_bits); +ddebug_apply_class_bitmap (dcp, &new_bits,0UL , modname); +break ; +default : +pr_err ("bad map type %d\n" , dcp->map->map_type); +return ; } -/* force class'd prdbgs (in USEr module) to match (DEFINEr module) class-param */ -ddebug_apply_class_bitmap (dcp, dcp->bits, ~0 , modname); -ddebug_apply_class_bitmap (dcp, dcp->bits,0 , modname); } static void ddebug_match_apply_kparam(const struct kernel_param *kp,
@@ -1186,7 +1210,7 @@ static void ddebug_match_apply_kparam(const struct kernel_param *kp,if (map == dcp->map) {v2pr_info ("found kp:%s =0x%lx" , kp->name, *dcp->bits);vpr_cm_info (map,"mapped to:" ); -ddebug_sync_classbits (dcp, modnm); +ddebug_sync_classbits (kp, modnm); } }
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 15/22 dyndbg-API: promote DYNDBG_CLASSMAP_PARAM to API
In reply to Jim Cromiemove macro from test-dynamic-debug.c into header, and refine it.
Distinguish the 2 use cases of DYNDBG_CLASSMAP_PARAM*
1.DYNDBG_CLASSMAP_PARAM_REF
for DRM, to pass in extern __drm_debug by name. dyndbg keeps bits in it, so drm can still use it as before
2.DYNDBG_CLASSMAP_PARAM
new user (test_dynamic_debug) doesn't need to share state, decls a static long unsigned int to store the bitvec.
__DYNDBG_CLASSMAP_PARAM
bottom layer - allocate,init a ddebug-class-param, module-param-cb.
Also clean up and improve comments in test-code, and add MODULE_DESCRIPTIONs.
---
v5b - parens-on-PARAM
--- drivers/gpu/drm/drm_print.c | 8 ++--- include/drm/drm_print.h | 6 ++-- include/linux/dynamic_debug.h | 39 ++++++++++++++++++++-- lib/test_dynamic_debug.c | 58 +++++++++++++-------------------- lib/test_dynamic_debug_submod.c | 9 ++++- 5 files changed, 74 insertions(+), 46 deletions(-)
drivers/gpu/drm/drm_print.c +2 -6
@@ -69,12 +69,8 @@ DRM_CLASSMAP_DEFINE(drm_debug_classes, DD_CLASS_TYPE_DISJOINT_BITS,"DRM_UT_DP" , "DRM_UT_DRMRES"); -static struct ddebug_class_param drm_debug_bitmap = { - .bits = &__drm_debug, - .flags ="p" , - .map = &drm_debug_classes, -}; -module_param_cb (debug, ¶m_ops_dyndbg_classes, &drm_debug_bitmap,0600 ); +DRM_CLASSMAP_PARAM_REF (debug, __drm_debug, drm_debug_classes, p); +#endif void __drm_puts_coredump (struct drm_printer *p,const char *str)
include/drm/drm_print.h +4 -2
@@ -322,11 +322,13 @@ enum drm_debug_category { };#ifdef CONFIG_DRM_USE_DYNAMIC_DEBUG -#define DRM_CLASSMAP_DEFINE (...) DYNDBG_CLASSMAP_DEFINE(__VA_ARGS__) -#define DRM_CLASSMAP_USE (name) DYNDBG_CLASSMAP_USE(name) +#define DRM_CLASSMAP_DEFINE (...) DYNDBG_CLASSMAP_DEFINE(__VA_ARGS__) +#define DRM_CLASSMAP_USE (name) DYNDBG_CLASSMAP_USE(name) +#define DRM_CLASSMAP_PARAM_REF (...) DYNDBG_CLASSMAP_PARAM_REF(__VA_ARGS__)#else #define DRM_CLASSMAP_DEFINE (...)#define DRM_CLASSMAP_USE (name) +#define DRM_CLASSMAP_PARAM_REF (...)#endif static inline bool drm_debug_enabled_raw (enum drm_debug_category category)
include/linux/dynamic_debug.h +37 -2
@@ -92,7 +92,7 @@ struct ddebug_class_map {* module, and to validate inputs to DD_CLASS_TYPE_*_NAMES typed params. */ #define DYNDBG_CLASSMAP_DEFINE (_var, _maptype, _base, ...) \ - const char *_var##_classnames[] = { __VA_ARGS__ }; \ + static const char *_var##_classnames[] = { __VA_ARGS__ }; \ struct ddebug_class_map __aligned(8) __used \ __section("__dyndbg_classes") _var = { \ .mod = THIS_MODULE, \
@@ -121,7 +121,7 @@ struct ddebug_class_user { DYNDBG_CLASSMAP_USE_(_var, __UNIQUE_ID(ddebug_class_user))#define DYNDBG_CLASSMAP_USE_ (_var, _uname) \ extern struct ddebug_class_map _var; \ - struct ddebug_class_user __used \ + static struct ddebug_class_user __used \ __section("__dyndbg_class_users") _uname = { \ .user_mod_name = KBUILD_MODNAME, \ .map = &_var, \
@@ -146,6 +146,41 @@ struct ddebug_class_param {const struct ddebug_class_map *map; }; +/** +* DYNDBG_CLASSMAP_PARAM - wrap a dyndbg-classmap with a controlling sys-param +* @_name sysfs node name +* @_var name of the struct classmap var defining the controlled classes +* @_flags flags to be toggled, typically just 'p' +* +* Creates a sysfs-param to control the classes defined by the +* classmap. Keeps bits in a private/static +*/ +#define DYNDBG_CLASSMAP_PARAM (_name, _var, _flags) \ + static unsigned long _name##_bvec; \ + __DYNDBG_CLASSMAP_PARAM(_name, _name##_bvec, _var, _flags) + +/** +* DYNDBG_CLASSMAP_PARAM_REF - wrap a dyndbg-classmap with a controlling sys-param +* @_name sysfs node name +* @_bits name of the module's unsigned long bit-vector, ex: __drm_debug +* @_var name of the struct classmap var defining the controlled classes +* @_flags flags to be toggled, typically just 'p' +* +* Creates a sysfs-param to control the classmap, keeping bitvec in user @_bits. +* This lets drm use __drm_debug elsewhere too. +*/ +#define DYNDBG_CLASSMAP_PARAM_REF (_name, _bits, _var, _flags) \ + __DYNDBG_CLASSMAP_PARAM(_name, _bits, _var, _flags) + +#define __DYNDBG_CLASSMAP_PARAM (_name, _bits, _var, _flags) \ + static struct ddebug_class_param _name##_##_flags = { \ + .bits = &(_bits), \ + .flags = #_flags, \ + .map = &(_var), \ + }; \ + module_param_cb(_name, ¶m_ops_dyndbg_classes, \ + &_name##_##_flags, 0600) +/* * pr_debug() and friends are globally enabled or modules have selectively * enabled them.
lib/test_dynamic_debug.c +23 -35
102 lines not on this page · raw message
lib/test_dynamic_debug_submod.c +8 -1
@@ -1,6 +1,9 @@// SPDX-License-Identifier: GPL-2.0 /* -* Kernel module for testing dynamic_debug +* Kernel module to test/demonstrate dynamic_debug features, +* particularly classmaps and their support for subsystems, like DRM, +* which defines its drm_debug classmap in drm module, and uses it in +* helpers & drivers. * * Authors: * Jim Cromie <[email protected]>
@@ -8,3 +11,7 @@#define TEST_DYNAMIC_DEBUG_SUBMOD #include "test_dynamic_debug.c" + +MODULE_DESCRIPTION ("test/demonstrate dynamic-debug subsystem support" ); +MODULE_AUTHOR ("Jim Cromie <[email protected]>" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 16/22 dyndbg-test: build it with just CONFIG_DYNAMIC_DEBUG_CORE
In reply to Jim CromieMake the test-module buildable with just CONFIG_DYNAMIC_DEBUG_CORE; add CFLAGS_$ofile defns to supply -DDYNAMIC_DEBUG_MODULE to cc. Change the Kconfig entry to allow building with just _CORE, and fix the help text.
--- lib/Kconfig.debug | 10 +++++----- lib/Makefile | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-)
lib/Kconfig.debug +5 -5
@@ -2794,12 +2794,12 @@ config TEST_STATIC_KEYS If unsure, say N. config TEST_DYNAMIC_DEBUG - tristate "Test DYNAMIC_DEBUG" - depends on DYNAMIC_DEBUG + tristate "Build test-dynamic-debug module" + depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE help - This module registers a tracer callback to count enabled - pr_debugs in a 'do_debugging' function, then alters their - enablements, calls the function, and compares counts. + This module works/demo's the dyndbg's classmap API, by + creating 2 classes: a DISJOINT classmap (like DRM.debug) + and a LEVELS/VERBOSE classmap (like verbose2 > verbose1). If unsure, say N.
lib/Makefile +2 -0
@@ -239,6 +239,8 @@ obj-$(CONFIG_HAVE_ARCH_TRACEHOOK) += syscall.o obj-$(CONFIG_DYNAMIC_DEBUG_CORE) += dynamic_debug.o #ensure exported functions have prototypes CFLAGS_dynamic_debug.o := -DDYNAMIC_DEBUG_MODULE +CFLAGS_test_dynamic_debug.o := -DDYNAMIC_DEBUG_MODULE +CFLAGS_test_dynamic_debug_submod.o := -DDYNAMIC_DEBUG_MODULE obj-$(CONFIG_SYMBOLIC_ERRNAME) += errname.o
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 17/22 dyndbg-doc: add classmap info to howto
In reply to Jim CromieAdd some basic info on classmap usage and api
---
v5- adjustments per Randy Dunlap, me
--- .../admin-guide/dynamic-debug-howto.rst | 60 ++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-)
Documentation/admin-guide/dynamic-debug-howto.rst +59 -1
@@ -225,7 +225,6 @@ the ``p`` flag has meaning, other flags are ignored. Note the regexp ``^[-+=][fslmpt_]+$`` matches a flags specification. To clear all flags at once, use ``=_`` or ``-fslmpt``. - Debug messages during Boot Process ==================================
@@ -375,3 +374,62 @@ just a shortcut for ``print_hex_dump(KERN_DEBUG)``. For ``print_hex_dump_debug()``/``print_hex_dump_bytes()``, format string is its ``prefix_str`` argument, if it is constant string; or ``hexdump`` in case ``prefix_str`` is built dynamically. + +Dynamic Debug classmaps +======================= + +Dyndbg allows selection/grouping of *prdbg* callsites using structural +info: module, file, function, line. Classes allow authors to add +their own domain-oriented groupings using class-names. Classes span +the kernel, so DRM can define DRM_UT_<*> classes, and helpers & +drivers can use those definitions. + + # enable classes individually + :#> ddcmd class DRM_UT_CORE +p + :#> ddcmd class DRM_UT_KMS +p + # or more selectively + :#> ddcmd class DRM_UT_CORE module drm +p + +The "class FOO" syntax protects class'd prdbgs from generic overwrite:: + + # IOW this doesn't wipe any DRM.debug settings + :#> ddcmd -p + +To support the DRM.debug parameter, DYNDBG_CLASSMAP_PARAM* updates all +classes in a classmap, mapping param-bits 0..N onto the classes: +DRM_UT_<*> for the DRM use-case. + +Dynamic Debug Classmap API +========================== + +DYNDBG_CLASSMAP_DEFINE - modules use this to create classmaps, naming +each of the classes (stringified enum-symbols: "DRM_UT_<*>"), and +type, and mapping the class-names to consecutive _class_ids. + +By doing so, modules tell dyndbg that they are have prdbgs with those +class_ids, and they authorize dyndbg to accept "class FOO" for modules +which declare that classname with the DEFINE macro. + +There are 2 types of classmaps: + + DD_CLASS_TYPE_DISJOINT_BITS: classes are independent, like DRM.debug + DD_CLASS_TYPE_LEVEL_NUM: classes are relative, ordered (V3 > V2) + +DYNDBG_CLASSMAP_PARAM - refers to a DEFINEd classmap, exposing the set +of defined classes to manipulation as a group. This interface +enforces the relatedness of classes of DD_CLASS_TYPE_LEVEL_NUM typed +classmaps; all classes are independent in the >control parser itself. + +DYNDBG_CLASSMAP_USE - drm drivers use the CLASSMAP that drm DEFINEs. +This shares the classmap definition, authorizes coordinated changes +amongst the CLASSMAP DEFINEr and multiple USErs, and tells dyndbg +how to initialize the user's prdbgs at modprobe. + +Modules or module-groups (drm & drivers) can define multiple +classmaps, as long as they share the limited 0..62 per-module-group +_class_id range, without overlap. + +``#define DEBUG`` will enable all pr_debugs in scope, including any +class'd ones (__pr_debug_cls(id,fmt..)). This won't be reflected in +the PARAM readback value, but the pr_debug callsites can be toggled +into agreement with the param.
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 18/22 dyndbg: reserve flag bit _DPRINTK_FLAGS_PREFIX_CACHED
In reply to Jim CromieReserve bit 7 to remember that a pr-debug callsite is/was:
- enabled, with +p
- wants a dynamic-prefix, with one+ of module:function:sourcfile
- was previously called
- was thus saved in the cache. NOT YET.
Its unclear whether any cache fetch would be faster than 2-3 field fetches, but theres another factor; the 3 columns in the __dyndbg section are highly redundant and compressible, but to get the compression, we need field accessors, which will rebalance the tradeoff.
So, for now, its just the bit reservation.
--- include/linux/dynamic_debug.h | 1 + 1 file changed, 1 insertion(+)
include/linux/dynamic_debug.h +1 -0
@@ -38,6 +38,7 @@ struct _ddebug {#define _DPRINTK_FLAGS_INCL_LINENO (1<<3)#define _DPRINTK_FLAGS_INCL_TID (1<<4)#define _DPRINTK_FLAGS_INCL_SOURCENAME (1<<5) +#define _DPRINTK_FLAGS_PREFIX_CACHED (1<<7)#define _DPRINTK_FLAGS_INCL_ANY \ (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 19/22 dyndbg: add _DPRINTK_FLAGS_INCL_LOOKUP
In reply to Jim Cromiedyndbg's dynamic prefixing (by +tmfsl flags) is needlessly expensive.
When an enabled (with +p) pr_debug is called, _DPRINTK_FLAGS_INCL_ANY prefix decorations are sprintf'd into stack-mem for every call.
This string (or part of it) could be cached once its 1st generated, and retreived thereafter, as long as its deleted any time the callsite's flags are changed afterwards.
So consider the prefix/decoration flags: 'tmfsl', and what should be in the cache:
-t thread-id. not part of the "callsite" info, derived from current.
doesnt belong in the cache. it would be wrong.
can be done in outer: dynamic_emit_prefix()
-l line number
this could be part of the prefix, but would bloat the cache can also be done in outer: dynamic_emit_prefix()
-mfs module, function, source-file
we cache these, composed into a sub-string. they are "lookups", currently to descriptor fields, could be accessor macros to "compressed" tables. cache saves more access work.
All enabled together, they compose a prefix string like:
# outer -----inner---------- outer "[tid] module:function:sourcfile:line: "
So this patch extracts _DPRINTK_FLAGS_INCL_LOOKUP macro out of _DPRINTK_FLAGS_INCL_ANY macro, then redefs latter.
Next re-refactor dynamic_emit_prefix inner/outer fns accordingly.
--- include/linux/dynamic_debug.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
include/linux/dynamic_debug.h +5 -3
@@ -40,10 +40,12 @@ struct _ddebug {#define _DPRINTK_FLAGS_INCL_SOURCENAME (1<<5)#define _DPRINTK_FLAGS_PREFIX_CACHED (1<<7) -#define _DPRINTK_FLAGS_INCL_ANY \ - (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME |\ - _DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID |\ +#define _DPRINTK_FLAGS_INCL_LOOKUP \ + (_DPRINTK_FLAGS_INCL_MODNAME | _DPRINTK_FLAGS_INCL_FUNCNAME | \ _DPRINTK_FLAGS_INCL_SOURCENAME) +#define _DPRINTK_FLAGS_INCL_ANY \ + (_DPRINTK_FLAGS_INCL_LINENO | _DPRINTK_FLAGS_INCL_TID | \ + _DPRINTK_FLAGS_INCL_LOOKUP)#if definedDEBUG #define _DPRINTK_FLAGS_DEFAULT _DPRINTK_FLAGS_PRINT
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 20/22 drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN
In reply to Jim CromieLots of burn-in testing needed before signing, upstreaming.
NOTE: I set default Y to maximize testing by default. Is there a better way to do this ?
--- drivers/gpu/drm/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/Kconfig +1 -2
@@ -52,8 +52,7 @@ config DRM_DEBUG_MM config DRM_USE_DYNAMIC_DEBUG bool "use dynamic debug to implement drm.debug" - default n - depends on BROKEN + default y depends on DRM depends on DYNAMIC_DEBUG || DYNAMIC_DEBUG_CORE depends on JUMP_LABEL
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 21/22 drm: use correct ccflags-y spelling
In reply to Jim CromieIncorrectly spelled CFLAGS- failed to add -DDYNAMIC_DEBUG_MODULE, which broke builds with:
CONFIG_DRM_USE_DYNAMIC_DEBUG=yCONFIG_DYNAMIC_DEBUG_CORE=yCONFIG_DYNAMIC_DEBUG=n
Also add subdir-ccflags so that all drivers pick up the addition.
--- drivers/gpu/drm/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/Makefile +2 -1
@@ -3,7 +3,8 @@ # Makefile for the drm device driver. This driver provides support for the # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. -CFLAGS-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE +ccflags-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE +subdir-ccflags-$(CONFIG_DRM_USE_DYNAMIC_DEBUG) += -DDYNAMIC_DEBUG_MODULE drm-y := \ drm_aperture.o \
Signature · 1 line
2.41.0
Jim Cromie
maintainerPATCH v6 22/22 drm-drivers: DRM_CLASSMAP_USE in 2nd batch of drivers, helpers
In reply to Jim CromieAdd a DRM_CLASSMAP_USE declaration to 2nd batch of helpers and *_drv.c files. For drivers, add the decl just above the module's PARAMs, since it identifies the "inherited" drm.debug param.
Note: with CONFIG_DRM_USE_DYNAMIC_DEBUG=y, a module not also declaring DRM_CLASSMAP_USE will have its class'd prdbgs stuck in the initial (disabled, but for DEBUG) state.
The stuck sites are evident in /proc/dynamic_debug/control as:
class unknown, _id:N # control's last column
rather than a proper "enumeration":
class:DRM_UT_CORE
This set of updates was found by choosing M for all DRM-config items I found (not allmodconfig), building & modprobing them, and grepping "class unknown," control. There may yet be others.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 2 ++ drivers/gpu/drm/gud/gud_drv.c | 2 ++ drivers/gpu/drm/mgag200/mgag200_drv.c | 2 ++ drivers/gpu/drm/qxl/qxl_drv.c | 2 ++ drivers/gpu/drm/radeon/radeon_drv.c | 2 ++ drivers/gpu/drm/udl/udl_main.c | 2 ++ drivers/gpu/drm/vkms/vkms_drv.c | 2 ++ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 ++ 8 files changed, 16 insertions(+)
drivers/gpu/drm/drm_gem_shmem_helper.c +2 -0
@@ -23,6 +23,8 @@#include <drm/drm_prime.h> #include <drm/drm_print.h> +DRM_CLASSMAP_USE (drm_debug_classes); +MODULE_IMPORT_NS (DMA_BUF );/**
drivers/gpu/drm/gud/gud_drv.c +2 -0
@@ -31,6 +31,8 @@#include "gud_internal.h" +DRM_CLASSMAP_USE (drm_debug_classes); +/* Only used internally */ static const struct drm_format_info gud_drm_format_r1 = { .format =GUD_DRM_FORMAT_R1 ,
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -0
@@ -24,6 +24,8 @@ int mgag200_modeset = -1;MODULE_PARM_DESC (modeset,"Disable/Enable modesetting" );module_param_named (modeset, mgag200_modeset, int,0400 ); +DRM_CLASSMAP_USE (drm_debug_classes); +int mgag200_init_pci_options (struct pci_dev *pdev,u32 option,u32 option2) {struct device *dev = &pdev->dev;
drivers/gpu/drm/qxl/qxl_drv.c +2 -0
@@ -65,6 +65,8 @@ module_param_named(modeset, qxl_modeset, int, 0400);MODULE_PARM_DESC (num_heads,"Number of virtual crtcs to expose (default 4)" );module_param_named (num_heads, qxl_num_crtc, int,0400 ); +DRM_CLASSMAP_USE (drm_debug_classes); +static struct drm_driver qxl_driver;static struct pci_driver qxl_pci_driver;
drivers/gpu/drm/radeon/radeon_drv.c +2 -0
@@ -274,6 +274,8 @@ int radeon_cik_support = 1;MODULE_PARM_DESC (cik_support,"CIK support (1 = enabled (default), 0 = disabled)" );module_param_named (cik_support, radeon_cik_support, int,0444 ); +DRM_CLASSMAP_USE (drm_debug_classes); +static struct pci_device_id pciidlist[] = { radeon_PCI_IDS };
drivers/gpu/drm/udl/udl_main.c +2 -0
@@ -19,6 +19,8 @@#define NR_USB_REQUEST_CHANNEL 0x12 +DRM_CLASSMAP_USE (drm_debug_classes); +#define MAX_TRANSFER (PAGE_SIZE*16 - BULK_SIZE)#define WRITES_IN_FLIGHT (20)#define MAX_VENDOR_DESCRIPTOR_SIZE 256
drivers/gpu/drm/vkms/vkms_drv.c +2 -0
@@ -39,6 +39,8 @@static struct vkms_config *default_config; +DRM_CLASSMAP_USE (drm_debug_classes); +static bool enable_cursor = true;module_param_named (enable_cursor, enable_cursor, bool,0444 );MODULE_PARM_DESC (enable_cursor,"Enable/Disable cursor support" );
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +2 -0
@@ -275,6 +275,8 @@ static int vmw_probe(struct pci_dev *, const struct pci_device_id *);static int vmwgfx_pm_notifier (struct notifier_block *nb,unsigned long val,void *ptr); +DRM_CLASSMAP_USE (drm_debug_classes); +MODULE_PARM_DESC (restrict_iommu,"Try to limit IOMMU usage for TTM pages" );module_param_named (restrict_iommu, vmw_restrict_iommu, int,0600 );MODULE_PARM_DESC (force_coherent,"Force coherent TTM pages" );
Signature · 1 line
2.41.0
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BUILD: failure for fix DRM_USE_DYNAMIC_DEBUG regression
In reply to Jim Cromie== Series Details ==
== Series Details ==
Series: fix DRM_USE_DYNAMIC_DEBUG regression
URL : https://patchwork.freedesktop.org/series/123572/
State : failure
== Summary ==
Error: patch https://patchwork.freedesktop.org/api/1.0/series/123572/revisions/1/mbox/ not applied
Applying: test-dyndbg: fixup CLASSMAP usage error
Applying: dyndbg: make ddebug_class_param union members same size
Applying: dyndbg: replace classmap list with a vector
Applying: dyndbg: ddebug_apply_class_bitmap - add module arg, select on it
Applying: dyndbg: split param_set_dyndbg_classes to module/wrapper fns
Applying: dyndbg: drop NUM_TYPE_ARRAY
Applying: dyndbg: reduce verbose/debug clutter
Applying: dyndbg: silence debugs with no-change updates
Applying: dyndbg: tighten ddebug_class_name() 1st arg type
Applying: dyndbg: tighten fn-sig of ddebug_apply_class_bitmap
Applying: dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code
Applying: dyndbg-API: fix CONFIG_DRM_USE_DYNAMIC_DEBUG regression
error: sha1 information is lacking or useless (lib/dynamic_debug.c).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0012 dyndbg-API: fix CONFIG_DRM_USE_DYNAMIC_DEBUG regression
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced