April 2019 - Linux-kselftest-mirror

next-20190410 kselftest results

by ci_notify＠linaro.org

Summary ------------------------------------------------------------------------ git repo: not informed git branch: not informed git commit: not informed git describe: not informed Test details: https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20190410 Regressions (compared to build next-20190409) ------------------------------------------------------------------------ No regressions Fixes (compared to build next-20190409) ------------------------------------------------------------------------ No fixes In total: ------------------------------------------------------------------------ Ran 0 total tests in the following environments and test suites. pass 0 fail 0 xfail 0 skip 0 Environments -------------- - dragonboard-410c - arm64 - hi6220-hikey - arm64 - i386 - juno-r2 - arm64 - x15 - arm - x86_64 Test Suites ----------- Failures ------------------------------------------------------------------------ dragonboard-410c: x15: i386: x86: juno-r2: hi6220-hikey: Skips ------------------------------------------------------------------------ No skips -- Linaro LKFT https://lkft.linaro.org

5 years

1
0
0 0

[PATCH] selftests/lib.mk: Move test output to diagnostic lines

by Kees Cook

This changes the selftest output is several ways: - total test count is reported at start. - each test's result is on a single line with "# SKIP" as needed per spec. - each test's output is prefixed with "# " as a "diagnostic line". This creates a bit of a kernel-specific TAP dialect where the diagnostics precede the results. The TAP spec isn't entirely clear about this, though, so I think it's the correct solution so as to keep interactive runs making sense. If the output _followed_ the result line in the spec-suggested YAML form, each test would dump all of its output at once instead of as it went, making debugging harder. This does, however, solve the recursive TAP output problem, as sub-tests will simply be prefixed by "# ". Parsing sub-tests becomes a simple problem of just removing the first two characters of a given top-level test's diagnostic output, and parsing the results. Note that the shell construct needed to both get an exit code from the first command in a pipe and still filter the pipe (to add the "# " prefix) uses a POSIX solution rather than the bash "pipefail" option which is not supported by dash. Example: $ tools/testing/selftests $ make --silent -C x86 run_tests TAP version 13 1..15 selftests: x86 # selftests: x86: single_step_syscall_64 # [RUN] Set TF and check nop # [OK] Survived with TF set and 9 traps # [RUN] Set TF and check syscall-less opportunistic sysret # [OK] Survived with TF set and 12 traps # [RUN] Set TF and check a fast syscall # [OK] Survived with TF set and 22 traps # [RUN] Fast syscall with TF cleared # [OK] Nothing unexpected happened ok 1 selftests: x86: single_step_syscall_64 # selftests: x86: sysret_ss_attrs_64 # [RUN] Syscalls followed by SS validation # [OK] We survived ok 2 selftests: x86: sysret_ss_attrs_64 # selftests: x86: syscall_nt_64 # [RUN] Set NT and issue a syscall # [OK] The syscall worked and flags are still set # [RUN] Set NT|TF and issue a syscall # [OK] The syscall worked and flags are still set ok 3 selftests: x86: syscall_nt_64 ...[skipping example output]... ok 15 selftests: x86: sysret_rip_64 $ make --silent -C x86 run_tests | tappy ............F.. ====================================================================== FAIL: <file=stream> selftests: x86: mov_ss_trap_64 ---------------------------------------------------------------------- ---------------------------------------------------------------------- Ran 15 tests in 0.000s FAILED (failures=1) Signed-off-by: Kees Cook <keescook(a)chromium.org> --- No longer RFC! :) --- tools/testing/selftests/lib.mk | 59 ++++++++++++++++++------------- tools/testing/selftests/prefix.pl | 23 ++++++++++++ 2 files changed, 57 insertions(+), 25 deletions(-) create mode 100755 tools/testing/selftests/prefix.pl diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 8b0f16409ed7..d3267c08a7b1 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -5,6 +5,8 @@ CC := $(CROSS_COMPILE)gcc ifeq (0,$(MAKELEVEL)) OUTPUT := $(shell pwd) endif +testname = $(notdir $(shell pwd)) +selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST)))) # The following are built by lib.mk common compile rules. # TEST_CUSTOM_PROGS should be used by tests that require @@ -32,38 +34,45 @@ endif .ONESHELL: define RUN_TEST_PRINT_RESULT - TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST"; \ - echo $$TEST_HDR_MSG; \ - echo "========================================"; \ + TEST_HDR_MSG="selftests: $(testname): $$BASENAME_TEST"; \ if [ ! -x $$TEST ]; then \ - echo "$$TEST_HDR_MSG: Warning: file $$BASENAME_TEST is not executable, correct this.";\ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - else \ - cd `dirname $$TEST` > /dev/null; \ - if [ "X$(summary)" != "X" ]; then \ - (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \ - echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \ - (if [ $$? -eq $$skip ]; then \ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \ - else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - fi;) \ - else \ - (./$$BASENAME_TEST && \ - echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \ - (if [ $$? -eq $$skip ]; then \ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \ - else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - fi;) \ - fi; \ - cd - > /dev/null; \ + if [ "X$(summary)" = "X" ]; then \ + echo "# warning: 'file $$TEST is not executable, correct this.'";\ + fi; \ + echo "not ok $$test_num $$TEST_HDR_MSG"; \ + else \ + cd `dirname $$TEST` > /dev/null; \ + if [ "X$(summary)" != "X" ]; then \ + (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 &&\ + echo "ok $$test_num $$TEST_HDR_MSG") || \ + (if [ $$? -eq $$skip ]; then \ + echo "not ok $$test_num $$TEST_HDR_MSG # SKIP"; \ + else \ + echo "not ok $$test_num $$TEST_HDR_MSG";\ + fi); \ + else \ + echo "# $$TEST_HDR_MSG"; \ + (((((stdbuf -i0 -o0 -e0 ./$$BASENAME_TEST 2>&1; echo $$? >&3) | \ + $(selfdir)/prefix.pl >&4) 3>&1) | \ + (read xs; exit $$xs)) 4>&1 && \ + echo "ok $$test_num $$TEST_HDR_MSG") || \ + (if [ $$? -eq $$skip ]; then \ + echo "not ok $$test_num $$TEST_HDR_MSG # SKIP"; \ + else \ + echo "not ok $$test_num $$TEST_HDR_MSG";\ + fi); \ + fi; \ + cd - > /dev/null; \ fi; endef define RUN_TESTS @export KSFT_TAP_LEVEL=`echo 1`; \ - test_num=`echo 0`; \ - skip=`echo 4`; \ + test_num=0; \ + total=`echo "$(1)" | wc -w`; \ + skip=4; \ echo "TAP version 13"; \ + echo "1..$$total selftests: $(testname)"; \ for TEST in $(1); do \ BASENAME_TEST=`basename $$TEST`; \ test_num=`echo $$test_num+1 | bc`; \ diff --git a/tools/testing/selftests/prefix.pl b/tools/testing/selftests/prefix.pl new file mode 100755 index 000000000000..ec7e48118183 --- /dev/null +++ b/tools/testing/selftests/prefix.pl @@ -0,0 +1,23 @@ +#!/usr/bin/perl +# SPDX-License-Identifier: GPL-2.0 +# Prefix all lines with "# ", unbuffered. Command being piped in may need +# to have unbuffering forced with "stdbuf -i0 -o0 -e0 $cmd". +use strict; + +binmode STDIN; +binmode STDOUT; + +STDOUT->autoflush(1); + +my $needed = 1; +while (1) { + my $char; + my $bytes = sysread(STDIN, $char, 1); + exit 0 if ($bytes == 0); + if ($needed) { + print "# "; + $needed = 0; + } + print $char; + $needed = 1 if ($char eq "\n"); +} -- 2.17.1 -- Kees Cook

5 years

2
5
0 0

[PATCH] kselftest/lkdtm: Create selftest driving scripts for LKDTM

by Kees Cook

This adds most of the non-system-crashing selftests that exist in LKDTM. The ones that leave the system in an unstable state are marked as "SKIP" in the test run. Since output can change based on architecture and other kernel configs, all output is reported during the tests. Example output: # cd tools/testing/selftests # make --silent -C lkdtm run_tests TAP version 13 1..64 selftests: lkdtm # selftests: lkdtm: PANIC.sh # PANIC: crashes entire system [SKIP] not ok 1 selftests: lkdtm: PANIC.sh # SKIP # selftests: lkdtm: BUG.sh # [19716.955023] lkdtm: Performing direct entry BUG # [19716.956236] ------------[ cut here ]------------ # [19716.957318] kernel BUG at drivers/misc/lkdtm/bugs.c:63! ... # BUG: saw 'call trace:': ok ok 2 selftests: lkdtm: BUG.sh ... Signed-off-by: Kees Cook <keescook(a)chromium.org> --- MAINTAINERS | 1 + tools/testing/selftests/lkdtm/.gitignore | 1 + tools/testing/selftests/lkdtm/Makefile | 11 +++ tools/testing/selftests/lkdtm/config | 1 + tools/testing/selftests/lkdtm/run.sh | 86 ++++++++++++++++++++++++ tools/testing/selftests/lkdtm/tests.txt | 64 ++++++++++++++++++ 6 files changed, 164 insertions(+) create mode 100644 tools/testing/selftests/lkdtm/.gitignore create mode 100644 tools/testing/selftests/lkdtm/Makefile create mode 100644 tools/testing/selftests/lkdtm/config create mode 100755 tools/testing/selftests/lkdtm/run.sh create mode 100644 tools/testing/selftests/lkdtm/tests.txt diff --git a/MAINTAINERS b/MAINTAINERS index 3e5a5d263f29..716d6f0fbd0c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8976,6 +8976,7 @@ LINUX KERNEL DUMP TEST MODULE (LKDTM) M: Kees Cook <keescook(a)chromium.org> S: Maintained F: drivers/misc/lkdtm/* +F: tools/testing/selftests/lkdtm/* LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern <stern(a)rowland.harvard.edu> diff --git a/tools/testing/selftests/lkdtm/.gitignore b/tools/testing/selftests/lkdtm/.gitignore new file mode 100644 index 000000000000..09df4a4da272 --- /dev/null +++ b/tools/testing/selftests/lkdtm/.gitignore @@ -0,0 +1 @@ +[A-Z][A-Z]*.sh diff --git a/tools/testing/selftests/lkdtm/Makefile b/tools/testing/selftests/lkdtm/Makefile new file mode 100644 index 000000000000..f322d281fd8e --- /dev/null +++ b/tools/testing/selftests/lkdtm/Makefile @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: GPL-2.0 +# Makefile for LKDTM regression tests + +include ../lib.mk + +# NOTE: $(OUTPUT) won't get default value if used before lib.mk +TEST_GEN_PROGS = $(patsubst %,$(OUTPUT)/%.sh,$(shell awk '{print $$1}' tests.txt | sed -e 's/\#//')) +all: $(TEST_GEN_PROGS) + +$(OUTPUT)/%: run.sh tests.txt + install -m 0744 run.sh $@ diff --git a/tools/testing/selftests/lkdtm/config b/tools/testing/selftests/lkdtm/config new file mode 100644 index 000000000000..d874990e442b --- /dev/null +++ b/tools/testing/selftests/lkdtm/config @@ -0,0 +1 @@ +CONFIG_LKDTM=y diff --git a/tools/testing/selftests/lkdtm/run.sh b/tools/testing/selftests/lkdtm/run.sh new file mode 100755 index 000000000000..a166b925c43d --- /dev/null +++ b/tools/testing/selftests/lkdtm/run.sh @@ -0,0 +1,86 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# +# This reads tests.txt for the list of LKDTM tests to invoke. Any marked +# with a leading "#" are skipped. The line after the test name is either +# the text to look for in dmesg for a "success", or the rationale for why +# a test is marked to be skipped. +# +set -e +TRIGGER=/sys/kernel/debug/provoke-crash/DIRECT + +# Verify we have LKDTM available in the kernel. +if [ ! -r $TRIGGER ] ; then + /sbin/modprobe -q lkdtm || true + if [ ! -r $TRIGGER ] ; then + echo "Cannot find $TRIGGER (missing CONFIG_LKDTM?) [SKIP]" + else + echo "Cannot write $TRIGGER (need to run as root?) [SKIP]" + fi + # Skip this test + exit 4 +fi + +# Figure out which test to run from our script name. +test=$(basename $0 .sh) +# Look up details about the test from master list of LKDTM tests. +line=$(egrep '^#?'"$test"'\b' tests.txt) +if [ -z "$line" ]; then + echo "Missing test '$test' [SKIP]" + exit 4 +fi +# Check that the test is known to LKDTM. +if ! egrep -q '^'"$test"'$' "$TRIGGER" ; then + echo "'$test' missing in $TRIGGER! [SKIP]" + exit 4 +fi + +# Extract notes/expected output from test list. +test=$(echo "$line" | cut -d" " -f1) +if echo "$line" | grep -q ' ' ; then + expect=$(echo "$line" | cut -d" " -f2-) +else + expect="" +fi + +# If the test is commented out, report a skip +if echo "$test" | grep -q '^#' ; then + test=$(echo "$test" | cut -c2-) + if [ -z "$expect" ]; then + expect="crashes entire system" + fi + echo "$test: $expect [SKIP]" + exit 4 +fi + +# If no expected output given, assume an Oops with back trace is success. +if [ -z "$expect" ]; then + expect="call trace:" +fi + +# Clear out dmesg for output reporting +dmesg -c >/dev/null + +# Prepare log for report checking +LOG=$(mktemp --tmpdir -t lkdtm-XXXXXX) +cleanup() { + rm -f "$LOG" +} +trap cleanup EXIT + +# Most shells yell about signals and we're expecting the "cat" process +# to usually be killed by the kernel. So we have to run it in a sub-shell +# and silence errors. +($SHELL -c 'cat <(echo '"$test"') >'"$TRIGGER" 2>/dev/null) || true + +# Record and dump the results +dmesg -c >"$LOG" +cat "$LOG" +# Check for expected output +if grep -qi "$expect" "$LOG" ; then + echo "$test: saw '$expect': ok" + exit 0 +else + echo "$test: missing '$expect': [FAIL]" + exit 1 +fi diff --git a/tools/testing/selftests/lkdtm/tests.txt b/tools/testing/selftests/lkdtm/tests.txt new file mode 100644 index 000000000000..3ee43df87d71 --- /dev/null +++ b/tools/testing/selftests/lkdtm/tests.txt @@ -0,0 +1,64 @@ +#PANIC +BUG +WARNING +EXCEPTION +#LOOP Hangs the system +#EXHAUST_STACK Corrupts memory on failure +#CORRUPT_STACK Crashes entire system on success +#CORRUPT_STACK_STRONG Crashes entire system on success +CORRUPT_LIST_ADD +CORRUPT_LIST_DEL +CORRUPT_USER_DS +STACK_GUARD_PAGE_LEADING +STACK_GUARD_PAGE_TRAILING +UNALIGNED_LOAD_STORE_WRITE +#OVERWRITE_ALLOCATION Corrupts memory on failure +#WRITE_AFTER_FREE Corrupts memory on failure +READ_AFTER_FREE +#WRITE_BUDDY_AFTER_FREE Corrupts memory on failure +READ_BUDDY_AFTER_FREE +#SOFTLOCKUP Hangs the system +#HARDLOCKUP Hangs the system +#SPINLOCKUP Hangs the system +#HUNG_TASK Hangs the system +EXEC_DATA +EXEC_STACK +EXEC_KMALLOC +EXEC_VMALLOC +EXEC_RODATA +EXEC_USERSPACE +EXEC_NULL +ACCESS_USERSPACE +ACCESS_NULL +WRITE_RO +WRITE_RO_AFTER_INIT +WRITE_KERN +REFCOUNT_INC_OVERFLOW +REFCOUNT_ADD_OVERFLOW +REFCOUNT_INC_NOT_ZERO_OVERFLOW +REFCOUNT_ADD_NOT_ZERO_OVERFLOW +REFCOUNT_DEC_ZERO +REFCOUNT_DEC_NEGATIVE Negative detected: saturated +REFCOUNT_DEC_AND_TEST_NEGATIVE Negative detected: saturated +REFCOUNT_SUB_AND_TEST_NEGATIVE Negative detected: saturated +REFCOUNT_INC_ZERO +REFCOUNT_ADD_ZERO +REFCOUNT_INC_SATURATED Saturation detected: still saturated +REFCOUNT_DEC_SATURATED Saturation detected: still saturated +REFCOUNT_ADD_SATURATED Saturation detected: still saturated +REFCOUNT_INC_NOT_ZERO_SATURATED +REFCOUNT_ADD_NOT_ZERO_SATURATED +REFCOUNT_DEC_AND_TEST_SATURATED Saturation detected: still saturated +REFCOUNT_SUB_AND_TEST_SATURATED Saturation detected: still saturated +#REFCOUNT_TIMING timing only +#ATOMIC_TIMING timing only +USERCOPY_HEAP_SIZE_TO +USERCOPY_HEAP_SIZE_FROM +USERCOPY_HEAP_WHITELIST_TO +USERCOPY_HEAP_WHITELIST_FROM +USERCOPY_STACK_FRAME_TO +USERCOPY_STACK_FRAME_FROM +USERCOPY_STACK_BEYOND +USERCOPY_KERNEL +USERCOPY_KERNEL_DS +STACKLEAK_ERASING -- 2.17.1 -- Kees Cook

5 years

1
0
0 0

next-20190409 kselftest results

by ci_notify＠linaro.org

Summary ------------------------------------------------------------------------ kernel: 5.1.0-rc4 git repo: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git git branch: master git commit: cfd24a53adb86cdeeaf04d4351d8cb7f6e94795f git describe: next-20190409 Test details: https://qa-reports.linaro.org/lkft/linux-next-oe/build/next-20190409 Regressions (compared to build next-20190408) ------------------------------------------------------------------------ hi6220-hikey - arm64: kselftest: * lib_bitmap.sh * lib_printf.sh i386: kselftest: * lib_bitmap.sh * lib_printf.sh juno-r2 - arm64: kselftest: * lib_bitmap.sh * lib_printf.sh qemu_arm: kselftest: * lib_bitmap.sh * lib_printf.sh qemu_arm64: kselftest: * lib_bitmap.sh * lib_printf.sh qemu_i386: kselftest: * lib_bitmap.sh * lib_printf.sh qemu_x86_64: kselftest: * lib_bitmap.sh * lib_printf.sh x15 - arm: kselftest: * lib_bitmap.sh * lib_printf.sh x86_64: kselftest: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-native: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-none: * lib_bitmap.sh * lib_printf.sh x86_64: kselftest: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-native: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-none: * lib_bitmap.sh * lib_printf.sh x86_64: kselftest: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-native: * lib_bitmap.sh * lib_printf.sh kselftest-vsyscall-mode-none: * lib_bitmap.sh * lib_printf.sh Fixes (compared to build next-20190408) ------------------------------------------------------------------------ juno-r2 - arm64: kselftest: * bpf_test_sock_addr.sh qemu_arm64: kselftest: * bpf_test_maps qemu_x86_64: kselftest: * bpf_test_maps x86_64: kselftest: * bpf_test_sockmap * net_fib-onlink-tests.sh In total: ------------------------------------------------------------------------ Ran 1578 total tests in the following environments and test suites. pass 999 fail 390 xfail 0 skip 189 Environments -------------- - dragonboard-410c - arm64 - hi6220-hikey - arm64 - i386 - juno-r2 - arm64 - qemu_arm - qemu_arm64 - qemu_i386 - qemu_x86_64 - x15 - arm - x86_64 Test Suites ----------- * kselftest * kselftest-vsyscall-mode-native * kselftest-vsyscall-mode-none Failures ------------------------------------------------------------------------ qemu_x86_64: * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_progs * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/firmware_fw_run_tests.sh * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_xfrm_policy.sh * kselftest/pstore_pstore_tests * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests * kselftest/x86_fsgsbase_64 qemu_i386: * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcpbpf_user * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_xdp_vlan.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_xfrm_policy.sh * kselftest/proc_proc-self-syscall * kselftest/pstore_pstore_tests * kselftest/seccomp_seccomp_bpf * kselftest/size_get_size * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests * kselftest/x86_syscall_arg_fault_32 qemu_arm64: * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_test_vxlan_under_vrf.sh * kselftest/pstore_pstore_tests * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests x86: * kselftest-vsyscall-mode-native/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-native/bpf_test_lirc_mode2_user * kselftest-vsyscall-mode-native/bpf_test_lwt_ip_encap.sh * kselftest-vsyscall-mode-native/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-native/bpf_test_netcnt * kselftest-vsyscall-mode-native/bpf_test_progs * kselftest-vsyscall-mode-native/bpf_test_sockmap * kselftest-vsyscall-mode-native/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-native/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-native/cgroup_test_core * kselftest-vsyscall-mode-native/dma-buf_udmabuf * kselftest-vsyscall-mode-native/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-native/lib_bitmap.sh * kselftest-vsyscall-mode-native/lib_prime_numbers.sh * kselftest-vsyscall-mode-native/lib_printf.sh * kselftest-vsyscall-mode-native/lib_strscpy.sh * kselftest-vsyscall-mode-native/net_fib-onlink-tests.sh * kselftest-vsyscall-mode-native/net_ip_defrag.sh * kselftest-vsyscall-mode-native/net_pmtu.sh * kselftest-vsyscall-mode-native/net_psock_snd.sh * kselftest-vsyscall-mode-native/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-native/net_xfrm_policy.sh * kselftest-vsyscall-mode-none/bpf_test_flow_dissector.sh * kselftest-vsyscall-mode-none/bpf_test_lirc_mode2_user * kselftest-vsyscall-mode-none/bpf_test_lwt_ip_encap.sh * kselftest-vsyscall-mode-none/bpf_test_lwt_seg6local.sh * kselftest-vsyscall-mode-none/bpf_test_netcnt * kselftest-vsyscall-mode-none/bpf_test_progs * kselftest-vsyscall-mode-none/bpf_test_sock_addr.sh * kselftest-vsyscall-mode-none/bpf_test_sockmap * kselftest-vsyscall-mode-none/bpf_test_tc_edt.sh * kselftest-vsyscall-mode-none/bpf_test_tc_tunnel.sh * kselftest-vsyscall-mode-none/cgroup_test_core * kselftest-vsyscall-mode-none/dma-buf_udmabuf * kselftest-vsyscall-mode-none/firmware_fw_run_tests.sh * kselftest-vsyscall-mode-none/lib_bitmap.sh * kselftest-vsyscall-mode-none/lib_prime_numbers.sh * kselftest-vsyscall-mode-none/lib_printf.sh * kselftest-vsyscall-mode-none/lib_strscpy.sh * kselftest-vsyscall-mode-none/net_fib-onlink-tests.sh * kselftest-vsyscall-mode-none/net_ip_defrag.sh * kselftest-vsyscall-mode-none/net_pmtu.sh * kselftest-vsyscall-mode-none/net_psock_snd.sh * kselftest-vsyscall-mode-none/net_test_vxlan_under_vrf.sh * kselftest-vsyscall-mode-none/net_xfrm_policy.sh * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_ip_defrag.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_test_vxlan_under_vrf.sh * kselftest/net_xfrm_policy.sh * kselftest/timestamping_txtimestamp.sh dragonboard-410c: x15: * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcpbpf_user * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_xdp_vlan.sh * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_reuseport_bpf_numa * kselftest/net_test_vxlan_under_vrf.sh * kselftest/pidfd_pidfd_test * kselftest/proc_proc-self-syscall * kselftest/pstore_pstore_tests * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests qemu_arm: * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sock_fields * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcpbpf_user * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tcpnotify_user * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_xdp_vlan.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_msg_zerocopy.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_reuseport_bpf_numa * kselftest/net_test_vxlan_under_vrf.sh * kselftest/pidfd_pidfd_test * kselftest/proc_proc-self-syscall * kselftest/pstore_pstore_tests * kselftest/seccomp_seccomp_bpf * kselftest/timestamping_txtimestamp.sh * kselftest/tpm2_test_smoke.sh * kselftest/tpm2_test_space.sh * kselftest/vm_run_vmtests hi6220-hikey: * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_progs * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh * kselftest/net_fib-onlink-tests.sh * kselftest/net_fib_tests.sh * kselftest/net_ip_defrag.sh * kselftest/net_pmtu.sh * kselftest/net_psock_snd.sh * kselftest/net_test_vxlan_under_vrf.sh * kselftest/pstore_pstore_tests * kselftest/timestamping_txtimestamp.sh juno-r2: * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_netcnt * kselftest/bpf_test_progs * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/cgroup_test_core * kselftest/cpufreq_main.sh * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh i386: * kselftest/bpf_get_cgroup_id_user * kselftest/bpf_test_flow_dissector.sh * kselftest/bpf_test_lirc_mode2_user * kselftest/bpf_test_lwt_ip_encap.sh * kselftest/bpf_test_lwt_seg6local.sh * kselftest/bpf_test_maps * kselftest/bpf_test_progs * kselftest/bpf_test_select_reuseport * kselftest/bpf_test_skb_cgroup_id.sh * kselftest/bpf_test_sock_addr.sh * kselftest/bpf_test_socket_cookie * kselftest/bpf_test_sockmap * kselftest/bpf_test_tc_edt.sh * kselftest/bpf_test_tcpbpf_user * kselftest/bpf_test_tcp_check_syncookie.sh * kselftest/bpf_test_tc_tunnel.sh * kselftest/bpf_test_xdp_vlan.sh * kselftest/cgroup_test_core * kselftest/dma-buf_udmabuf * kselftest/firmware_fw_run_tests.sh * kselftest/kvm_clear_dirty_log_test * kselftest/kvm_cr4_cpuid_sync_test * kselftest/kvm_dirty_log_test * kselftest/kvm_evmcs_test * kselftest/kvm_hyperv_cpuid * kselftest/kvm_platform_info_test * kselftest/kvm_set_sregs_test * kselftest/kvm_state_test * kselftest/kvm_sync_regs_test * kselftest/kvm_vmx_close_while_nested_test * kselftest/kvm_vmx_tsc_adjust_test * kselftest/lib_bitmap.sh * kselftest/lib_prime_numbers.sh * kselftest/lib_printf.sh * kselftest/lib_strscpy.sh Skips ------------------------------------------------------------------------ No skips -- Linaro LKFT https://lkft.linaro.org

5 years

1
0
0 0

[PATCH] selftests: cgroup: fix cleanup path in test_memcg_subtree_control()

by Roman Gushchin

Dan reported, that cleanup path in test_memcg_subtree_control() triggers a static checker warning: ./tools/testing/selftests/cgroup/test_memcontrol.c:76 \ test_memcg_subtree_control() error: uninitialized symbol 'child2'. Fix this by initializing child2 and parent2 variables and split the cleanup path into few stages. Signed-off-by: Roman Gushchin <guro(a)fb.com> Fixes: 84092dbcf901 ("selftests: cgroup: add memory controller self-tests") Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Shuah Khan (Samsung OSG) <shuah(a)kernel.org> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> --- .../selftests/cgroup/test_memcontrol.c | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 28d321ba311b..6f339882a6ca 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -26,7 +26,7 @@ */ static int test_memcg_subtree_control(const char *root) { - char *parent, *child, *parent2, *child2; + char *parent, *child, *parent2 = NULL, *child2 = NULL; int ret = KSFT_FAIL; char buf[PAGE_SIZE]; @@ -34,50 +34,54 @@ static int test_memcg_subtree_control(const char *root) parent = cg_name(root, "memcg_test_0"); child = cg_name(root, "memcg_test_0/memcg_test_1"); if (!parent || !child) - goto cleanup; + goto cleanup_free; if (cg_create(parent)) - goto cleanup; + goto cleanup_free; if (cg_write(parent, "cgroup.subtree_control", "+memory")) - goto cleanup; + goto cleanup_parent; if (cg_create(child)) - goto cleanup; + goto cleanup_parent; if (cg_read_strstr(child, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_child; /* Create two nested cgroups without enabling memory controller */ parent2 = cg_name(root, "memcg_test_1"); child2 = cg_name(root, "memcg_test_1/memcg_test_1"); if (!parent2 || !child2) - goto cleanup; + goto cleanup_free2; if (cg_create(parent2)) - goto cleanup; + goto cleanup_free2; if (cg_create(child2)) - goto cleanup; + goto cleanup_parent2; if (cg_read(child2, "cgroup.controllers", buf, sizeof(buf))) - goto cleanup; + goto cleanup_all; if (!cg_read_strstr(child2, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_all; ret = KSFT_PASS; -cleanup: - cg_destroy(child); - cg_destroy(parent); - free(parent); - free(child); - +cleanup_all: cg_destroy(child2); +cleanup_parent2: cg_destroy(parent2); +cleanup_free2: free(parent2); free(child2); +cleanup_child: + cg_destroy(child); +cleanup_parent: + cg_destroy(parent); +cleanup_free: + free(parent); + free(child); return ret; } -- 2.17.2

5 years

1
1
0 0

[PATCH kselftest-next] selftests: cgroup: fix cleanup path in test_memcg_subtree_control()

by Roman Gushchin

Dan reported, that cleanup path in test_memcg_subtree_control() triggers a static checker warning: ./tools/testing/selftests/cgroup/test_memcontrol.c:76 \ test_memcg_subtree_control() error: uninitialized symbol 'child2'. Fix this by initializing child2 and parent2 variables and split the cleanup path into few stages. Signed-off-by: Roman Gushchin <guro(a)fb.com> Fixes: 84092dbcf901 ("selftests: cgroup: add memory controller self-tests") Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Shuah Khan (Samsung OSG) <shuah(a)kernel.org> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> --- .../selftests/cgroup/test_memcontrol.c | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 28d321ba311b..6f339882a6ca 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -26,7 +26,7 @@ */ static int test_memcg_subtree_control(const char *root) { - char *parent, *child, *parent2, *child2; + char *parent, *child, *parent2 = NULL, *child2 = NULL; int ret = KSFT_FAIL; char buf[PAGE_SIZE]; @@ -34,50 +34,54 @@ static int test_memcg_subtree_control(const char *root) parent = cg_name(root, "memcg_test_0"); child = cg_name(root, "memcg_test_0/memcg_test_1"); if (!parent || !child) - goto cleanup; + goto cleanup_free; if (cg_create(parent)) - goto cleanup; + goto cleanup_free; if (cg_write(parent, "cgroup.subtree_control", "+memory")) - goto cleanup; + goto cleanup_parent; if (cg_create(child)) - goto cleanup; + goto cleanup_parent; if (cg_read_strstr(child, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_child; /* Create two nested cgroups without enabling memory controller */ parent2 = cg_name(root, "memcg_test_1"); child2 = cg_name(root, "memcg_test_1/memcg_test_1"); if (!parent2 || !child2) - goto cleanup; + goto cleanup_free2; if (cg_create(parent2)) - goto cleanup; + goto cleanup_free2; if (cg_create(child2)) - goto cleanup; + goto cleanup_parent2; if (cg_read(child2, "cgroup.controllers", buf, sizeof(buf))) - goto cleanup; + goto cleanup_all; if (!cg_read_strstr(child2, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_all; ret = KSFT_PASS; -cleanup: - cg_destroy(child); - cg_destroy(parent); - free(parent); - free(child); - +cleanup_all: cg_destroy(child2); +cleanup_parent2: cg_destroy(parent2); +cleanup_free2: free(parent2); free(child2); +cleanup_child: + cg_destroy(child); +cleanup_parent: + cg_destroy(parent); +cleanup_free: + free(parent); + free(child); return ret; } -- 2.17.2

5 years

1
0
0 0

[PATCH kselftest-next] selftests: cgroup: fix cleanup path in test_memcg_subtree_control()

by Roman Gushchin

Dan reported, that cleanup path in test_memcg_subtree_control() triggers a static checker warning: ./tools/testing/selftests/cgroup/test_memcontrol.c:76 \ test_memcg_subtree_control() error: uninitialized symbol 'child2'. Fix this by initializing child2 and parent2 variables and split the cleanup path into few stages. Signed-off-by: Roman Gushchin <guro(a)fb.com> Fixes: 84092dbcf901 ("selftests: cgroup: add memory controller self-tests") Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Dan Carpenter <dan.carpenter(a)oracle.com> Cc: Shuah Khan (Samsung OSG) <shuah(a)kernel.org> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> --- .../selftests/cgroup/test_memcontrol.c | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 28d321ba311b..6f339882a6ca 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -26,7 +26,7 @@ */ static int test_memcg_subtree_control(const char *root) { - char *parent, *child, *parent2, *child2; + char *parent, *child, *parent2 = NULL, *child2 = NULL; int ret = KSFT_FAIL; char buf[PAGE_SIZE]; @@ -34,50 +34,54 @@ static int test_memcg_subtree_control(const char *root) parent = cg_name(root, "memcg_test_0"); child = cg_name(root, "memcg_test_0/memcg_test_1"); if (!parent || !child) - goto cleanup; + goto cleanup_free; if (cg_create(parent)) - goto cleanup; + goto cleanup_free; if (cg_write(parent, "cgroup.subtree_control", "+memory")) - goto cleanup; + goto cleanup_parent; if (cg_create(child)) - goto cleanup; + goto cleanup_parent; if (cg_read_strstr(child, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_child; /* Create two nested cgroups without enabling memory controller */ parent2 = cg_name(root, "memcg_test_1"); child2 = cg_name(root, "memcg_test_1/memcg_test_1"); if (!parent2 || !child2) - goto cleanup; + goto cleanup_free2; if (cg_create(parent2)) - goto cleanup; + goto cleanup_free2; if (cg_create(child2)) - goto cleanup; + goto cleanup_parent2; if (cg_read(child2, "cgroup.controllers", buf, sizeof(buf))) - goto cleanup; + goto cleanup_all; if (!cg_read_strstr(child2, "cgroup.controllers", "memory")) - goto cleanup; + goto cleanup_all; ret = KSFT_PASS; -cleanup: - cg_destroy(child); - cg_destroy(parent); - free(parent); - free(child); - +cleanup_all: cg_destroy(child2); +cleanup_parent2: cg_destroy(parent2); +cleanup_free2: free(parent2); free(child2); +cleanup_child: + cg_destroy(child); +cleanup_parent: + cg_destroy(parent); +cleanup_free: + free(parent); + free(child); return ret; } -- 2.17.2

5 years

3
2
0 0

[RFC][PATCH] selftests/lib.mk: Move test output to diagnostic lines

by Kees Cook

This changes the selftest output is several ways: - total test count is reported at start. - each test's result is on a single line with "# SKIP" as needed per spec. - each test's output is report _before_ the result line as a commented "diagnostic" line. This creates a bit of a kernel-specific TAP output where the diagnostics precede the results. The TAP spec isn't entirely clear about this, though, so I think it's the correct solution so as to not keep interactive runs making sense. If the output _followed_ the result line in the spec-suggested YAML form, each test would dump all of its output at once instead of as it went, making debugging harder. Also, while "sed -u" is used to add the "# " line prefixes, this still doesn't work for all output. For example, the "timer" lists print out text, then do the work, then print a result and a newline. This isn't visible any more. And some tests still show nothing until they finish. I haven't found a way to force the prefixing while keeping the output entirely unbuffered. :( Note that the shell construct needed to both get an exit code from the first command in a pipe and still filter the pipe (to add the "# " prefix) uses a POSIX solution rather than the bash "pipefail" option which is not supported by dash. Signed-off-by: Kees Cook <keescook(a)chromium.org> --- tools/testing/selftests/lib.mk | 54 +++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 8b0f16409ed7..056dac8f5701 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -5,6 +5,7 @@ CC := $(CROSS_COMPILE)gcc ifeq (0,$(MAKELEVEL)) OUTPUT := $(shell pwd) endif +srcdir = $(notdir $(shell pwd)) # The following are built by lib.mk common compile rules. # TEST_CUSTOM_PROGS should be used by tests that require @@ -32,38 +33,45 @@ endif .ONESHELL: define RUN_TEST_PRINT_RESULT - TEST_HDR_MSG="selftests: "`basename $$PWD`:" $$BASENAME_TEST"; \ - echo $$TEST_HDR_MSG; \ - echo "========================================"; \ + TEST_HDR_MSG="selftests: $(srcdir): $$BASENAME_TEST"; \ if [ ! -x $$TEST ]; then \ - echo "$$TEST_HDR_MSG: Warning: file $$BASENAME_TEST is not executable, correct this.";\ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - else \ - cd `dirname $$TEST` > /dev/null; \ - if [ "X$(summary)" != "X" ]; then \ - (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && \ - echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \ - (if [ $$? -eq $$skip ]; then \ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \ - else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - fi;) \ - else \ - (./$$BASENAME_TEST && \ - echo "ok 1..$$test_num $$TEST_HDR_MSG [PASS]") || \ - (if [ $$? -eq $$skip ]; then \ - echo "not ok 1..$$test_num $$TEST_HDR_MSG [SKIP]"; \ - else echo "not ok 1..$$test_num $$TEST_HDR_MSG [FAIL]"; \ - fi;) \ - fi; \ - cd - > /dev/null; \ + if [ "X$(summary)" = "X" ]; then \ + echo "# warning: 'file $$TEST is not executable, correct this.'";\ + fi; \ + echo "not ok $$test_num $$TEST_HDR_MSG"; \ + else \ + cd `dirname $$TEST` > /dev/null; \ + if [ "X$(summary)" != "X" ]; then \ + (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 &&\ + echo "ok $$test_num $$TEST_HDR_MSG") || \ + (if [ $$? -eq $$skip ]; then \ + echo "not ok $$test_num $$TEST_HDR_MSG # SKIP"; \ + else \ + echo "not ok $$test_num $$TEST_HDR_MSG";\ + fi); \ + else \ + echo "# $$TEST_HDR_MSG"; \ + (((((./$$BASENAME_TEST 2>&1; echo $$? >&3) | \ + sed -ue 's/^/# /' >&4) 3>&1) | \ + (read xs; exit $$xs)) 4>&1 && \ + echo "ok $$test_num $$TEST_HDR_MSG") || \ + (if [ $$? -eq $$skip ]; then \ + echo "not ok $$test_num $$TEST_HDR_MSG # SKIP"; \ + else \ + echo "not ok $$test_num $$TEST_HDR_MSG";\ + fi); \ + fi; \ + cd - > /dev/null; \ fi; endef define RUN_TESTS @export KSFT_TAP_LEVEL=`echo 1`; \ test_num=`echo 0`; \ + total=`echo "$(1)" | wc -w`; \ skip=`echo 4`; \ echo "TAP version 13"; \ + echo "1..$$total selftests: $(srcdir)"; \ for TEST in $(1); do \ BASENAME_TEST=`basename $$TEST`; \ test_num=`echo $$test_num+1 | bc`; \ -- 2.17.1 -- Kees Cook

5 years

1
1
0 0

[PATCH v2 bpf-next 0/4] L2 encap support for bpf_skb_adjust_room

by Alan Maguire

Extend bpf_skb_adjust_room growth to mark inner MAC header so that L2 encapsulation can be used for tc tunnels. Patch #1 extends the existing test_tc_tunnel to support UDP encapsulation; later we want to be able to test MPLS over UDP and MPLS over GRE encapsulation. Patch #2 adds the BPF_F_ADJ_ROOM_ENCAP_L2(len) macro, which allows specification of inner mac length. Other approaches were explored prior to taking this approach. Specifically, I tried automatically computing the inner mac length on the basis of the specified flags (so inner maclen for GRE/IPv4 encap is the len_diff specified to bpf_skb_adjust_room minus GRE + IPv4 header length for example). Problem with this is that we don't know for sure what form of GRE/UDP header we have; is it a full GRE header, or is it a FOU UDP header or generic UDP encap header? My fear here was we'd end up with an explosion of flags. The other approach tried was to support inner L2 header marking as a separate room adjustment, i.e. adjust for L3/L4 encap, then call bpf_skb_adjust_room for L2 encap. This can be made to work but because it imposed an order on operations, felt a bit clunky. Patch #3 syncs tools/ bpf.h. Patch #4 extends the tests again to support MPLSoverGRE, MPLSoverUDP, and transparent ethernet bridging (TEB) where the inner L2 header is an ethernet header. Testing of BPF encap against tunnels is done for cases where configuration of such tunnels is possible (MPLSoverGRE[6], MPLSoverUDP, gre[6]tap), and skipped otherwise. Testing of BPF encap/decap is always carried out. Changes since v1: - fixed formatting of commit references. - BPF_F_ADJ_ROOM_FIXED_GSO flag enabled on all variants (patch 1) - fixed fou6 options for UDP encap; checksum errors observed were due to the fact fou6 tunnel was not set up with correct ipproto options (41 -6). 0 checksums work fine (patch 1) - added definitions for mask and shift used in setting L2 length (patch 2) - allow udp encap with fixed GSO (patch 2) - changed "elen" to "l2_len" to be more descriptive (patch 4) - added support for ethernet L2 encap to tests; testing against gre[6]tap tunnels (patch 4). Alan Maguire (4): selftests_bpf: add UDP encap to test_tc_tunnel bpf: add layer 2 encap support to bpf_skb_adjust_room bpf: sync bpf.h to tools/ for BPF_F_ADJ_ROOM_ENCAP_L2 selftests_bpf: add L2 encap to test_tc_tunnel include/uapi/linux/bpf.h | 10 + net/core/filter.c | 15 +- tools/include/uapi/linux/bpf.h | 10 + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 335 +++++++++++++++++---- tools/testing/selftests/bpf/test_tc_tunnel.sh | 147 +++++++-- 5 files changed, 427 insertions(+), 90 deletions(-) -- 1.8.3.1

5 years

2
8
0 0

Re: [GIT PULL] Kselftest update for Linux 5.1-rc4

by shuah

On 4/3/19 7:34 PM, shuah wrote: > Hi Linus, > > Please pull the following Kselftest update for Linux 5.1-rc4 > > This Kselftest update for Linux 5.1-rc4 consists of fixes to rseq, > cgroup, and efivarfs tests. > > diff is attached. > > thanks, > -- Shuah > Hi Linus, I just noticed that one commit in this pull request has mismatched author and signed-off. Please disregard the pull request. I will fix this and send a new pull request. Sorry for the noise. thanks, -- Shuah

5 years

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror April 2019