dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jim Cromie <jim.cromie@gmail.com>
To: dri-devel@lists.freedesktop.org, intel-gfx-trybot@lists.freedesktop.org
Cc: Jim Cromie <jim.cromie@gmail.com>,
	Louis Chauvet <louis.chauvet@bootlin.com>
Subject: [PATCH 29/61] selftests-dyndbg: add test_mod_submod
Date: Wed, 11 Feb 2026 17:13:24 -0700	[thread overview]
Message-ID: <20260212001359.97296-30-jim.cromie@gmail.com> (raw)
In-Reply-To: <20260212001359.97296-29-jim.cromie@gmail.com>

This new test-fn runs 3 module/submodule modprobe scenarios, variously
using both the generic dyndbg=<queries> modprobe arg, and the
test-module's classmap-params to manipulate the test-mod*'s pr_debugs.
In all cases, the current flag-settings are counted and tested vs
expectations.

The 3rd scenario recapitulates the DRM_USE_DYNAMIC_DEBUG=y failure.

1. 2 modprobes (super then sub), with separate dyndbg=class-settings
   check module specific flag settings

2. modprobe submod, supermod is auto-loaded
   set supermod class-params
   check expected enablements in super & submod

3. modprobe super, with param=setting (like drm.debug=0x1ef)
   modprobe submod
   validate submod's class'd pr_debugs get properly enabled

The test uses multi-queries, with both commas and percents (to avoid
spaces and quoting).  This is the main reason the test wasn't earlier
in the patchset, closer to the classmap patches its validating.

With some tedium, the tests could be refactored to split out early
tests which avoid multi-cmds, and test only the class-params.

Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
---
 .../dynamic_debug/dyndbg_selftest.sh          | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)

diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
index 513f6cb1db1d..09937dca3056 100755
--- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
+++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh
@@ -279,10 +279,83 @@ function test_percent_splitting {
     ifrmmod test_dynamic_debug
 }
 
+function test_mod_submod {
+    echo -e "${GREEN}# TEST_MOD_SUBMOD ${NC}"
+    if [ $LACK_TMOD -eq 1 ]; then
+	echo "SKIP - test requires test-dynamic-debug.ko"
+	return
+    fi
+    ifrmmod test_dynamic_debug_submod
+    ifrmmod test_dynamic_debug
+    ddcmd =_
+
+    # modprobe with class enablements
+    modprobe test_dynamic_debug \
+	dyndbg=class,D2_CORE,+pf%class,D2_KMS,+pt%class,D2_ATOMIC,+pm
+
+    check_match_ct '\[test_dynamic_debug\]' 23 -r
+    check_match_ct =pf 1
+    check_match_ct =pt 1
+    check_match_ct =pm 1
+
+    modprobe test_dynamic_debug_submod
+    check_match_ct test_dynamic_debug_submod 23 -r
+    check_match_ct '\[test_dynamic_debug\]' 23 -r
+    check_match_ct test_dynamic_debug 46 -r
+
+    # no enablements propagate here
+    check_match_ct =pf 1
+    check_match_ct =pt 1
+    check_match_ct =pm 1
+
+    # change classes again, this time submod too
+    ddcmd class,D2_CORE,+mf%class,D2_KMS,+lt%class,D2_ATOMIC,+ml "# add some prefixes"
+    check_match_ct =pmf 1
+    check_match_ct =plt 1
+    check_match_ct =pml 1
+    #  submod changed too
+    check_match_ct =mf 1
+    check_match_ct =lt 1
+    check_match_ct =ml 1
+
+    # now work the classmap-params
+    # fresh start, to clear all above flags (test-fn limits)
+    ifrmmod test_dynamic_debug_submod
+    ifrmmod test_dynamic_debug
+    modprobe test_dynamic_debug_submod # get supermod too
+
+    echo 1 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits
+    echo 4 > /sys/module/test_dynamic_debug/parameters/p_level_num
+    # 2 mods * ( V1-3 + D2_CORE )
+    check_match_ct =p 8
+    echo 3 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits
+    echo 0 > /sys/module/test_dynamic_debug/parameters/p_level_num
+    # 2 mods * ( D2_CORE, D2_DRIVER )
+    check_match_ct =p 4
+    echo 0x16 > /sys/module/test_dynamic_debug/parameters/p_disjoint_bits
+    echo 0 > /sys/module/test_dynamic_debug/parameters/p_level_num
+    # 2 mods * ( D2_DRIVER, D2_KMS, D2_ATOMIC )
+    check_match_ct =p 6
+
+    # recap DRM_USE_DYNAMIC_DEBUG regression
+    ifrmmod test_dynamic_debug_submod
+    ifrmmod test_dynamic_debug
+    # set super-mod params
+    modprobe test_dynamic_debug p_disjoint_bits=0x16 p_level_num=5
+    check_match_ct =p 7
+    modprobe test_dynamic_debug_submod
+    # see them picked up by submod
+    check_match_ct =p 14
+    ifrmmod test_dynamic_debug_submod
+    ifrmmod test_dynamic_debug
+}
+
 tests_list=(
     basic_tests
+    # these require test_dynamic_debug*.ko
     comma_terminator_tests
     test_percent_splitting
+    test_mod_submod
 )
 
 # Run tests
-- 
2.53.0


  reply	other threads:[~2026-02-12  0:14 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-12  0:12 [PATCH v10 00/61] drm/dyndbg: Fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y MIME-Version: 1.0 Jim Cromie
2026-02-12  0:12 ` [PATCH 01/61] dyndbg: fix NULL ptr on i386 due to section alignment Jim Cromie
2026-02-12  0:12   ` [PATCH 02/61] dyndbg: factor ddebug_match_desc out from ddebug_change Jim Cromie
2026-02-12  0:12     ` [PATCH 03/61] dyndbg: add stub macro for DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-02-12  0:12       ` [PATCH 04/61] docs/dyndbg: update examples \012 to \n Jim Cromie
2026-02-12  0:13         ` [PATCH 05/61] docs/dyndbg: explain flags parse 1st Jim Cromie
2026-02-12  0:13           ` [PATCH 06/61] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2026-02-12  0:13             ` [PATCH 07/61] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2026-02-12  0:13               ` [PATCH 08/61] dyndbg: make ddebug_class_param union members same size Jim Cromie
2026-02-12  0:13                 ` [PATCH 09/61] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2026-02-12  0:13                   ` [PATCH 10/61] dyndbg: tweak pr_fmt to avoid expansion conflicts Jim Cromie
2026-02-12  0:13                     ` [PATCH 11/61] dyndbg: reduce verbose/debug clutter Jim Cromie
2026-02-12  0:13                       ` [PATCH 12/61] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2026-02-12  0:13                         ` [PATCH 13/61] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2026-02-12  0:13                           ` [PATCH 14/61] dyndbg: replace classmap list with a vector Jim Cromie
2026-02-12  0:13                             ` [PATCH 15/61] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2026-02-12  0:13                               ` [PATCH 16/61] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2026-02-12  0:13                                 ` [PATCH 17/61] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2026-02-12  0:13                                   ` [PATCH 18/61] dyndbg: move mod_name down from struct ddebug_table to _ddebug_info Jim Cromie
2026-02-12  0:13                                     ` [PATCH 19/61] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2026-02-12  0:13                                       ` [PATCH 20/61] selftests-dyndbg: add a dynamic_debug run_tests target Jim Cromie
2026-02-12  0:13                                         ` [PATCH 21/61] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2026-02-12  0:13                                           ` [PATCH 22/61] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2026-02-12  0:13                                             ` [PATCH 23/61] dyndbg: detect class_id reservation conflicts Jim Cromie
2026-02-12  0:13                                               ` [PATCH 24/61] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2026-02-12  0:13                                                 ` [PATCH 25/61] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2026-02-12  0:13                                                   ` [PATCH 26/61] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2026-02-12  0:13                                                     ` [PATCH 27/61] dyndbg: treat comma as a token separator Jim Cromie
2026-02-12  0:13                                                       ` [PATCH 28/61] dyndbg: split multi-query strings with % Jim Cromie
2026-02-12  0:13                                                         ` Jim Cromie [this message]
2026-02-12  0:13                                                           ` [PATCH 30/61] dyndbg: resolve "protection" of class'd pr_debug Jim Cromie
2026-02-12  0:13                                                             ` [PATCH 31/61] dyndbg: add DYNAMIC_DEBUG_CLASSMAP_USE_(dd_class_name, offset) Jim Cromie
2026-02-12  0:13                                                               ` [PATCH 32/61] docs/dyndbg: add classmap info to howto Jim Cromie
2026-02-12  0:13                                                                 ` [PATCH 33/61] drm: use correct ccflags-y spelling Jim Cromie
2026-02-12  0:13                                                                   ` [PATCH 34/61] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Jim Cromie
2026-02-12  0:13                                                                     ` [PATCH 35/61] drm-dyndbg: adapt DRM to invoke DYNAMIC_DEBUG_CLASSMAP_PARAM Jim Cromie
2026-02-12  0:13                                                                       ` [PATCH 36/61] drm-print: modernize an archaic comment Jim Cromie
2026-02-12  0:13                                                                         ` [PATCH 37/61] drm-print: fix config-dependent unused variable Jim Cromie
2026-02-12  0:13                                                                           ` [PATCH 38/61] drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver Jim Cromie
2026-02-12  0:13                                                                             ` [PATCH 39/61] drm-dyndbg: DRM_CLASSMAP_USE in i915 driver Jim Cromie
2026-02-12  0:13                                                                               ` [PATCH 40/61] drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper Jim Cromie
2026-02-12  0:13                                                                                 ` [PATCH 41/61] drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper Jim Cromie
2026-02-12  0:13                                                                                   ` [PATCH 42/61] drm-dyndbg: DRM_CLASSMAP_USE in nouveau Jim Cromie
2026-02-12  0:13                                                                                     ` [PATCH 43/61] drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver Jim Cromie
2026-02-12  0:13                                                                                       ` [PATCH 44/61] drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu Jim Cromie
2026-02-12  0:13                                                                                         ` [PATCH 45/61] drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm Jim Cromie
2026-02-12  0:13                                                                                           ` [PATCH 46/61] drm-dyndbg: add DRM_CLASSMAP_USE to bochs Jim Cromie
2026-02-12  0:13                                                                                             ` [PATCH 47/61] drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv Jim Cromie
2026-02-12  0:13                                                                                               ` [PATCH 48/61] drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver Jim Cromie
2026-02-12  0:13                                                                                                 ` [PATCH 49/61] drm-dyndbg: add DRM_CLASSMAP_USE to radeon Jim Cromie
2026-02-12  0:13                                                                                                   ` [PATCH 50/61] drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver Jim Cromie
2026-02-12  0:13                                                                                                     ` [PATCH 51/61] drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver Jim Cromie
2026-02-12  0:13                                                                                                       ` [PATCH 52/61] drm-dyndbg: add DRM_CLASSMAP_USE to udl driver Jim Cromie
2026-02-12  0:13                                                                                                         ` [PATCH 53/61] drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver Jim Cromie
2026-02-12  0:13                                                                                                           ` [PATCH 54/61] drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver Jim Cromie
2026-02-12  0:13                                                                                                             ` [PATCH 55/61] drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver Jim Cromie
2026-02-12  0:13                                                                                                               ` [PATCH 56/61] drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver Jim Cromie
2026-02-12  0:13                                                                                                                 ` [PATCH 57/61] accel: add -DDYNAMIC_DEBUG_MODULE to subdir-ccflags Jim Cromie
2026-02-12  0:13                                                                                                                   ` [PATCH 57/59] accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap Jim Cromie
2026-02-12  0:13                                                                                                                     ` [PATCH 58/59] accel: add -DDYNAMIC_DEBUG_MODULE to subdir-cflags - RFC Jim Cromie
2026-02-12  0:13                                                                                                                       ` [PATCH 58/61] accel/ivpu: implement IVPU_DBG_* as a dyndbg classmap Jim Cromie
2026-02-12  0:13                                                                                                                         ` [PATCH 59/61] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Jim Cromie
2026-02-12  0:13                                                                                                                           ` [PATCH 60/61] accel/ethosu: enable drm.debug control Jim Cromie
2026-02-12  0:13                                                                                                                             ` [PATCH 61/61] accel/rocket: " Jim Cromie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260212001359.97296-30-jim.cromie@gmail.com \
    --to=jim.cromie@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx-trybot@lists.freedesktop.org \
    --cc=louis.chauvet@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox