From: Jim Cromie <jim.cromie@gmail.com>
To: jbaron@akamai.com, gregkh@linuxfoundation.org,
ukaszb@chromium.org, louis.chauvet@bootlin.com,
linux-kernel@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, daniel.vetter@ffwll.ch,
tvrtko.ursulin@linux.intel.com, jani.nikula@intel.com,
ville.syrjala@linux.intel.com, Jim Cromie <jim.cromie@gmail.com>
Subject: [PATCH v3 25/54] selftests-dyndbg: add test_mod_submod
Date: Wed, 2 Apr 2025 11:41:27 -0600 [thread overview]
Message-ID: <20250402174156.1246171-26-jim.cromie@gmail.com> (raw)
In-Reply-To: <20250402174156.1246171-1-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.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
---
r3 - skip test if LACK_TMOD
older
drop -v used in test_mod_submod(). V=1 does it for whole test
ifrmmod at test end (Lukasz)
test-mod-tmod
---
.../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.49.0
next prev parent reply other threads:[~2025-04-02 17:42 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-02 17:41 [PATCH v3 00/54] Fix CONFIG_DRM_USE_DYNAMIC_DEBUG=y Jim Cromie
2025-04-02 17:41 ` [PATCH v3 01/54] vmlinux.lds.h: fixup HEADERED_SECTION{,_BY} macros Jim Cromie
2025-04-15 9:59 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 02/54] docs/dyndbg: update examples \012 to \n Jim Cromie
2025-04-15 9:59 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 03/54] docs/dyndbg: explain flags parse 1st Jim Cromie
2025-04-02 17:41 ` [PATCH v3 04/54] test-dyndbg: fixup CLASSMAP usage error Jim Cromie
2025-04-02 17:41 ` [PATCH v3 05/54] dyndbg: reword "class unknown," to "class:_UNKNOWN_" Jim Cromie
2025-04-02 17:41 ` [PATCH v3 06/54] dyndbg: make ddebug_class_param union members same size Jim Cromie
2025-04-02 17:41 ` [PATCH v3 07/54] dyndbg: drop NUM_TYPE_ARRAY Jim Cromie
2025-04-02 17:41 ` [PATCH v3 08/54] dyndbg: reduce verbose/debug clutter Jim Cromie
2025-04-02 17:41 ` [PATCH v3 09/54] dyndbg: refactor param_set_dyndbg_classes and below Jim Cromie
2025-04-02 17:41 ` [PATCH v3 10/54] dyndbg: tighten fn-sig of ddebug_apply_class_bitmap Jim Cromie
2025-04-02 17:41 ` [PATCH v3 11/54] dyndbg: replace classmap list with a vector Jim Cromie
2025-04-15 9:59 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 12/54] dyndbg: macrofy a 2-index for-loop pattern Jim Cromie
2025-04-02 17:41 ` [PATCH v3 13/54] dyndbg,module: make proper substructs in _ddebug_info Jim Cromie
2025-04-15 9:59 ` [PATCH v3 13/54] dyndbg, module: " Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 14/54] dyndbg: hoist classmap-filter-by-modname up to ddebug_add_module Jim Cromie
2025-04-15 10:00 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 15/54] dyndbg: ddebug_table.mod_name down to _ddebug_info Jim Cromie
2025-04-02 17:41 ` [PATCH v3 16/54] dyndbg-API: remove DD_CLASS_TYPE_(DISJOINT|LEVEL)_NAMES and code Jim Cromie
2025-04-15 10:00 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 17/54] dyndbg-API: replace DECLARE_DYNDBG_CLASSMAP Jim Cromie
2025-04-15 10:01 ` Louis Chauvet
2025-04-15 19:38 ` jim.cromie
2025-04-02 17:41 ` [PATCH v3 18/54] selftests-dyndbg: add tools/testing/selftests/dynamic_debug/* Jim Cromie
2025-04-15 10:02 ` Louis Chauvet
2025-04-15 19:46 ` jim.cromie
2025-04-02 17:41 ` [PATCH v3 19/54] dyndbg: detect class_id reservation conflicts Jim Cromie
2025-04-15 10:03 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 20/54] dyndbg: check DYNAMIC_DEBUG_CLASSMAP_DEFINE args at compile-time Jim Cromie
2025-04-15 10:04 ` Louis Chauvet
2025-04-15 19:54 ` jim.cromie
2025-04-16 6:54 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 21/54] dyndbg-test: change do_prints testpoint to accept a loopct Jim Cromie
2025-04-15 10:04 ` Louis Chauvet
2025-04-15 20:15 ` jim.cromie
2025-04-02 17:41 ` [PATCH v3 22/54] dyndbg-API: promote DYNAMIC_DEBUG_CLASSMAP_PARAM to API Jim Cromie
2025-04-15 10:06 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 23/54] dyndbg: treat comma as a token separator Jim Cromie
2025-04-15 10:04 ` Louis Chauvet
2025-04-15 20:17 ` jim.cromie
2025-04-02 17:41 ` [PATCH v3 24/54] dyndbg: split multi-query strings with % Jim Cromie
2025-04-02 17:41 ` Jim Cromie [this message]
2025-04-02 17:41 ` [PATCH v3 26/54] dyndbg: change __dynamic_func_call_cls* macros into expressions Jim Cromie
2025-04-15 10:06 ` Louis Chauvet
2025-04-15 22:49 ` jim.cromie
2025-04-02 17:41 ` [PATCH v3 27/54] dyndbg: drop "protection" of class'd pr_debugs from legacy queries Jim Cromie
2025-04-15 10:06 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 28/54] dyndbg: restore classmap protection when theres a controlling_param Jim Cromie
2025-06-20 14:41 ` Sean Paul
2025-04-02 17:41 ` [PATCH v3 29/54] docs/dyndbg: add classmap info to howto Jim Cromie
2025-04-15 10:06 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 30/54] drm: use correct ccflags-y spelling Jim Cromie
2025-04-02 17:41 ` [PATCH v3 31/54] drm-dyndbg: adapt drm core to use dyndbg classmaps-v2 Jim Cromie
2025-04-02 17:41 ` [PATCH v3 32/54] drm-dyndbg: adapt DRM to invoke DYNAMIC_DEBUG_CLASSMAP_PARAM Jim Cromie
2025-04-02 17:41 ` [PATCH v3 33/54] drm-print: fix config-dependent unused variable Jim Cromie
2025-04-02 17:41 ` [PATCH v3 34/54] drm-dyndbg: DRM_CLASSMAP_USE in amdgpu driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 35/54] drm-dyndbg: DRM_CLASSMAP_USE in i915 driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 36/54] drm-dyndbg: DRM_CLASSMAP_USE in drm_crtc_helper Jim Cromie
2025-04-02 17:41 ` [PATCH v3 37/54] drm-dyndbg: DRM_CLASSMAP_USE in drm_dp_helper Jim Cromie
2025-04-02 17:41 ` [PATCH v3 38/54] drm-dyndbg: DRM_CLASSMAP_USE in nouveau Jim Cromie
2025-04-02 17:41 ` [PATCH v3 39/54] drm-dyndbg: add DRM_CLASSMAP_USE to Xe driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 40/54] drm-dyndbg: add DRM_CLASSMAP_USE to virtio_gpu Jim Cromie
2025-04-02 17:41 ` [PATCH v3 41/54] drm-dyndbg: add DRM_CLASSMAP_USE to simpledrm Jim Cromie
2025-04-02 17:41 ` [PATCH v3 42/54] drm-dyndbg: add DRM_CLASSMAP_USE to bochs Jim Cromie
2025-04-02 17:41 ` [PATCH v3 43/54] drm-dyndbg: add DRM_CLASSMAP_USE to etnaviv Jim Cromie
2025-04-02 17:41 ` [PATCH v3 44/54] drm-dyndbg: add DRM_CLASSMAP_USE to gma500 driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 45/54] drm-dyndbg: add DRM_CLASSMAP_USE to radeon Jim Cromie
2025-04-02 17:41 ` [PATCH v3 46/54] drm-dyndbg: add DRM_CLASSMAP_USE to vmwgfx driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 47/54] drm-dyndbg: add DRM_CLASSMAP_USE to vkms driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 48/54] drm-dyndbg: add DRM_CLASSMAP_USE to udl driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 49/54] drm-dyndbg: add DRM_CLASSMAP_USE to mgag200 driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 50/54] drm-dyndbg: add DRM_CLASSMAP_USE to the gud driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 51/54] drm-dyndbg: add DRM_CLASSMAP_USE to the qxl driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 52/54] drm-dyndbg: add DRM_CLASSMAP_USE to the drm_gem_shmem_helper driver Jim Cromie
2025-04-02 17:41 ` [PATCH v3 53/54] drm: restore CONFIG_DRM_USE_DYNAMIC_DEBUG un-BROKEN Jim Cromie
2025-04-15 10:00 ` Louis Chauvet
2025-04-02 17:41 ` [PATCH v3 54/54] drm: RFC - make drm_dyndbg_user.o for drm-*_helpers, drivers 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=20250402174156.1246171-26-jim.cromie@gmail.com \
--to=jim.cromie@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=jbaron@akamai.com \
--cc=linux-kernel@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
--cc=tvrtko.ursulin@linux.intel.com \
--cc=ukaszb@chromium.org \
--cc=ville.syrjala@linux.intel.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