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

[PATCH v1] selftests/mm: Log run_vmtests.sh results in TAP format

by Ryan Roberts

When running tests on a CI system (e.g. LAVA) it is useful to output test results in TAP format so that the CI can parse the fine-grained results to show regressions. Many of the mm selftest binaries already output using the TAP format. And the kselftests runner (run_kselftest.sh) also uses the format. CI systems such as LAVA can already handle nested TAP reports. However, with the mm selftests we have 3 levels of nesting (run_kselftest.sh -> run_vmtests.sh -> individual test binaries) and the middle level did not previously support TAP, which breaks the parser. Let's fix that by teaching run_vmtests.sh to output using the TAP format. Ideally this would be opt-in via a command line argument to avoid the possibility of breaking anyone's existing scripts that might scrape the output. However, it is not possible to pass arguments to tests invoked via run_kselftest.sh. So I've implemented an opt-out option (-n), which will revert to the existing output format. Future changes to this file should be aware of 2 new conventions: - output that is part of the TAP reporting is piped through tap_output - general output is piped through tap_prefix Signed-off-by: Ryan Roberts <ryan.roberts(a)arm.com> --- tools/testing/selftests/mm/run_vmtests.sh | 51 +++++++++++++++++------ 1 file changed, 39 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index 87f513f5cf91..246d53a5d7f2 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -5,6 +5,7 @@ # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 +count_total=0 count_pass=0 count_fail=0 count_skip=0 @@ -17,6 +18,7 @@ usage: ${BASH_SOURCE[0]:-$0} [ options ] -a: run all tests, including extra ones -t: specify specific categories to tests to run -h: display this message + -n: disable TAP output The default behavior is to run required tests only. If -a is specified, will run all tests. @@ -77,12 +79,14 @@ EOF } RUN_ALL=false +TAP_PREFIX="# " -while getopts "aht:" OPT; do +while getopts "aht:n" OPT; do case ${OPT} in "a") RUN_ALL=true ;; "h") usage ;; "t") VM_SELFTEST_ITEMS=${OPTARG} ;; + "n") TAP_PREFIX= ;; esac done shift $((OPTIND -1)) @@ -184,30 +188,52 @@ fi VADDR64=0 echo "$ARCH64STR" | grep "$ARCH" &>/dev/null && VADDR64=1 +tap_prefix() { + sed -e "s/^/${TAP_PREFIX}/" +} + +tap_output() { + if [[ ! -z "$TAP_PREFIX" ]]; then + read str + echo $str + fi +} + +pretty_name() { + echo "$*" | sed -e 's/^$bash $\?\.\///' +} + # Usage: run_test [test binary] [arbitrary test arguments...] run_test() { if test_selected ${CATEGORY}; then + local test=$(pretty_name "$*") local title="running $*" local sep=$(echo -n "$title" | tr "[:graph:][:space:]" -) - printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" + printf "%s\n%s\n%s\n" "$sep" "$title" "$sep" | tap_prefix - "$@" - local ret=$? + ("$@" 2>&1) | tap_prefix + local ret=${PIPESTATUS[0]} + count_total=$(( count_total + 1 )) if [ $ret -eq 0 ]; then count_pass=$(( count_pass + 1 )) - echo "[PASS]" + echo "[PASS]" | tap_prefix + echo "ok ${count_total} ${test}" | tap_output elif [ $ret -eq $ksft_skip ]; then count_skip=$(( count_skip + 1 )) - echo "[SKIP]" + echo "[SKIP]" | tap_prefix + echo "ok ${count_total} ${test} # SKIP" | tap_output exitcode=$ksft_skip else count_fail=$(( count_fail + 1 )) - echo "[FAIL]" + echo "[FAIL]" | tap_prefix + echo "not ok ${count_total} ${test} # exit=$ret" | tap_output exitcode=1 fi fi # test_selected } +echo "TAP version 13" | tap_output + CATEGORY="hugetlb" run_test ./hugepage-mmap shmmax=$(cat /proc/sys/kernel/shmmax) @@ -231,9 +257,9 @@ CATEGORY="hugetlb" run_test ./hugetlb_fault_after_madv echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages if test_selected "hugetlb"; then - echo "NOTE: These hugetlb tests provide minimal coverage. Use" - echo " https://github.com/libhugetlbfs/libhugetlbfs.git for" - echo " hugetlb regression testing." + echo "NOTE: These hugetlb tests provide minimal coverage. Use" | tap_prefix + echo " https://github.com/libhugetlbfs/libhugetlbfs.git for" | tap_prefix + echo " hugetlb regression testing." | tap_prefix fi CATEGORY="mmap" run_test ./map_fixed_noreplace @@ -312,7 +338,7 @@ CATEGORY="hmm" run_test bash ./test_hmm.sh smoke # MADV_POPULATE_READ and MADV_POPULATE_WRITE tests CATEGORY="madv_populate" run_test ./madv_populate -echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope +(echo 0 | sudo tee /proc/sys/kernel/yama/ptrace_scope 2>&1) | tap_prefix CATEGORY="memfd_secret" run_test ./memfd_secret # KSM KSM_MERGE_TIME_HUGE_PAGES test with size of 100 @@ -369,6 +395,7 @@ CATEGORY="mkdirty" run_test ./mkdirty CATEGORY="mdwe" run_test ./mdwe_test -echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" +echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" | tap_prefix +echo "1..${count_total}" | tap_output exit $exitcode -- 2.25.1

1 year, 11 months

3
11
0 0

[PATCH v4] tracing/selftests: Add test to test the trace_marker

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> Add a test that writes longs strings, some over the size of the sub buffer and make sure that the entire content is there. Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- Changes since v3: https://lore.kernel.org/linux-trace-kernel/20231212192317.0fb6b101@gandalf.… - Removed / */ from regex, to catch more than one space added to the beginning of the print. This would have caught the bug of using "%*s" instead of "%.*s". Luckily, the trace_printk test caught that. .../ftrace/test.d/00basic/trace_marker.tc | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100755 tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc diff --git a/tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc b/tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc new file mode 100755 index 000000000000..9aa0db2b84fc --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/00basic/trace_marker.tc @@ -0,0 +1,82 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Basic tests on writing to trace_marker +# requires: trace_marker +# flags: instance + +get_buffer_data_size() { + sed -ne 's/^.*data.*size:$[0-9][0-9]*$.*/\1/p' events/header_page +} + +get_buffer_data_offset() { + sed -ne 's/^.*data.*offset:$[0-9][0-9]*$.*/\1/p' events/header_page +} + +get_event_header_size() { + type_len=`sed -ne 's/^.*type_len.*:[^0-9]*$[0-9][0-9]*$.*/\1/p' events/header_event` + time_len=`sed -ne 's/^.*time_delta.*:[^0-9]*$[0-9][0-9]*$.*/\1/p' events/header_event` + array_len=`sed -ne 's/^.*array.*:[^0-9]*$[0-9][0-9]*$.*/\1/p' events/header_event` + total_bits=$((type_len+time_len+array_len)) + total_bits=$((total_bits+7)) + echo $((total_bits/8)) +} + +get_print_event_buf_offset() { + sed -ne 's/^.*buf.*offset:$[0-9][0-9]*$.*/\1/p' events/ftrace/print/format +} + +event_header_size=`get_event_header_size` +print_header_size=`get_print_event_buf_offset` + +data_offset=`get_buffer_data_offset` + +marker_meta=$((event_header_size+print_header_size)) + +make_str() { + cnt=$1 + # subtract two for \n\0 as marker adds these + cnt=$((cnt-2)) + printf -- 'X%.0s' $(seq $cnt) +} + +write_buffer() { + size=$1 + + str=`make_str $size` + + # clear the buffer + echo > trace + + # write the string into the marker + echo -n $str > trace_marker + + echo $str +} + +test_buffer() { + + size=`get_buffer_data_size` + oneline_size=$((size-marker_meta)) + echo size = $size + echo meta size = $marker_meta + + # Now add a little more the meta data overhead will overflow + + str=`write_buffer $size` + + # Make sure the line was broken + new_str=`awk ' /tracing_mark_write:/ { sub(/^.*tracing_mark_write: /,"");printf "%s", $0; exit}' trace` + + if [ "$new_str" = "$str" ]; then + exit fail; + fi + + # Make sure the entire line can be found + new_str=`awk ' /tracing_mark_write:/ { sub(/^.*tracing_mark_write: /,"");printf "%s", $0; }' trace` + + if [ "$new_str" != "$str" ]; then + exit fail; + fi +} + +test_buffer -- 2.42.0

1 year, 11 months

3
3
0 0

[PATCH net-next v10 00/10] net: ethernet: am65-cpsw: Add mqprio, frame preemption & coalescing

by Roger Quadros

Hi, This series adds mqprio qdisc offload in channel mode, Frame Preemption MAC merge support and RX/TX coalesing for AM65 CPSW driver. In v10 following changes were made - Fix fallback to aggregate stats check - Added Reviewed-by tags Changelog information in each patch file. cheers, -roger Grygorii Strashko (2): net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode net: ethernet: ti: am65-cpsw: add sw tx/rx irq coalescing based on hrtimers Roger Quadros (6): net: ethernet: am65-cpsw: Build am65-cpsw-qos only if required net: ethernet: am65-cpsw: Rename TI_AM65_CPSW_TAS to TI_AM65_CPSW_QOS net: ethernet: am65-cpsw: cleanup TAPRIO handling net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration net: ethernet: am65-cpsw: Move register definitions to header file net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support Vladimir Oltean (2): selftests: forwarding: ethtool_mm: support devices with higher rx-min-frag-size selftests: forwarding: ethtool_mm: fall back to aggregate if device does not report pMAC stats drivers/net/ethernet/ti/Kconfig | 14 +- drivers/net/ethernet/ti/Makefile | 3 +- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 246 ++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 64 +- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 9 + drivers/net/ethernet/ti/am65-cpsw-qos.c | 708 +++++++++++++----- drivers/net/ethernet/ti/am65-cpsw-qos.h | 186 +++++ .../selftests/net/forwarding/ethtool_mm.sh | 48 +- tools/testing/selftests/net/forwarding/lib.sh | 9 + 9 files changed, 1100 insertions(+), 187 deletions(-) base-commit: 610a689d2a57af3e21993cb6d8c3e5f839a8c89e -- 2.34.1

1 year, 11 months

1
11
0 0

[PATCH net-next v9 00/10] net: ethernet: am65-cpsw: Add mqprio, frame pre-emption & coalescing

by Roger Quadros

Hi, This series adds mqprio qdisc offload in channel mode, Frame Pre-emption MAC merge support and RX/TX coalesing for AM65 CPSW driver. In v9 following changes were made - rebase to latest net-next/main - merge patch "net: ethernet: ti: am65-cpsw: Fix get_eth_mac_stats" with "net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support" - drop "\n" from NL_SET_ERR_MSG_FMT_MOD() Changelog information in each patch file. cheers, -roger Grygorii Strashko (2): net: ethernet: ti: am65-cpsw: add mqprio qdisc offload in channel mode net: ethernet: ti: am65-cpsw: add sw tx/rx irq coalescing based on hrtimers Roger Quadros (6): net: ethernet: am65-cpsw: Build am65-cpsw-qos only if required net: ethernet: am65-cpsw: Rename TI_AM65_CPSW_TAS to TI_AM65_CPSW_QOS net: ethernet: am65-cpsw: cleanup TAPRIO handling net: ethernet: ti: am65-cpsw: Move code to avoid forward declaration net: ethernet: am65-cpsw: Move register definitions to header file net: ethernet: ti: am65-cpsw-qos: Add Frame Preemption MAC Merge support Vladimir Oltean (2): selftests: forwarding: ethtool_mm: support devices with higher rx-min-frag-size selftests: forwarding: ethtool_mm: fall back to aggregate if device does not report pMAC stats drivers/net/ethernet/ti/Kconfig | 14 +- drivers/net/ethernet/ti/Makefile | 3 +- drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 246 ++++++ drivers/net/ethernet/ti/am65-cpsw-nuss.c | 64 +- drivers/net/ethernet/ti/am65-cpsw-nuss.h | 9 + drivers/net/ethernet/ti/am65-cpsw-qos.c | 708 +++++++++++++----- drivers/net/ethernet/ti/am65-cpsw-qos.h | 186 +++++ .../selftests/net/forwarding/ethtool_mm.sh | 48 +- tools/testing/selftests/net/forwarding/lib.sh | 9 + 9 files changed, 1100 insertions(+), 187 deletions(-) base-commit: d6beb085e8ff3d9547df8a5a55f15ccc7552c5d0 -- 2.34.1

1 year, 11 months

3
18
0 0

[PATCH] KVM: s390: selftest: memop: Fix undefined behavior

by Nina Schoetterl-Glausch

If an integer's type has x bits, shifting the integer left by x or more is undefined behavior. This can happen in the rotate function when attempting to do a rotation of the whole value by 0. Fixes: 0dd714bfd200 ("KVM: s390: selftest: memop: Add cmpxchg tests") Signed-off-by: Nina Schoetterl-Glausch <nsg(a)linux.ibm.com> --- tools/testing/selftests/kvm/s390x/memop.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/s390x/memop.c b/tools/testing/selftests/kvm/s390x/memop.c index bb3ca9a5d731..2eba9575828e 100644 --- a/tools/testing/selftests/kvm/s390x/memop.c +++ b/tools/testing/selftests/kvm/s390x/memop.c @@ -485,11 +485,13 @@ static bool popcount_eq(__uint128_t a, __uint128_t b) static __uint128_t rotate(int size, __uint128_t val, int amount) { - unsigned int bits = size * 8; + unsigned int left, right, bits = size * 8; - amount = (amount + bits) % bits; + right = (amount + bits) % bits; + /* % 128 prevents left shift UB if size == 16 && right == 0 */ + left = (bits - right) % 128; val = cut_to_size(size, val); - return (val << (bits - amount)) | (val >> amount); + return (val << left) | (val >> right); } const unsigned int max_block = 16; base-commit: 305230142ae0637213bf6e04f6d9f10bbcb74af8 -- 2.40.1

1 year, 11 months

2
3
0 0

[PATCH] kselftest: alsa: fixed a print formatting warning

by Ghanshyam Agrawal

A statement used %d print formatter where %s should have been used. The same has been fixed in this commit. Signed-off-by: Ghanshyam Agrawal <ghanshyam1898(a)gmail.com> --- tools/testing/selftests/alsa/mixer-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 21e482b23f50..23df154fcdd7 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -138,7 +138,7 @@ static void find_controls(void) err = snd_ctl_elem_info(card_data->handle, ctl_data->info); if (err < 0) { - ksft_print_msg("%s getting info for %d\n", + ksft_print_msg("%s getting info for %s\n", snd_strerror(err), ctl_data->name); } -- 2.25.1

1 year, 11 months

2
1
0 0

[PATCH bpf-next v3 0/3] xsk: TX metadata Launch Time support

by Song Yoong Siang

This series expands XDP TX metadata framework to include ETF HW offload. Changes since v1: (Willem) - rename Time-Based Scheduling (TBS) to Earliest TxTime First (ETF) - rename launch-time to txtime Changes since v2: (Jesper & Willem) - rename to use launch time - change the default launch time in xdp_hw_metadata apps from 1s to 0.1s because some NICs do not support such a large future time. v1: https://patchwork.kernel.org/project/netdevbpf/cover/20231130162028.852006-… v2: https://patchwork.kernel.org/project/netdevbpf/cover/20231201062421.1074768… Song Yoong Siang (3): xsk: add Launch Time HW offload to XDP Tx metadata net: stmmac: add Launch Time support to XDP ZC selftests/bpf: add Launch Time request to xdp_hw_metadata Documentation/netlink/specs/netdev.yaml | 4 ++++ Documentation/networking/xsk-tx-metadata.rst | 4 ++++ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 ++ .../net/ethernet/stmicro/stmmac/stmmac_main.c | 13 +++++++++++++ include/net/xdp_sock.h | 10 ++++++++++ include/net/xdp_sock_drv.h | 1 + include/uapi/linux/if_xdp.h | 9 +++++++++ include/uapi/linux/netdev.h | 3 +++ net/core/netdev-genl.c | 2 ++ net/xdp/xsk.c | 3 +++ tools/include/uapi/linux/if_xdp.h | 9 +++++++++ tools/include/uapi/linux/netdev.h | 3 +++ tools/net/ynl/generated/netdev-user.c | 1 + tools/testing/selftests/bpf/xdp_hw_metadata.c | 19 ++++++++++++++++++- 14 files changed, 82 insertions(+), 1 deletion(-) -- 2.34.1

1 year, 11 months

7
18
0 0

[PATCH net 0/4] mptcp: misc. fixes for v6.7

by Matthieu Baerts

Here are a few fixes related to MPTCP: Patch 1 avoids skipping some subtests of the MPTCP Join selftest by mistake when using older versions of GCC. This fixes a patch introduced in v6.4, backported up to v6.1. Patch 2 fixes an inconsistent state when using MPTCP + FastOpen. A fix for v6.2. Patch 3 adds a description for MPTCP Kunit test modules to avoid a warning. Patch 4 adds an entry to the mailmap file for Geliang's email addresses. Signed-off-by: Matthieu Baerts <matttbe(a)kernel.org> --- Geliang Tang (2): selftests: mptcp: join: fix subflow_send_ack lookup mailmap: add entries for Geliang Tang Matthieu Baerts (1): mptcp: fill in missing MODULE_DESCRIPTION() Paolo Abeni (1): mptcp: fix inconsistent state on fastopen race .mailmap | 4 ++++ net/mptcp/crypto_test.c | 1 + net/mptcp/protocol.c | 6 +++--- net/mptcp/protocol.h | 9 +++++--- net/mptcp/subflow.c | 28 +++++++++++++++---------- net/mptcp/token_test.c | 1 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 +++---- 7 files changed, 36 insertions(+), 21 deletions(-) --- base-commit: 64b8bc7d5f1434c636a40bdcfcd42b278d1714be change-id: 20231215-upstream-net-20231215-mptcp-misc-fixes-33c4380c2f32 Best regards, -- Matthieu Baerts <matttbe(a)kernel.org>

1 year, 11 months

2
5
0 0

[PATCH] selftest: kvm: kvm_page_table_test: change default guest memory down to 128MB

by Itaru Kitayama

kvm_page_table_test's current default guest memory is set to 1GB, however on a 4GB of system memory this setting causes an OOM event. While it is able to control the test program arguments using an environment variable, KSELFTEST_KVM_PAGE_TABLE_TEST_ARGS, it is not intuitively clear for a selftest users the above variable exists, change the default guest memory down to 128MB so that small systems can run this test without seeing an OOM. --- Signed-off-by: Itaru Kitayama <itaru.kitayama(a)linux.dev> --- tools/testing/selftests/kvm/kvm_page_table_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c index 69f26d80c821..3cef22642bcb 100644 --- a/tools/testing/selftests/kvm/kvm_page_table_test.c +++ b/tools/testing/selftests/kvm/kvm_page_table_test.c @@ -24,8 +24,8 @@ #define TEST_MEM_SLOT_INDEX 1 -/* Default size(1GB) of the memory for testing */ -#define DEFAULT_TEST_MEM_SIZE (1 << 30) +/* Default size(128MB) of the memory for testing */ +#define DEFAULT_TEST_MEM_SIZE (1 << 27) /* Default guest test virtual memory offset */ #define DEFAULT_GUEST_TEST_MEM 0xc0000000 --- base-commit: a39b6ac3781d46ba18193c9dbb2110f31e9bffe9 change-id: 20231217-selftest-dev-c769544c303d Best regards, -- Itaru Kitayama <itaru.kitayama(a)linux.dev>

1 year, 11 months

1
0
0 0

[PATCH bpf-next 0/3] Various BPF exception improvements

by Daniel Xu

Two small improves to BPF exceptions in this patchset: 1. Allow throwing exceptions in XDP progs 2. Add some macros to help release references before throwing exceptions Note the macros are intended to be temporary, at least until BPF exception infra is able to automatically release acquired resources. Daniel Xu (3): bpf: xdp: Register generic_kfunc_set with XDP programs bpf: selftests: Add bpf_assert_if() and bpf_assert_with_if() macros bpf: selftests: Test bpf_assert_if() and bpf_assert_with_if() kernel/bpf/helpers.c | 1 + .../testing/selftests/bpf/bpf_experimental.h | 22 +++++++ .../selftests/bpf/prog_tests/exceptions.c | 5 ++ .../testing/selftests/bpf/progs/exceptions.c | 61 +++++++++++++++++++ 4 files changed, 89 insertions(+) -- 2.42.1

1 year, 11 months

3
6
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror