selftests: netfilter: nft_concat_range.sh: reduce debug kernel run time

Even a 1h timeout isn't enough for nft_concat_range.sh to complete on
debug kernels.

Reduce test complexity and only match on single entry if
KSFT_MACHINE_SLOW is set.

To spot 'slow' tests, print the subtest duration (in seconds) in
addition to the status.

Add new nft_concat_range_perf.sh script, not executed via kselftest,
to run the performance (pps match rate) tests.

Those need about 25m to complete which seems too much to run this
via 'make run_tests'.

Signed-off-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20240430145810.23447-1-fw@strlen.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/testing/selftests/net/netfilter/Makefile b/tools/testing/selftests/net/netfilter/Makefile
index 72c6001964a659253401062e6dd11442a80ce51a..e9a6c702b8c99f5eb46a1381390cd5e6091497ea 100644 (file)
--- a/tools/testing/selftests/net/netfilter/Makefile
+++ b/tools/testing/selftests/net/netfilter/Makefile
@@ -28,6 +28,8 @@ TEST_PROGS += nft_zones_many.sh
 TEST_PROGS += rpath.sh
 TEST_PROGS += xt_string.sh
 
+TEST_PROGS_EXTENDED = nft_concat_range_perf.sh
+
 TEST_GEN_PROGS = conntrack_dump_flush
 
 TEST_GEN_FILES = audit_logread

diff --git a/tools/testing/selftests/net/netfilter/config b/tools/testing/selftests/net/netfilter/config
index 60b86c7f3ea1dd5432e5fdebc912e1f8686320ea..5b5b764f6cd084e0a92127b8fd3bab528d7ba20b 100644 (file)
--- a/tools/testing/selftests/net/netfilter/config
+++ b/tools/testing/selftests/net/netfilter/config
@@ -85,3 +85,4 @@ CONFIG_VETH=m
 CONFIG_VLAN_8021Q=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_PKTGEN=m

diff --git a/tools/testing/selftests/net/netfilter/nft_concat_range.sh b/tools/testing/selftests/net/netfilter/nft_concat_range.sh
index 2b66615190559cb2119977dae0e139982d95048a..6d66240e149c33a3b2e785ebab7ae8ef5cd912fd 100755 (executable)
--- a/tools/testing/selftests/net/netfilter/nft_concat_range.sh
+++ b/tools/testing/selftests/net/netfilter/nft_concat_range.sh
@@ -19,7 +19,7 @@ source lib.sh
 # - timeout: check that packets match entries until they expire
 # - performance: estimate matching rate, compare with rbtree and hash baselines
 TESTS="reported_issues correctness concurrency timeout"
-[ "${quicktest}" != "1" ] && TESTS="${TESTS} performance"
+[ -n "$NFT_CONCAT_RANGE_TESTS" ] && TESTS="${NFT_CONCAT_RANGE_TESTS}"
 
 # Set types, defined by TYPE_ variables below
 TYPES="net_port port_net net6_port port_proto net6_port_mac net6_port_mac_proto
@@ -31,7 +31,7 @@ BUGS="flush_remove_add reload"
 
 # List of possible paths to pktgen script from kernel tree for performance tests
 PKTGEN_SCRIPT_PATHS="
-       ../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
+       ../../../../../samples/pktgen/pktgen_bench_xmit_mode_netif_receive.sh
        pktgen/pktgen_bench_xmit_mode_netif_receive.sh"
 
 # Definition of set types:
@@ -951,6 +951,10 @@ cleanup() {
        killall iperf                           2>/dev/null
        killall netperf                         2>/dev/null
        killall netserver                       2>/dev/null
+}
+
+cleanup_exit() {
+       cleanup
        rm -f "$tmp"
 }
 
@@ -1371,6 +1375,9 @@ test_timeout() {
        setup veth send_"${proto}" set || return ${ksft_skip}
 
        timeout=3
+
+       [ "$KSFT_MACHINE_SLOW" = "yes" ] && timeout=8
+
        range_size=1
        for i in $(seq "$start" $((start + count))); do
                end=$((start + range_size))
@@ -1386,7 +1393,7 @@ test_timeout() {
                range_size=$((range_size + 1))
                start=$((end + range_size))
        done
-       sleep 3
+       sleep $timeout
        for i in $(seq "$start" $((start + count))); do
                end=$((start + range_size))
                srcstart=$((start + src_delta))
@@ -1480,10 +1487,13 @@ test_performance() {
 }
 
 test_bug_flush_remove_add() {
+       rounds=100
+       [ "$KSFT_MACHINE_SLOW" = "yes" ] && rounds=10
+
        set_cmd='{ set s { type ipv4_addr . inet_service; flags interval; }; }'
        elem1='{ 10.0.0.1 . 22-25, 10.0.0.1 . 10-20 }'
        elem2='{ 10.0.0.1 . 10-20, 10.0.0.1 . 22-25 }'
-       for i in $(seq 1 100); do
+       for i in $(seq 1 $rounds); do
                nft add table t "$set_cmd"      || return ${ksft_skip}
                nft add element t s "$elem1"    2>/dev/null || return 1
                nft flush set t s               2>/dev/null || return 1
@@ -1552,7 +1562,7 @@ test_reported_issues() {
 # Run everything in a separate network namespace
 [ "${1}" != "run" ] && { unshare -n "${0}" run; exit $?; }
 tmp="$(mktemp)"
-trap cleanup EXIT
+trap cleanup_exit EXIT
 
 # Entry point for test runs
 passed=0
@@ -1584,10 +1594,16 @@ for name in ${TESTS}; do
                        continue
                fi
 
-               printf "  %-60s  " "${display}"
+               [ "$KSFT_MACHINE_SLOW" = "yes" ] && count=1
+
+               printf "  %-32s  " "${display}"
+               tthen=$(date +%s)
                eval test_"${name}"
                ret=$?
 
+               tnow=$(date +%s)
+               printf "%5ds%-30s" $((tnow-tthen))
+
                if [ $ret -eq 0 ]; then
                        printf "[ OK ]\n"
                        info_flush

diff --git a/tools/testing/selftests/net/netfilter/nft_concat_range_perf.sh b/tools/testing/selftests/net/netfilter/nft_concat_range_perf.sh
new file mode 100755 (executable)
index 0000000..5d27699
--- /dev/null
+++ b/tools/testing/selftests/net/netfilter/nft_concat_range_perf.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+
+source lib.sh
+
+[ "$KSFT_MACHINE_SLOW" = yes ] && exit ${ksft_skip}
+
+NFT_CONCAT_RANGE_TESTS="performance" exec ./nft_concat_range.sh