dyndbg: fix dynamic-debug regression in DRM
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v8 Latest31 patches 0 repliesNew
- v731 patches 0 repliesSuperseded
- v631 patches 22 repliesSuperseded
Patches in v8 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/31 | dyndbg: factor ddebug_match_desc out from ddebug_changelib/ | +47 | 0 replies | |
| 2/31 | dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAPinclude/ | +22 | 0 replies | |
| 3/31 | docs/dyndbg: update examples \012 to \nDocumentation/ | +10 | 0 replies | |
| 4/31 | docs/dyndbg: explain flags parse 1stDocumentation/ | +13 | 0 replies | |
| 5/31 | test-dyndbg: fixup CLASSMAP usage errorlib/ | +1 | 0 replies | |
| 6/31 | dyndbg: reword "class unknown," to "class:_UNKNOWN_"lib/ | +1 | 0 replies | |
| 7/31 | dyndbg: make ddebug_class_param union members same sizeinclude/ lib/ | +2 | 0 replies | |
| 8/31 | dyndbg: drop NUM_TYPE_ARRAYinclude/ | +1 | 0 replies | |
| 9/31 | dyndbg: tweak pr_fmt to avoid expansion conflictslib/ | +1 | 0 replies | |
| 10/31 | dyndbg: reduce verbose/debug clutterlib/ | +6 | 0 replies | |
| 11/31 | dyndbg: refactor param_set_dyndbg_classes and belowlib/ | +40 | 0 replies | |
| 12/31 | dyndbg: tighten fn-sig of ddebug_apply_class_bitmaplib/ | +11 | 0 replies | |
| 13/31 | dyndbg: replace classmap list with a vectorinclude/ lib/ | +32 | 0 replies | |
| 14/31 | dyndbg: macrofy a 2-index for-loop patternlib/ | +24 | 0 replies | |
| 15/31 | dyndbg,module: make proper substructs in _ddebug_infoinclude/ include/ kernel/ +2 more | +100 | 0 replies | |
| 16/31 | dyndbg: hoist classmap-filter-by-modname up to ddebug_add_modulelib/ | +33 | 0 replies | |
| 17/31 | dyndbg: move mod_name down from struct ddebug_table to _ddebug_infoinclude/ lib/ | +27 | 0 replies | |
| 18/31 | dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and codeinclude/ lib/ lib/ | +14 | 0 replies | |
| 19/31 | selftests-dyndbg: add a dynamic_debug run_tests targetMAINTAINERS tools/ tools/ +2 more | +275 | 0 replies | |
| 20/31 | dyndbg: change __dynamic_func_call_cls* macros into expressionsinclude/ | +4 | 0 replies | |
| 21/31 | dyndbg-API: replace DECLARE_DYNDBG_CLASSMAPMAINTAINERS include/ include/ +6 more | +412 | 0 replies | |
| 22/31 | dyndbg: detect class_id reservation conflictslib/ lib/ | +18 | 0 replies | |
| 23/31 | dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-timeinclude/ lib/ | +21 | 0 replies | |
| 24/31 | dyndbg-test: change do_prints testpoint to accept a loopctlib/ | +21 | 0 replies | |
| 25/31 | dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to APIinclude/ lib/ lib/ +1 more | +106 | 0 replies | |
| 26/31 | dyndbg: treat comma as a token separatorDocumentation/ lib/ tools/ | +39 | 0 replies | |
| 27/31 | dyndbg: split multi-query strings with %Documentation/ lib/ tools/ | +30 | 0 replies | |
| 28/31 | selftests-dyndbg: add test_mod_submodtools/ | +73 | 0 replies | |
| 29/31 | dyndbg: resolve "protection" of class'd pr_debuginclude/ lib/ | +110 | 0 replies | |
| 30/31 | dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset)include/ lib/ | +34 | 0 replies | |
| 31/31 | docs/dyndbg: add classmap info to howtoDocumentation/ | +123 | 0 replies |
Reviews trailers per patch
15 of 31 patches have a Reviewed-by or Acked-by.
| Patch | Louis Chauvet |
|---|---|
| 1/31 | |
| 2/31 | |
| 3/31 | R-b T-b |
| 4/31 | R-b |
| 5/31 | R-b T-b |
| 6/31 | R-b |
| 7/31 | R-b |
| 8/31 | R-b |
| 9/31 | R-b |
| 10/31 | R-b |
| 11/31 | R-b |
| 12/31 | R-b |
| 13/31 | R-b |
| 14/31 | |
| 15/31 | |
| 16/31 | |
| 17/31 | R-b |
| 18/31 | |
| 19/31 | |
| 20/31 | R-b |
| 21/31 | |
| 22/31 | |
| 23/31 | |
| 24/31 | |
| 25/31 | |
| 26/31 | |
| 27/31 | R-b |
| 28/31 | R-b |
| 29/31 | |
| 30/31 | |
| 31/31 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v8 00/31] dyndbg: fix dynamic-debug regression in DRM
commit aad0214f3026 ("dyndbg: add DECLARE_DYNDBG_CLASSMAP macro")
added dyndbg's "classmaps" feature, which brought dyndbg's 0-off-cost debug to DRM. Dyndbg wired to /sys/module/drm/parameters/debug, mapped its bits to classes named "DRM_UT_*", and effected the callsite enablements only on updates to the sys-node (and underlying >control).
Sadly, it hit a CI failure, resulting in:
commit bb2ff6c27bc9 ("drm: Disable dynamic debug as broken")
The regression was that drivers, when modprobed, did not get the drm.debug=0xff turn-on action, because that had already been done for drm.ko itself.
The core design bug is in the DECLARE_DYNDBG_CLASSMAP macro. Its use in both drm.ko (ie core) and all drivers.ko meant that they couldn't fundamentally distinguish their respective roles. They each "re-defined" the classmap separately, breaking K&R-101.
My ad-hoc test scripting helped to hide the error from me, by 1st testing various combos of boot-time module.dyndbg=... and drm.debug=... configurations, and then inadvertently relying upon those initializations.
This series addresses both failings:
It replaces DECLARE_DYNDBG_CLASSMAP with
- DYNAMIC_DEBUG_CLASSMAP_DEFINE: Used by core modules (e.g., drm.ko) to define their classmaps. Based upon DECLARE, it exports the classmap so USE can use it.
- DYNAMIC_DEBUG_CLASSMAP_USE: this lets other "subsystem" users create a linkage to the classmap defined elsewhere (ie drm.ko). These users can then find their "parent" and apply its settings.
It adds a selftest script, and a 2nd "sub-module" to recapitulate DRM's multi-module "subsystem" use-case, including the specific failure scenario.
It also adds minor parsing enhancements, allowing easier construction of multi-part debug configurations. These enhancements are used to test classmaps in particular, but are not otherwize required.
v7 added:
. WARN_ONCE when classmap isn't found for a class'd callsite, JBaron . reorder macro args to match kdoc, JBaron
. Doc formatting fixes, by Bagas
v8 adds:
. CC's for tools/testing, DRM, others
. p21: change _ddebug_class_user.base name to offset, for p30 . p30: amend commit-msg to explain untested, speculative nature
Thank you for your review(s) and/or Tested-by:s
P.S. Id also like to "tease" some follow-on work:
1. DRM adaptation patches, tested on my HW/boxes.
2. patchset to send pr_debugs to tracefs on +T flag
allows 63 "private" tracebufs, 1 "common" one (at 0) "drm.debug_2trace=0x1ff" is possible
from Lukasz Bartosik
NB: the private tracebufs allow test scripts to verify log content, not just counts of changed pr_debugs.
3. patchset to save 40% of dyndbg's memory footprint
move (modname,filename,function) to struct _ddebug_site save their values & descriptor intervals to 3 maple-trees add 3 accessors to fetch on descriptor, from trees move __dyndbg_sites __section to INIT_DATA.
NB: Despite the new accessors, cat control is just as fast.
Jim Cromie (31):
fixes, cleanups, simple stuff::
dyndbg: factor ddebug_match_desc out from ddebug_change
dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP docs/dyndbg: update examples \012 to \n docs/dyndbg: explain flags parse 1st
test-dyndbg: fixup CLASSMAP usage error
dyndbg: reword "class unknown," to "class:_UNKNOWN_"
dyndbg: make ddebug_class_param union members same size
dyndbg: drop NUM_TYPE_ARRAY
dyndbg: tweak pr_fmt to avoid expansion conflicts
dyndbg: reduce verbose/debug clutter
callchain grooming, re-structs, code simplify/dedup by macros::
dyndbg: refactor param_set_dyndbg_classes and below
dyndbg: tighten fn-sig of ddebug_apply_class_bitmap
dyndbg: replace classmap list with a vector
dyndbg: macrofy a 2-index for-loop pattern dyndbg,module: make proper substructs in _ddebug_info
dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module
dyndbg: move mod_name down from struct ddebug_table to _ddebug_info
dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code
selftests-dyndbg: add a dynamic_debug run_tests target
dyndbg: change __dynamic_func_call_cls* macros into expressions
core fix, detect api misuse errors, etc::
dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP
dyndbg: detect class_id reservation conflicts
dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time
dyndbg-test: change do_prints testpoint to accept a loopct
dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API
dyndbg: treat comma as a token separator
dyndbg: split multi-query strings with %
selftests-dyndbg: add test_mod_submod
dyndbg: resolve "protection" of class'd pr_debug
dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) docs/dyndbg: add classmap info to howto
Jim Cromie (31):
dyndbg: factor ddebug_match_desc out from ddebug_change
dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP docs/dyndbg: update examples \012 to \n
docs/dyndbg: explain flags parse 1st
test-dyndbg: fixup CLASSMAP usage error
dyndbg: reword "class unknown," to "class:_UNKNOWN_"
dyndbg: make ddebug_class_param union members same size
dyndbg: drop NUM_TYPE_ARRAY
dyndbg: tweak pr_fmt to avoid expansion conflicts
dyndbg: reduce verbose/debug clutter
dyndbg: refactor param_set_dyndbg_classes and below
dyndbg: tighten fn-sig of ddebug_apply_class_bitmap
dyndbg: replace classmap list with a vector
dyndbg: macrofy a 2-index for-loop pattern dyndbg,module: make proper substructs in _ddebug_info
dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module
dyndbg: move mod_name down from struct ddebug_table to _ddebug_info
dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code
selftests-dyndbg: add a dynamic_debug run_tests target
dyndbg: change __dynamic_func_call_cls* macros into expressions
dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP
dyndbg: detect class_id reservation conflicts
dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time
dyndbg-test: change do_prints testpoint to accept a loopct
dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API
dyndbg: treat comma as a token separator
dyndbg: split multi-query strings with %
selftests-dyndbg: add test_mod_submod
dyndbg: resolve "protection" of class'd pr_debug
dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) docs/dyndbg: add classmap info to howto
.../admin-guide/dynamic-debug-howto.rst | 187 ++++- MAINTAINERS | 3 +- include/asm-generic/vmlinux.lds.h | 5 +- include/linux/dynamic_debug.h | 302 +++++-- kernel/module/main.c | 15 +- lib/Kconfig.debug | 24 +- lib/Makefile | 5 + lib/dynamic_debug.c | 776 +++++++++++------- lib/test_dynamic_debug.c | 198 +++-- lib/test_dynamic_debug_submod.c | 21 + tools/testing/selftests/Makefile | 1 + .../testing/selftests/dynamic_debug/Makefile | 9 + tools/testing/selftests/dynamic_debug/config | 7 + .../dynamic_debug/dyndbg_selftest.sh | 373 +++++++++ 14 files changed, 1465 insertions(+), 461 deletions(-) create mode 100644 lib/test_dynamic_debug_submod.c create mode 100644 tools/testing/selftests/dynamic_debug/Makefile create mode 100644 tools/testing/selftests/dynamic_debug/config create mode 100755 tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
Signature · 1 line
2.52.0