Enable the FT_comma_terminators test block in dyndbg_selftest.sh to verify control query parsing when queries are terminated by commas.
Signed-off-by: Jim Cromie <[email protected]> --- v11: . convert modprobe dyndbg parameters in FT_test_classes and FT_classmap_inheritance to use comma separators ("class,D2_CORE,+pf;..."). Sashiko review complaint (patch 24): "Are these load-time parameters truncated during module load due to how the shell handles quotes? When bash evaluates and strips the double quotes before executing modprobe, modprobe constructs the kernel options string without adding quotes around the parameters. The kernel's parse_args() function (using next_arg() in lib/cmdline.c) splits module parameters at unquoted spaces... treats D2_CORE and +pf as separate unknown parameters." --- .../selftests/dynamic_debug/dyndbg_selftest.sh | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh index a357905e3606..133ab32aa175 100755 --- a/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh +++ b/tools/testing/selftests/dynamic_debug/dyndbg_selftest.sh @@ -340,6 +340,25 @@ function FT_basic_queries { ddcmd "file $f =_" "$f" } +# test parsing on spaces, commas. testing against builtin file kernel/params.c +function FT_comma_terminators { + v_echo "${GREEN}# COMMA_TERMINATOR_TESTS ${NC}" + if [ $LACK_DD_BUILTIN -eq 1 ]; then + echo "SKIP - test requires dynamic_debug built into kernel" + return + fi + local f='kernel/params.c' + ddcmd =_ + ddcmd "file $f +p" "$f" + + ddcmd "file,$f,=_" "$f" + ddcmd "file,$f,+mf" "$f" + # ignore empty tokens + ddcmd ",file ,, , $f, -p" "$f" + ddcmd " , file ,,, , $f, -m" "$f" + + ddcmd =_ +} # testing classmap-based query enablers and class configurations function FT_test_classes { v_echo "${GREEN}# TEST_CLASSES - classmap-based query enablers and class configs ${NC}" @@ -350,7 +369,7 @@ function FT_test_classes { # 1. Verify initial multi-query enablement state via file slice my_modprobe test_dynamic_debug \ - dyndbg="class D2_CORE,+pf;class D2_KMS,+ps;class D2_ATOMIC +pm" + dyndbg="class,D2_CORE,+pf;class,D2_KMS,+ps;class,D2_ATOMIC,+pm" verify_control_slice '\[test_dynamic_debug\]' # 2. Verify state transition and live-printing end-to-end via ddcmd_load! @@ -368,7 +387,7 @@ function FT_classmap_inheritance { # 1. Load submod directly (which auto-loads supermod with default parameters) my_modprobe test_dynamic_debug_submod \ - "dyndbg=+p;class D2_CORE +pfs;class D2_KMS +pts;class D2_ATOMIC +pmf" + "dyndbg=+p;class,D2_CORE,+pfs;class,D2_KMS,+pts;class,D2_ATOMIC,+pmf" verify_control_slice 'test_dynamic_debug' # 2. Runtime parameter changes to supermod propagate to submod descriptors @@ -447,6 +466,7 @@ builtin_tests=( FT_grammar_ok FT_grammar_errs FT_basic_queries + FT_comma_terminators ) # Modular Feature Tests (Require CONFIG_MODULES=y and test_dynamic_debug*.ko available) @@ -537,6 +557,11 @@ function GOLDEN_RECORDS { #K= 02e4fd94602e108cb89bfc70d47a5dad FT_basic_queries.5 #K= f03a7ca7316e8db4c0e16523dc41e75d FT_basic_queries.6 #K= c518a50ba30ba8099d0dc874a27ecf16 FT_basic_queries.7 +#K= c8bbbac639f244ed9088208ebb7d83a6 FT_comma_terminators.1 +#K= bed6350f058f600910837dae83a12f56 FT_comma_terminators.2 +#K= 6e8599556a312200fb6d484565b6c52f FT_comma_terminators.3 +#K= 68b329da9893e34099c7d8ad5cb9c940 FT_comma_terminators.4 +#K= adc1ef04304c861c87fe294a8ba4e402 FT_comma_terminators.5 #K= 91838b4012c50a1dc1d9e210ba8d68f8 FT_test_classes.1 #K= a15ec4843acd721fbdfddc0b512c8032 FT_test_classes.2 #K= 2cee6842c9cdee5cb3bf50b2e3914813 FT_test_classes.3 -- 2.55.0
