- Linux-kselftest-mirror - lists.linaro.org

Re: [PATCH 2/8] of: Enable DTB loading on UML for KUnit tests

by David Gow

On Sat, 11 Mar 2023 at 07:34, Stephen Boyd <sboyd(a)kernel.org> wrote: > > Quoting David Gow (2023-03-10 00:09:48) > > On Fri, 10 Mar 2023 at 07:19, Stephen Boyd <sboyd(a)kernel.org> wrote: > > > > > > > > > Hmm. I think you're suggesting that the unit test data be loaded > > > whenever CONFIG_OF=y and CONFIG_KUNIT=y. Then tests can check for > > > CONFIG_OF and skip if it isn't enabled? > > > > > > > More of the opposite: that we should have some way of supporting tests > > which might want to use a DTB other than the built-in one. Mostly for > > non-UML situations where an actual devicetree is needed to even boot > > far enough to get test output (so we wouldn't be able to override it > > with a compiled-in test one). > > Ok, got it. > > > > > I think moving to overlays probably will render this idea obsolete: > > but the thought was to give test code a way to check for the required > > devicetree nodes at runtime, and skip the test if they weren't found. > > That way, the failure mode for trying to boot this on something which > > required another device tree for, e.g., serial, would be "these tests > > are skipped because the wrong device tree is loaded", not "I get no > > output because serial isn't working". > > > > Again, though, it's only really needed for non-UML, and just loading > > overlays as needed should be much more sensible anyway. > > I still have one niggle here. Loading overlays requires > CONFIG_OF_OVERLAY, and the overlay loading API returns -ENOTSUPP when > CONFIG_OF_OVERLAY=n. For now I'm checking for the config being enabled > in each test, but I'm thinking it may be better to simply call > kunit_skip() from the overlay loading function if the config is > disabled. This way tests can simply call the overlay loading function > and we'll halt the test immediately if the config isn't enabled. > That sounds sensible, though there is a potential pitfall. If kunit_skip() is called directly from overlay code, might introduce a dependency on kunit.ko from the DT overlay, which we might not want. The solution there is either to have a kunit wrapper function (so the call is already in kunit.ko), or to have a hook to skip the current test (which probably makes sense to do anyway, but I think the wrapper is the better option). > > > > > > > > > > That being said, I do think that there's probably some sense in > > > > supporting the compiled-in DTB as well (it's definitely simpler than > > > > patching kunit.py to always pass the extra command-line option in, for > > > > example). > > > > But maybe it'd be nice to have the command-line option override the > > > > built-in one if present. > > > > > > Got it. I need to test loading another DTB on the commandline still, but > > > I think this won't be a problem. We'll load the unittest-data DTB even > > > with KUnit on UML, so assuming that works on UML right now it should be > > > unchanged by this series once I resend. > > > > Again, moving to overlays should render this mostly obsolete, no? Or > > am I misunderstanding how the overlay stuff will work? > > Right, overlays make it largely a moot issue. The way the OF unit tests > work today is by grafting a DTB onto the live tree. I'm reusing that > logic to graft a container node target for kunit tests to add their > overlays too. It will be clearer once I post v2. > > > > > One possible future advantage of being able to test with custom DTs at > > boot time would be for fuzzing (provide random DT properties, see what > > happens in the test). We've got some vague plans to support a way of > > passing custom data to tests to support this kind of case (though, if > > we're using overlays, maybe the test could just patch those if we > > wanted to do that). > > Ah ok. I can see someone making a fuzzer that modifies devicetree > properties randomly, e.g. using different strings for clock-names. > > This reminds me of another issue I ran into. I wanted to test adding the > same platform device to the platform bus twice to confirm that the > second device can't be added. That prints a warning, which makes > kunit.py think that the test has failed because it printed a warning. Is > there some way to avoid that? I want something like > > KUNIT_EXPECT_WARNING(test, <call some function>) > > so I can test error cases. Hmm... I'd've thought that shouldn't be a problem: kunit.py should ignore most messages during a test, unless it can't find a valid result line. What does the raw KTAP output look like? (You can get it from kunit.py by passing the --raw_output option). That being said, a KUNIT_EXPECT_LOG_MESSAGE() or similar is something we've wanted for a while. I think that the KASAN folks have been working on something similar using console tracepoints: https://lore.kernel.org/all/ebf96ea600050f00ed567e80505ae8f242633640.166611… Cheers, -- David

2 years, 3 months

2
6
0 0

[PATCH] kunit: Use gfp in kunit_alloc_resource() kernel-doc

by Stephen Boyd

Copy/pasting the code from the kernel-doc here doesn't compile because kunit_alloc_resource() takes a gfp flags argument. Pass the gfp argument from the caller to complete the example. Signed-off-by: Stephen Boyd <sboyd(a)kernel.org> --- include/kunit/resource.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/kunit/resource.h b/include/kunit/resource.h index cf6fb8f2ac1b..c0d88b318e90 100644 --- a/include/kunit/resource.h +++ b/include/kunit/resource.h @@ -72,7 +72,7 @@ typedef void (*kunit_resource_free_t)(struct kunit_resource *); * params.gfp = gfp; * * return kunit_alloc_resource(test, kunit_kmalloc_init, - * kunit_kmalloc_free, &params); + * kunit_kmalloc_free, gfp, &params); * } * * Resources can also be named, with lookup/removal done on a name base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6 -- https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git

2 years, 3 months

2
1
0 0

[PATCH rcu 0/8] RCU torture test and tool updates for v6.4

by Boqun Feng

Hi, This series contains changes for rcutorture and rcu-related tool, which are targeted for v6.4. This is my first time helping prepare PRs, so please take a careful look and yell at me if there is something wrong. Thanks a lot! You will also be able to find the series at: https://github/fbq/linux rcu/rcutorture.2023.03.11a top commit is: 015d88635382 List of changes: Bhaskar Chowdhury (1): tools: rcu: Add usage function and check for argument Paul E. McKenney (5): rcutorture: Add test_nmis module parameter rcutorture: Set CONFIG_BOOTPARAM_HOTPLUG_CPU0 to offline CPU 0 rcutorture: Make scenario TREE04 enable lazy call_rcu() torture: Permit kvm-again.sh --duration to default to previous run torture: Enable clocksource watchdog with "tsc=watchdog" Yue Hu (1): rcutorture: Eliminate variable n_rcu_torture_boost_rterror Zqiang (1): rcutorture: Create nocb kthreads only when testing rcu in CONFIG_RCU_NOCB_CPU=y kernels kernel/rcu/rcutorture.c | 49 +++++++++++++++---- tools/rcu/extract-stall.sh | 26 +++++++--- .../selftests/rcutorture/bin/kvm-again.sh | 2 +- .../selftests/rcutorture/bin/torture.sh | 6 +-- .../selftests/rcutorture/configs/rcu/TREE01 | 1 + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + 6 files changed, 65 insertions(+), 20 deletions(-) mode change 100644 => 100755 tools/rcu/extract-stall.sh -- 2.39.2

2 years, 3 months

1
8
0 0

[GIT PULL] Kselftest fixes update for Linux 6.3-rc3

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 6.3-rc3. This kselftest fixes update for Linux 6.3-rc3 consists of a fix to amd-pstate test Makefile and a fix to LLVM build for i386 and x86_64 in kselftest common lib.mk. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-fixes-6.3-rc3 for you to fetch changes up to 624c60f326c6e5a80b008e8a5c7feffe8c27dc72: selftests: fix LLVM build for i386 and x86_64 (2023-03-10 13:41:10 -0700) ---------------------------------------------------------------- linux-kselftest-fixes-6.3-rc3 This kselftest fixes update for Linux 6.3-rc3 consists of a fix to amd-pstate test Makefile and a fix to LLVM build for i386 and x86_64 in kselftest common lib.mk. ---------------------------------------------------------------- Guillaume Tucker (2): selftests: amd-pstate: fix TEST_FILES selftests: fix LLVM build for i386 and x86_64 tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++---- tools/testing/selftests/lib.mk | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) ----------------------------------------------------------------

2 years, 3 months

2
1
0 0

[PATCH v2 09/14] torture: Enable clocksource watchdog with "tsc=watchdog"

by Joel Fernandes (Google)

From: "Paul E. McKenney" <paulmck(a)kernel.org> This commit tests the "tsc=watchdog" kernel boot parameter when running the clocksourcewd torture tests. Signed-off-by: Paul E. McKenney <paulmck(a)kernel.org> Signed-off-by: Joel Fernandes (Google) <joel(a)joelfernandes.org> --- tools/testing/selftests/rcutorture/bin/torture.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/rcutorture/bin/torture.sh b/tools/testing/selftests/rcutorture/bin/torture.sh index 130d0de4c3bb..5a2ae2264403 100755 --- a/tools/testing/selftests/rcutorture/bin/torture.sh +++ b/tools/testing/selftests/rcutorture/bin/torture.sh @@ -497,16 +497,16 @@ fi if test "$do_clocksourcewd" = "yes" then - torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000" + torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000 tsc=watchdog" torture_set "clocksourcewd-1" tools/testing/selftests/rcutorture/bin/kvm.sh --allcpus --duration 45s --configs TREE03 --kconfig "CONFIG_TEST_CLOCKSOURCE_WATCHDOG=y" --trust-make - torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000 clocksource.max_cswd_read_retries=1" + torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000 clocksource.max_cswd_read_retries=1 tsc=watchdog" torture_set "clocksourcewd-2" tools/testing/selftests/rcutorture/bin/kvm.sh --allcpus --duration 45s --configs TREE03 --kconfig "CONFIG_TEST_CLOCKSOURCE_WATCHDOG=y" --trust-make # In case our work is already done... if test "$do_rcutorture" != "yes" then - torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000" + torture_bootargs="rcupdate.rcu_cpu_stall_suppress_at_boot=1 torture.disable_onoff_at_boot rcupdate.rcu_task_stall_timeout=30000 tsc=watchdog" torture_set "clocksourcewd-3" tools/testing/selftests/rcutorture/bin/kvm.sh --allcpus --duration 45s --configs TREE03 --trust-make fi fi -- 2.40.0.rc1.284.g88254d51c5-goog

2 years, 3 months

1
0
0 0

BUG in dhrystone selftest on v6.3-rc1

by Tobias Klausmann

Hey, just ran the new Dhrystone test on one of my machines post-boot (using echo y > /sys/module/test_dhry/parameters/run) and: BUG: using smp_processor_id() in preemptible [00000000] code: bash/1903 caller is dhry_benchmark+0x39/0x90 CPU: 5 PID: 1903 Comm: bash Not tainted 6.3.0-rc1 #13 Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./B450 Pro4 R2.0, BIOS H4.84 04/08/2021 Call Trace: <TASK> dump_stack_lvl+0x32/0x50 check_preemption_disabled+0xe6/0x100 dhry_benchmark+0x39/0x90 dhry_run_set+0x33/0x40 param_attr_store+0x98/0x100 module_attr_store+0x18/0x30 kernfs_fop_write_iter+0x14e/0x220 vfs_write+0x29a/0x460 ksys_write+0x74/0x100 do_syscall_64+0x3a/0xc0 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f5eec252190 Code: 40 00 48 8b 15 71 9c 0d 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b7 0f 1f 00 80 3d 51 24 0e 00 00 74 17 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 58 c3 0f 1f 80 00 00 00 00 48 83 ec 28 48 89 RSP: 002b:00007ffc4b1dea68 EFLAGS: 00000202 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000002 RCX: 00007f5eec252190 RDX: 0000000000000002 RSI: 000055d3c05b4540 RDI: 0000000000000001 RBP: 000055d3c05b4540 R08: 00007f5eec32d3d0 R09: 00007f5eec32d3d0 R10: 0000000000000000 R11: 0000000000000202 R12: 0000000000000002 R13: 00007f5eec32d760 R14: 0000000000000002 R15: 00007f5eec3289e0 </TASK> CPU5: Dhrystones per Second: 34361907 (19557 DMIPS) Test completes fine (with a credible result) and the machine keeps running. If any additional info is needed, lmk. Note that I'm not subscribe to the list, so please CC me. Best, Tobias

2 years, 3 months

2
2
0 0

[PATCH] lib: dhry: Fix unstable smp_processor_id(_) usage

by Geert Uytterhoeven

When running the in-kernel Dhrystone benchmark with CONFIG_DEBUG_PREEMPT=y: BUG: using smp_processor_id() in preemptible [00000000] code: bash/938 Fix this by not using smp_processor_id() directly, but instead wrapping the whole benchmark inside a get_cpu()/put_cpu() pair. This makes sure the whole benchmark is run on the same CPU core, and the reported values are consistent. Fixes: d5528cc16893f1f6 ("lib: add Dhrystone benchmark test") Reported-by: Tobias Klausmann <klausman(a)schwarzvogel.de> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217179 Signed-off-by: Geert Uytterhoeven <geert+renesas(a)glider.be> --- lib/dhry_run.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dhry_run.c b/lib/dhry_run.c index f9d33efa6d090604..f15ac666e9d38bd2 100644 --- a/lib/dhry_run.c +++ b/lib/dhry_run.c @@ -31,6 +31,7 @@ MODULE_PARM_DESC(iterations, static void dhry_benchmark(void) { + unsigned int cpu = get_cpu(); int i, n; if (iterations > 0) { @@ -45,9 +46,10 @@ static void dhry_benchmark(void) } report: + put_cpu(); if (n >= 0) - pr_info("CPU%u: Dhrystones per Second: %d (%d DMIPS)\n", - smp_processor_id(), n, n / DHRY_VAX); + pr_info("CPU%u: Dhrystones per Second: %d (%d DMIPS)\n", cpu, + n, n / DHRY_VAX); else if (n == -EAGAIN) pr_err("Please increase the number of iterations\n"); else -- 2.34.1

2 years, 3 months

1
0
0 0

[PATCH] selftests/ftrace: Update comment and clean up

by paranlee

Update renamed function comment and clean up indent from 4 space to tab. Signed-off-by: Paran Lee <p4ranlee(a)gmail.com> --- .../testing/selftests/ftrace/test.d/functions | 202 +++++++++--------- 1 file changed, 101 insertions(+), 101 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 779f3e62ec90..d0946cccb8f0 100644 --- a/tools/testing/selftests/ftrace/test.d/functions +++ b/tools/testing/selftests/ftrace/test.d/functions @@ -1,195 +1,195 @@ clear_trace() { # reset trace output - echo > trace + echo > trace } disable_tracing() { # stop trace recording - echo 0 > tracing_on + echo 0 > tracing_on } enable_tracing() { # start trace recording - echo 1 > tracing_on + echo 1 > tracing_on } reset_tracer() { # reset the current tracer - echo nop > current_tracer + echo nop > current_tracer } reset_trigger_file() { - # remove action triggers first - grep -H ':on[^:]*(' $@ | - while read line; do - cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` + # remove action triggers first + grep -H ':on[^:]*(' $@ | + while read line; do + cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` file=`echo $line | cut -f1 -d:` echo "!$cmd" >> $file - done - grep -Hv ^# $@ | - while read line; do - cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` + done + grep -Hv ^# $@ | + while read line; do + cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` file=`echo $line | cut -f1 -d:` echo "!$cmd" > $file - done + done } reset_trigger() { # reset all current setting triggers - if [ -d events/synthetic ]; then - reset_trigger_file events/synthetic/*/trigger - fi - reset_trigger_file events/*/*/trigger + if [ -d events/synthetic ]; then + reset_trigger_file events/synthetic/*/trigger + fi + reset_trigger_file events/*/*/trigger } reset_events_filter() { # reset all current setting filters - grep -v ^none events/*/*/filter | - while read line; do + grep -v ^none events/*/*/filter | + while read line; do echo 0 > `echo $line | cut -f1 -d:` - done + done } reset_ftrace_filter() { # reset all triggers in set_ftrace_filter - if [ ! -f set_ftrace_filter ]; then - return 0 - fi - echo > set_ftrace_filter - grep -v '^#' set_ftrace_filter | while read t; do + if [ ! -f set_ftrace_filter ]; then + return 0 + fi + echo > set_ftrace_filter + grep -v '^#' set_ftrace_filter | while read t; do tr=`echo $t | cut -d: -f2` if [ "$tr" = "" ]; then - continue + continue fi if ! grep -q "$t" set_ftrace_filter; then continue; fi name=`echo $t | cut -d: -f1 | cut -d' ' -f1` if [ $tr = "enable_event" -o $tr = "disable_event" ]; then - tr=`echo $t | cut -d: -f2-4` - limit=`echo $t | cut -d: -f5` + tr=`echo $t | cut -d: -f2-4` + limit=`echo $t | cut -d: -f5` else - tr=`echo $t | cut -d: -f2` - limit=`echo $t | cut -d: -f3` + tr=`echo $t | cut -d: -f2` + limit=`echo $t | cut -d: -f3` fi if [ "$limit" != "unlimited" ]; then - tr="$tr:$limit" + tr="$tr:$limit" fi echo "!$name:$tr" > set_ftrace_filter - done + done } disable_events() { - echo 0 > events/enable + echo 0 > events/enable } clear_synthetic_events() { # reset all current synthetic events - grep -v ^# synthetic_events | - while read line; do - echo "!$line" >> synthetic_events - done + grep -v ^# synthetic_events | + while read line; do + echo "!$line" >> synthetic_events + done } clear_dynamic_events() { # reset all current dynamic events - again=1 - stop=1 - # loop mulitple times as some events require other to be removed first - while [ $again -eq 1 ]; do + again=1 + stop=1 + # loop mulitple times as some events require other to be removed first + while [ $again -eq 1 ]; do stop=$((stop+1)) # Prevent infinite loops if [ $stop -gt 10 ]; then - break; + break; fi again=2 grep -v '^#' dynamic_events| while read line; do - del=`echo $line | sed -e 's/^.$[^ ]*$.*/-\1/'` - if ! echo "$del" >> dynamic_events; then + del=`echo $line | sed -e 's/^.$[^ ]*$.*/-\1/'` + if ! echo "$del" >> dynamic_events; then again=1 - fi + fi + done done - done } initialize_ftrace() { # Reset ftrace to initial-state # As the initial state, ftrace will be set to nop tracer, # no events, no triggers, no filters, no function filters, # no probes, and tracing on. - disable_tracing - reset_tracer - reset_trigger - reset_events_filter - reset_ftrace_filter - disable_events - clear_dynamic_events - [ -f set_event_pid ] && echo > set_event_pid - [ -f set_ftrace_pid ] && echo > set_ftrace_pid - [ -f set_ftrace_notrace ] && echo > set_ftrace_notrace - [ -f set_graph_function ] && echo | tee set_graph_* - [ -f stack_trace_filter ] && echo > stack_trace_filter - [ -f kprobe_events ] && echo > kprobe_events - [ -f uprobe_events ] && echo > uprobe_events - [ -f synthetic_events ] && echo > synthetic_events - [ -f snapshot ] && echo 0 > snapshot + disable_tracing + reset_tracer + reset_trigger + reset_events_filter + reset_ftrace_filter + disable_events + clear_dynamic_events + [ -f set_event_pid ] && echo > set_event_pid + [ -f set_ftrace_pid ] && echo > set_ftrace_pid + [ -f set_ftrace_notrace ] && echo > set_ftrace_notrace + [ -f set_graph_function ] && echo | tee set_graph_* + [ -f stack_trace_filter ] && echo > stack_trace_filter + [ -f kprobe_events ] && echo > kprobe_events + [ -f uprobe_events ] && echo > uprobe_events + [ -f synthetic_events ] && echo > synthetic_events + [ -f snapshot ] && echo 0 > snapshot # Stop tracing while reading the trace file by default, to prevent # the test results while checking it and to avoid taking a long time # to check the result. - [ -f options/pause-on-trace ] && echo 1 > options/pause-on-trace + [ -f options/pause-on-trace ] && echo 1 > options/pause-on-trace - clear_trace - enable_tracing + clear_trace + enable_tracing } finish_ftrace() { - initialize_ftrace + initialize_ftrace # And recover it to default. - [ -f options/pause-on-trace ] && echo 0 > options/pause-on-trace + [ -f options/pause-on-trace ] && echo 0 > options/pause-on-trace } check_requires() { # Check required files and tracers - for i in "$@" ; do + for i in "$@" ; do p=${i%:program} - r=${i%:README} - t=${i%:tracer} + r=${i%:README} + t=${i%:tracer} if [ $p != $i ]; then - if ! which $p ; then - echo "Required program $p is not found." - exit_unresolved - fi - elif [ $t != $i ]; then - if ! grep -wq $t available_tracers ; then - echo "Required tracer $t is not configured." - exit_unsupported - fi - elif [ "$r" != "$i" ]; then - if ! grep -Fq "$r" README ; then - echo "Required feature pattern \"$r\" is not in README." - exit_unsupported - fi - elif [ ! -e $i ]; then - echo "Required feature interface $i doesn't exist." - exit_unsupported - fi - done + if ! which $p ; then + echo "Required program $p is not found." + exit_unresolved + fi + elif [ $t != $i ]; then + if ! grep -wq $t available_tracers ; then + echo "Required tracer $t is not configured." + exit_unsupported + fi + elif [ "$r" != "$i" ]; then + if ! grep -Fq "$r" README ; then + echo "Required feature pattern \"$r\" is not in README." + exit_unsupported + fi + elif [ ! -e $i ]; then + echo "Required feature interface $i doesn't exist." + exit_unsupported + fi + done } LOCALHOST=127.0.0.1 yield() { - ping $LOCALHOST -c 1 || sleep .001 || usleep 1 || sleep 1 + ping $LOCALHOST -c 1 || sleep .001 || usleep 1 || sleep 1 } # The fork function in the kernel was renamed from "_do_fork" to -# "kernel_fork". As older tests should still work with older kernels +# "kernel_clone". As older tests should still work with older kernels # as well as newer kernels, check which version of fork is used on this # kernel so that the tests can use the fork function for the running kernel. FUNCTION_FORK=`(if grep '\bkernel_clone\b' /proc/kallsyms > /dev/null; then - echo kernel_clone; else echo '_do_fork'; fi)` + echo kernel_clone; else echo '_do_fork'; fi)` # Since probe event command may include backslash, explicitly use printf "%s" # to NOT interpret it. ftrace_errlog_check() { # err-prefix command-with-error-pos-by-^ command-file - pos=$(printf "%s" "${2%^*}" | wc -c) # error position - command=$(printf "%s" "$2" | tr -d ^) - echo "Test command: $command" - echo > error_log - (! printf "%s" "$command" >> "$3" ) 2> /dev/null - grep "$1: error:" -A 3 error_log - N=$(tail -n 1 error_log | wc -c) - # " Command: " and "^\n" => 13 - test $(expr 13 + $pos) -eq $N + pos=$(printf "%s" "${2%^*}" | wc -c) # error position + command=$(printf "%s" "$2" | tr -d ^) + echo "Test command: $command" + echo > error_log + (! printf "%s" "$command" >> "$3" ) 2> /dev/null + grep "$1: error:" -A 3 error_log + N=$(tail -n 1 error_log | wc -c) + # " Command: " and "^\n" => 13 + test $(expr 13 + $pos) -eq $N } -- 2.34.1

2 years, 3 months

3
3
0 0

[PATCHv2] selftests: net: devlink_port_split.py: skip test if no suitable device available

by Po-Hsu Lin

The `devlink -j port show` command output may not contain the "flavour" key, an example from s390x LPAR with Ubuntu 22.10 (5.19.0-37-generic), iproute2-5.15.0: {"port":{"pci/0001:00:00.0/1":{"type":"eth","netdev":"ens301"}, "pci/0001:00:00.0/2":{"type":"eth","netdev":"ens301d1"}, "pci/0002:00:00.0/1":{"type":"eth","netdev":"ens317"}, "pci/0002:00:00.0/2":{"type":"eth","netdev":"ens317d1"}}} This will cause a KeyError exception. Create a validate_devlink_output() to check for this "flavour" from devlink command output to avoid this KeyError exception. Also let it handle the check for `devlink -j dev show` output in main(). Apart from this, if the test was not started because of any reason (e.g. "lanes" does not exist, max lanes is 0 or the flavour of the designated device is not "physical" and etc.) The script will still return 0 and thus causing a false-negative test result. Use a test_ran flag to determine if these tests were skipped and return KSFT_SKIP to make it more clear. V2: factor out the skip logic from main(), update commit message and skip reasons accordingly. Link: https://bugs.launchpad.net/bugs/1937133 Fixes: f3348a82e727 ("selftests: net: Add port split test") Signed-off-by: Po-Hsu Lin <po-hsu.lin(a)canonical.com> --- tools/testing/selftests/net/devlink_port_split.py | 36 +++++++++++++++++++---- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/devlink_port_split.py b/tools/testing/selftests/net/devlink_port_split.py index 2b5d6ff..749606c 100755 --- a/tools/testing/selftests/net/devlink_port_split.py +++ b/tools/testing/selftests/net/devlink_port_split.py @@ -59,6 +59,8 @@ class devlink_ports(object): assert stderr == "" ports = json.loads(stdout)['port'] + validate_devlink_output(ports, 'flavour') + for port in ports: if dev in port: if ports[port]['flavour'] == 'physical': @@ -220,6 +222,27 @@ def split_splittable_port(port, k, lanes, dev): unsplit(port.bus_info) +def validate_devlink_output(devlink_data, target_property=None): + """ + Determine if test should be skipped by checking: + 1. devlink_data contains values + 2. The target_property exist in devlink_data + """ + skip_reason = None + if any(devlink_data.values()): + if target_property: + skip_reason = "{} not found in devlink output, test skipped".format(target_property) + for key in devlink_data: + if target_property in devlink_data[key]: + skip_reason = None + else: + skip_reason = 'devlink output is empty, test skipped' + + if skip_reason: + print(skip_reason) + sys.exit(KSFT_SKIP) + + def make_parser(): parser = argparse.ArgumentParser(description='A test for port splitting.') parser.add_argument('--dev', @@ -231,6 +254,7 @@ def make_parser(): def main(cmdline=None): + test_ran = False parser = make_parser() args = parser.parse_args(cmdline) @@ -240,12 +264,9 @@ def main(cmdline=None): stdout, stderr = run_command(cmd) assert stderr == "" + validate_devlink_output(json.loads(stdout)) devs = json.loads(stdout)['dev'] - if devs: - dev = list(devs.keys())[0] - else: - print("no devlink device was found, test skipped") - sys.exit(KSFT_SKIP) + dev = list(devs.keys())[0] cmd = "devlink dev show %s" % dev stdout, stderr = run_command(cmd) @@ -277,6 +298,11 @@ def main(cmdline=None): split_splittable_port(port, lane, max_lanes, dev) lane //= 2 + test_ran = True + + if not test_ran: + print("Test not started, no suitable device for the test") + sys.exit(KSFT_SKIP) if __name__ == "__main__": -- 2.7.4

2 years, 3 months

3
11
0 0

Re: [PATCH 3/8] kunit: Add test managed platform_device/driver APIs

by Maxime Ripard

Hi Stephen, On Thu, Mar 09, 2023 at 03:31:15PM -0800, Stephen Boyd wrote: > Quoting Maxime Ripard (2023-03-03 06:35:28) > > On Fri, Mar 03, 2023 at 03:15:31PM +0800, David Gow wrote: > > > > > > DRM has a similar thing already (albeit with a root_device, which is > > > more common with KUnit tests generally): > > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/inc… > > > > > > But that's reasonably drm-specific, so it makes sense that it lives > > > with DRM stuff. platform_device is a bit more generic. > > > > I'd be very happy to get something from the core to address the same > > thing. > > > > I think the main thing we needed that isn't covered by this patch is we > > wanted the device to be bound to its driver, so with probe being called > > before calling the test (see 57a84a97bbda). > > Can you clarify? This patch makes a poor attempt at waiting for the > platform driver to bind, but in reality it may not be bound by the time > the driver register function returns. The issue was that devm will only clean up the resources if the device was bound to a driver so we were exhausting resources when running dozens of test in a sequence. The way I solved it for vc4 was to create a dumb platform driver with a waitqueue, and wait for probe to be called. I think we could make it more generic by allowing a pointer to a probe function and calling it into our own probe implementation. What do you think? Maxime

2 years, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror