From: Florian Westphal fw@strlen.de
commit c273289fac370b6488757236cd62cc2cf04830b7 upstream.
The kselftest framework uses a default timeout of 45 seconds for all test scripts.
Increase the timeout to two minutes for the netfilter tests, this should hopefully be enough,
Make sure that, should the script be canceled, the net namespace and the spawned ping instances are removed.
Fixes: 25d8bcedbf43 ("selftests: add script to stress-test nft packet path vs. control plane") Reported-by: Mirsad Goran Todorovac mirsad.todorovac@alu.unizg.hr Signed-off-by: Florian Westphal fw@strlen.de Tested-by: Mirsad Goran Todorovac mirsad.todorovac@alu.unizg.hr Signed-off-by: Pablo Neira Ayuso pablo@netfilter.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- tools/testing/selftests/netfilter/nft_trans_stress.sh | 16 +++++++++------- tools/testing/selftests/netfilter/settings | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 tools/testing/selftests/netfilter/settings
--- a/tools/testing/selftests/netfilter/nft_trans_stress.sh +++ b/tools/testing/selftests/netfilter/nft_trans_stress.sh @@ -10,12 +10,20 @@ ksft_skip=4
testns=testns-$(mktemp -u "XXXXXXXX") +tmp=""
tables="foo bar baz quux" global_ret=0 eret=0 lret=0
+cleanup() { + ip netns pids "$testns" | xargs kill 2>/dev/null + ip netns del "$testns" + + rm -f "$tmp" +} + check_result() { local r=$1 @@ -43,6 +51,7 @@ if [ $? -ne 0 ];then exit $ksft_skip fi
+trap cleanup EXIT tmp=$(mktemp)
for table in $tables; do @@ -139,11 +148,4 @@ done
check_result $lret "add/delete with nftrace enabled"
-pkill -9 ping - -wait - -rm -f "$tmp" -ip netns del "$testns" - exit $global_ret --- /dev/null +++ b/tools/testing/selftests/netfilter/settings @@ -0,0 +1 @@ +timeout=120